Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_90779

Browse Source
This commit is contained in:
caoyanyi
2023-04-12 14:31:56 +08:00
parent 875aee00b1 bfe60c4926
commit 75ac945109
9 changed files with 161 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update18.3.sql
+4 -4
View File
@@ -218,10 +218,10 @@ CHANGE `hardware` `hardware` varchar(30) NOT NULL DEFAULT '',
CHANGE `injection` `injection` mediumint unsigned NOT NULL DEFAULT '0',
CHANGE `repo` `repo` mediumint unsigned NOT NULL DEFAULT '0',
CHANGE `mr` `mr` mediumint unsigned NOT NULL DEFAULT '0',
CHANGE `entry` `entry` text COLLATE 'utf8mb3_general_ci' NULL,
CHANGE `lines` `lines` varchar(10) COLLATE 'utf8mb3_general_ci' NOT NULL DEFAULT '',
CHANGE `v1` `v1` varchar(40) COLLATE 'utf8mb3_general_ci' NOT NULL DEFAULT '',
CHANGE `v2` `v2` varchar(40) COLLATE 'utf8mb3_general_ci' NOT NULL DEFAULT '',
CHANGE `entry` `entry` text NULL,
CHANGE `lines` `lines` varchar(10) NOT NULL DEFAULT '',
CHANGE `v1` `v1` varchar(40) NOT NULL DEFAULT '',
CHANGE `v2` `v2` varchar(40) NOT NULL DEFAULT '',
CHANGE `identify` `identify` mediumint unsigned NOT NULL DEFAULT '0',
CHANGE `activatedCount` `activatedCount` smallint NOT NULL DEFAULT '0',
CHANGE `activatedDate` `activatedDate` datetime NULL,
db/zentao.sql
+124 -126
View File
File diff suppressed because one or more lines are too long
module/block/model.php
+2 -2
View File
@@ -264,14 +264,14 @@ class blockModel extends model
$blocks = $this->lang->block->default[$type]['project'];
/* Mark project block has init. */
$this->loadModel('setting')->setItem("$account.$module.{$type}common.blockInited@$vision", true);
$this->loadModel('setting')->setItem("$account.$module.{$type}common.blockInited@$vision", '1');
}
else
{
$blocks = $module == 'my' ? $this->lang->block->default[$flow][$module] : $this->lang->block->default[$module];
/* Mark this app has init. */
$this->loadModel('setting')->setItem("$account.$module.common.blockInited@$vision", true);
$this->loadModel('setting')->setItem("$account.$module.common.blockInited@$vision", '1');
}
$this->loadModel('setting')->setItem("$account.$module.block.initVersion", $this->config->block->version);
module/doc/css/view.css
+5 -5
View File
@@ -25,7 +25,6 @@
.article-content .info .keywords .label {padding-right:8px; padding-left:8px; color:#18A6FD; border-color:rgba(24, 166, 253, 0.25); height:22px; line-height:14px; margin-right:4px;}
.article-content {width: 100%; display: inline-block;}
/* .outline-toggle i.icon-angle-right, i.icon-angle-left {width: 18px; height: 18px; border-radius: 50%; position: absolute; padding-left: 2px; padding-top: 1px;} */
.outline-toggle {position: absolute; right: 20px; top: 50px;}
.outline-toggle i.icon-angle-right:before {content: "\e314"; cursor: pointer;}
.outline-toggle i.icon-angle-left:before {content: "\e315"; cursor: pointer;}
@@ -65,8 +64,9 @@
.info .version, .info .crumbs {float: left;}
.crumbs img {margin-right: 3px; margin-bottom: 4px;}
.crumbs {float: left; display: flex;height: 32px; width: 670px; align-items: center; overflow: hidden;}
.crumbs a {padding: 6px 2px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;}
.crumbs .separator {flex: 0 0 15px; display: flex; justify-content: center; align-items: center;}
.crumbs :last-child {flex: none;}
.crumbs .crumb-item {padding: 6px 2px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; flex: none; display: flex;}
.crumb-item .separator {flex: 0 0 15px; display: flex; justify-content: center; align-items: center;}
.crumb-item a {flex: none}
.main-col {position: relative;}
#autoBox {display: flex; overflow: hidden; text-overflow: ellipsis; padding-right: 15px; position: relative;}
#autoBox > .ellipsis {position: absolute; top: 3px; right: 0; width: 10px; background: #F4F5F7; height: 100%;}
module/doc/js/common.js
+12 -9
View File
@@ -402,20 +402,23 @@ function submit(object)
function updateCrumbs()
{
var $crumbs = $('#crumbs');
var $crumbItems = $('#crumbs > a');
var $crumbItems = $('#crumbs > .crumb-item');
var crumbMaxWidth = 660;
if($crumbs.width < crumbMaxWidth || $crumbItems.length == 1) return;
/* last crumbItem width major */
var $lastChild = $($crumbItems[$crumbItems.length -1]);
var $separator = "<div class='separator'> > </div>"
var $ellipsis = "<div class='ellipsis'> ... </div>"
if($lastChild.width() > $crumbs.width())
var widthSum = 0 + $lastChild.width();
for(var i = 0; i < $crumbItems.length - 1; i++)
{
var $appendChild = $lastChild[0];
$crumbs.empty();
$crumbs.append($appendChild);
$crumbs.prepend($separator);
$crumbs.prepend($ellipsis);
var crumbItem = $crumbItems[i];
var widthSum = widthSum + $(crumbItem).width();
if(widthSum >= crumbMaxWidth)
{
$(crumbItem).addClass('in-auto-box');
}
}
var $autoCrumbItems = $('#crumbs > .in-auto-box');
$lastChild.before('<div id="autoBox" class="flex-auto"><div class="ellipsis">...<div></div>');
$('#autoBox').prepend($autoCrumbItems);
}
module/doc/view/view.html.php
+6 -1
View File
@@ -27,7 +27,12 @@
<?php echo html::backButton("<i class='icon icon-back icon-sm'></i> " . $lang->goback, "id='backBtn'", 'btn btn-link')?>
</div>
<div id="crumbs" class="crumbs">
<?php echo implode('<div class="separator"> > </div>', $crumbs);?>
<?php foreach($crumbs as $crumbKey => $crumb):?>
<div class="crumb-item">
<?php if($crumbKey != 0) echo '<div class="separator"> > </div>'?>
<?php echo $crumb;?>
</div>
<?php endforeach;?>
</div>
<div class="btn-toolbar pull-right">
<?php
module/setting/model.php
+1 -1
View File
@@ -52,7 +52,7 @@ class settingModel extends model
$item = $this->parseItemPath($path);
if(empty($item)) return false;
$item->value = $value;
$item->value = strval($value);
$this->dao->replace(TABLE_CONFIG)->data($item)->exec();
}
module/user/model.php
+3
View File
@@ -373,6 +373,7 @@ class userModel extends model
$data = new stdclass();
$data->account = $this->post->account;
$data->group = $groupID;
$data->project = '';
$this->dao->insert(TABLE_USERGROUP)->data($data)->exec();
}
}
@@ -515,6 +516,7 @@ class userModel extends model
$groups = new stdClass();
$groups->account = $user->account;
$groups->group = $group;
$groups->project = '';
$this->dao->insert(TABLE_USERGROUP)->data($groups)->exec();
}
}
@@ -641,6 +643,7 @@ class userModel extends model
$data = new stdclass();
$data->account = $this->post->account;
$data->group = $groupID;
$data->project = '';
$this->dao->replace(TABLE_USERGROUP)->data($data)->exec();
}
}
xuanxuan/extension/xuan/common/ext/model/hook/loadConfigFromDB.xuanxuan.php
+4 -4
View File
@@ -7,12 +7,12 @@ if(defined('IN_USE') or (defined('RUN_MODE') and RUN_MODE == 'api'))
foreach($xxItems as $xxItem) $xxConfig[$xxItem->key] = $xxItem->value;
if(empty($xxConfig['key']))
{
$this->setting->setItem('system.common.xuanxuan.turnon', 0);
$this->setting->setItem('system.common.xuanxuan.turnon', '0');
$this->setting->setItem('system.common.xuanxuan.key', $this->setting->computeSN());
}
if(!isset($xxConfig['chatPort'])) $this->setting->setItem('system.common.xuanxuan.chatPort', 11444);
if(!isset($xxConfig['commonPort'])) $this->setting->setItem('system.common.xuanxuan.commonPort', 11443);
if(!isset($xxConfig['chatPort'])) $this->setting->setItem('system.common.xuanxuan.chatPort', '11444');
if(!isset($xxConfig['commonPort'])) $this->setting->setItem('system.common.xuanxuan.commonPort', '11443');
if(!isset($xxConfig['ip'])) $this->setting->setItem('system.common.xuanxuan.ip', '0.0.0.0');
if(!isset($xxConfig['uploadFileSize'])) $this->setting->setItem('system.common.xuanxuan.uploadFileSize', 20);
if(!isset($xxConfig['uploadFileSize'])) $this->setting->setItem('system.common.xuanxuan.uploadFileSize', '20');
if(!isset($xxConfig['https']) and !isset($xxConfig['isHttps'])) $this->setting->setItem('system.common.xuanxuan.https', 'off');
}