Browse Source

商业组件问题调整

tags/6.2.3
llgoer 1 year ago
parent
commit
88c3efd0a3
5 changed files with 13 additions and 5 deletions
  1. +7
    -2
      src/admin/js/indexbody.js
  2. +1
    -1
      src/admin/js/main.js
  3. +1
    -1
      src/install/index.php
  4. +1
    -1
      src/system/common.inc.php
  5. +3
    -0
      src/system/database/dedesqlite.class.php

+ 7
- 2
src/admin/js/indexbody.js View File

@@ -52,7 +52,10 @@ function Copyinfo() {
//Dedebiz info
var dedebizInfo;
function ViewDedeBIZ() {
console.log(dedebizInfo);
if (dedebizInfo === false) {
ShowMsg("商业组件没有启动,无法正常连接");
return;
}
ShowMsg(`
<table class="table table-borderless w-100">
<tr>
@@ -74,8 +77,10 @@ function LoadServer() {
$.get("index_body.php?dopost=system_info", function (data) {
let rsp = JSON.parse(data);
if (rsp.code === 200) {
if (rsp.result.core.code === 200) {
if (rsp.result.core) {
dedebizInfo = JSON.parse(rsp.result.core.data);
} else {
dedebizInfo = false;
}
let infoStr = `<table class="table table-borderless w-100">`;


+ 1
- 1
src/admin/js/main.js View File

@@ -556,7 +556,7 @@ function ShowMsg(content, ...args) {
size = "";
if (typeof content == "undefined") content = "";
modalID = guid();
var footer = `<button type="button" class="btn btn-primary" onClick="CloseModal(\'GKModal${modalID}\')">ok</button>`;
var footer = `<button type="button" class="btn btn-primary" onClick="CloseModal(\'GKModal${modalID}\')">确定</button>`;
var noClose = false;
if (args.length == 1) {
//存在args参数


+ 1
- 1
src/install/index.php View File

@@ -11,7 +11,7 @@ error_reporting(E_ALL || ~E_NOTICE);
define('INSLOCKFILE', dirname(__FILE__).'/install_lock.txt');
$verMsg = 'V6';
$dfDbname = 'DedeBIZ';
$cfg_version_detail = '6.2.1'; //详细版本号
$cfg_version_detail = '6.2.3'; //详细版本号
$errmsg = '';
if (version_compare(PHP_VERSION, '8.0.0', '>=') && function_exists("mysqli_report")) {
mysqli_report(MYSQLI_REPORT_OFF);


+ 1
- 1
src/system/common.inc.php View File

@@ -187,7 +187,7 @@ $cfg_soft_dir = $cfg_medias_dir.'/soft';
$cfg_other_medias = $cfg_medias_dir.'/media';
//软件摘要信息,请不要删除,否则系统无法正确接收系统漏洞或升级信息
$cfg_version = 'V6';
$cfg_version_detail = '6.2.1'; //详细版本号
$cfg_version_detail = '6.2.3'; //详细版本号
$cfg_soft_lang = 'utf-8';
$cfg_soft_public = 'base';
$cfg_softname = '得德系统';


+ 3
- 0
src/system/database/dedesqlite.class.php View File

@@ -398,6 +398,9 @@ class DedeSqlite
//获取字段详细信息
function GetFieldObject($id = "me")
{
if(!$this->result[$id]) {
return false;
}
$cols = $this->result[$id]->numColumns();
if ($this->_fieldIdx >= $cols) {
$this->_fieldIdx = 1;


Loading…
Cancel
Save