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

Merge branch 'master' into zentaopms_304

Browse Source
This commit is contained in:
hufangzhou
2023-04-20 13:03:30 +08:00
parent 434ef6ef89 f4c9bc22b3
commit e18b37128f
147 changed files with 590 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+41 -17
View File
@@ -2,13 +2,10 @@ VERSION = $(shell head -n 1 VERSION)
XUANVERSION = $(shell head -n 1 xuanxuan/XUANVERSION)
XVERSION = $(shell head -n 1 xuanxuan/XVERSION)
#XUANPATH := $(XUANXUAN_SRC_PATH)
#BUILD_PATH := $(if $(ZENTAO_BUILD_PATH),$(ZENTAO_BUILD_PATH),$(shell pwd))
#RELEASE_PATH := $(if $(ZENTAO_RELEASE_PATH),$(ZENTAO_RELEASE_PATH),$(shell pwd))
XUANPATH := /home/gitlab-runner/ci/gitlab/xuan/
XUAN_WEB_PATH := /home/gitlab-runner/ci/packages/web
BUILD_PATH := /home/z/ci/pip_build/
RELEASE_PATH := /home/z/ci/pip_release/
XUANPATH := $(XUANXUAN_SRC_PATH)
BUILD_PATH := $(if $(ZENTAO_BUILD_PATH),$(ZENTAO_BUILD_PATH),$(shell pwd))
RELEASE_PATH := $(if $(ZENTAO_RELEASE_PATH),$(ZENTAO_RELEASE_PATH),$(shell pwd))
XUAN_WEB_PATH := $(ZENTAO_BUILD_PATH)/web
all:
make clean
@@ -257,6 +254,7 @@ enrpm:
cp ~/rpmbuild/RPMS/noarch/zentaoalm-${VERSION}-1.noarch.rpm ./
rm -rf ~/rpmbuild
ciCommon:
make clean
git pull
make common
@@ -307,19 +305,45 @@ cizip:
rm -rf tmp/ *.sh zentaobiz* zentaomax* $(RELEASE_PATH)/ZenTaoALM.$(VERSION)*.zip $(RELEASE_PATH)/ZenTaoPMS.$(VERSION)*.zip $(RELEASE_PATH)/pmsPack/*.zip
mv ZenTaoPMS.$(VERSION).zip ZenTaoALM.$(VERSION).int.zip $(RELEASE_PATH)
mv ZenTaoALM.$(VERSION).int.php*.zip ZenTaoPMS.$(VERSION).php*.zip $(RELEASE_PATH)/pmsPack
ci:
syspack:
php tools/packDeb.php $(VERSION)
sh deb.sh
rm -rf tmp/ deb.sh
php tools/packRpm.php $(VERSION)
sh rpm.sh
rm -rf tmp/ rpm.sh
commitBuild:
make ciCommon
php tools/packZip.php $(VERSION)
sh zip.sh
rm -rf tmp/
php tools/packDeb.php $(VERSION)
sh deb.sh
rm -rf tmp/
php tools/packRpm.php $(VERSION)
sh rpm.sh
rm -rf tmp/
rm -rf tmp/ zip.sh
commitClear:
rm -rf zentaobiz* zentaomax* $(RELEASE_PATH)/pmsPack/*.zip
commitMove:
mv ZenTaoALM.$(VERSION).int.php*.zip ZenTaoPMS.$(VERSION).php*.zip $(RELEASE_PATH)/pmsPack
releaseBuild:
make commitBuild
make syspack
releaseClear:
make commitClear
rm -rf $(RELEASE_PATH)/pmsPack/deb/* $(RELEASE_PATH)/pmsPack/rpm/*
releaseMove:
make commitMove
mv *.deb $(RELEASE_PATH)/pmsPack/deb/
mv *.rpm $(RELEASE_PATH)/pmsPack/rpm/
commitCi:
make commitBuild
make commitClear
make commitMove
releaseCi:
make releaseBuild
make releaseClear
make releaseMove
ci:
make commitBuild
make syspack
rm -rf zentaobiz* zentaomax* $(RELEASE_PATH)/ZenTaoALM.$(VERSION)*.zip $(RELEASE_PATH)/ZenTaoPMS.$(VERSION)*.zip $(RELEASE_PATH)/*.deb $(RELEASE_PATH)/*.rpm *.sh $(RELEASE_PATH)/pmsPack/*.zip $(RELEASE_PATH)/pmsPack/deb/* $(RELEASE_PATH)/pmsPack/rpm/*
mv ZenTaoPMS.$(VERSION).zip ZenTaoALM.$(VERSION).int.zip $(RELEASE_PATH)
mv ZenTaoALM.$(VERSION).int.php*.zip ZenTaoPMS.$(VERSION).php*.zip $(RELEASE_PATH)/pmsPack
mv *.deb $(RELEASE_PATH)/pmsPack/deb
mv *.rpm $(RELEASE_PATH)/pmsPack/rpm
mv *.deb $(RELEASE_PATH)/pmsPack/deb/
mv *.rpm $(RELEASE_PATH)/pmsPack/rpm/
config/filter.php
+14 -12
View File
@@ -226,24 +226,26 @@ $filter->doc->default->cookie['from'] = 'code';
$filter->doc->default->cookie['product'] = 'int';
$filter->doc->default->cookie['preProductID'] = 'int';
$filter->doc->default->cookie['lastProject'] = 'int';
$filter->doc->default->cookie['docSpaceParam'] = 'string';
$filter->doc->showfiles->cookie['docFilesViewType'] = 'code';
$filter->doc->tablecontents->cookie['preProductID'] = 'int';
$filter->doc->tablecontents->cookie['preBranch'] = 'reg::word';
$filter->doc->productspace->cookie['pagerDocTablecontents'] = 'int';
$filter->doc->projectspace->cookie['pagerDocTablecontents'] = 'int';
$filter->api->default->cookie['objectType'] = 'string';
$filter->api->default->cookie['objectID'] = 'int';
$filter->api->index->get['libID'] = 'int';
$filter->api->index->get['module'] = 'int';
$filter->api->index->get['apiID'] = 'int';
$filter->api->index->get['version'] = 'int';
$filter->api->create->get['libID'] = 'int';
$filter->api->create->get['module'] = 'int';
$filter->api->create->get['apiID'] = 'int';
$filter->api->edit->get['libID'] = 'int';
$filter->api->edit->get['module'] = 'int';
$filter->api->edit->get['apiID'] = 'int';
$filter->api->default->cookie['objectType'] = 'string';
$filter->api->default->cookie['objectID'] = 'int';
$filter->api->default->cookie['docSpaceParam'] = 'string';
$filter->api->index->get['libID'] = 'int';
$filter->api->index->get['module'] = 'int';
$filter->api->index->get['apiID'] = 'int';
$filter->api->index->get['version'] = 'int';
$filter->api->create->get['libID'] = 'int';
$filter->api->create->get['module'] = 'int';
$filter->api->create->get['apiID'] = 'int';
$filter->api->edit->get['libID'] = 'int';
$filter->api->edit->get['module'] = 'int';
$filter->api->edit->get['apiID'] = 'int';
$filter->file->download->cookie[$config->sessionVar] = 'code';
db/update18.3.sql
+76 -3
View File
@@ -50,10 +50,10 @@ CREATE TABLE IF NOT EXISTS `zt_scene` (
`module` mediumint(8) unsigned NOT NULL DEFAULT 0,
`title` varchar(255) NOT NULL,
`sort` int(11) unsigned NOT NULL DEFAULT 0,
`openedBy` char(30) NOT NULL DEFAULT '''''',
`openedBy` char(30) NOT NULL DEFAULT '',
`openedDate` datetime DEFAULT NULL,
`lastEditedBy` char(30) NOT NULL DEFAULT '',
`lastEditedDate` datetime NOT NULL,
`lastEditedDate` datetime NULL,
`deleted` enum('0','1') NOT NULL DEFAULT '0',
`parent` int(11) DEFAULT NULL,
`grade` tinyint(3) DEFAULT NULL,
@@ -260,7 +260,7 @@ REPLACE INTO `zt_chart` (`id`, `name`, `dimension`, `type`, `group`, `stage`, `d
(10019,'年度完成项目-单位工时交付需求规模数对比图',2,'pie',0,'published','','[{\"type\":\"cluBarX\",\"xaxis\":[{\"field\":\"project\",\"name\":\"\\u6240\\u5c5e\\u9879\\u76ee\",\"group\":\"\"}],\"yaxis\":[{\"field\":\"\\u5355\\u4f4d\\u65f6\\u95f4\\u4ea4\\u4ed8\\u9700\\u6c42\\u89c4\\u6a21\\u6570\",\"name\":\"\\u5355\\u4f4d\\u65f6\\u95f4\\u4ea4\\u4ed8\\u9700\\u6c42\\u89c4\\u6a21\\u6570\",\"valOrAgg\":\"sum\"}]}]','[{\"field\":\"project\",\"type\":\"input\",\"name\":\"\\u6240\\u5c5e\\u9879\\u76ee\",\"default\":\"\"}]','{\"project\":{\"name\":\"\\u6240\\u5c5e\\u9879\\u76ee\",\"object\":\"project\",\"field\":\"project\",\"type\":\"string\"},\"\\u6545\\u4e8b\\u70b9\":{\"name\":\"\\u6545\\u4e8b\\u70b9\",\"object\":\"project\",\"field\":\"\\u6545\\u4e8b\\u70b9\",\"type\":\"number\"},\"\\u5de5\\u65f6\":{\"name\":\"\\u5de5\\u65f6\",\"object\":\"project\",\"field\":\"\\u5de5\\u65f6\",\"type\":\"number\"},\"\\u5355\\u4f4d\\u65f6\\u95f4\\u4ea4\\u4ed8\\u9700\\u6c42\\u89c4\\u6a21\\u6570\":{\"name\":\"\\u5355\\u4f4d\\u65f6\\u95f4\\u4ea4\\u4ed8\\u9700\\u6c42\\u89c4\\u6a21\\u6570\",\"object\":\"project\",\"field\":\"\\u5355\\u4f4d\\u65f6\\u95f4\\u4ea4\\u4ed8\\u9700\\u6c42\\u89c4\\u6a21\\u6570\",\"type\":\"number\"}}','','select tt.*,\ntt.`故事点` / tt.`工时` as \'单位时间交付需求规模数\'\nfrom (\nselect\nt1.name as project, \n(\n select round(sum(t3.estimate), 1) from zt_projectstory t2\n left join zt_story t3 on t3.id= t2.story and t3.status=\'closed\' and t3.closedReason = \'done\'\n where t2.project = t1.id\n) as \'故事点\',\n(\n select round(sum(t5.consumed), 1) from zt_project t4\n left join zt_task t5 on t5.execution = t4.id and t5.deleted = \'0\' and t5.parent in (0, -1)\n where t4.project = t1.id and t4.type = \'sprint\'\n) as \'工时\'\nfrom zt_project t1\nwhere t1.status = \'closed\'\nand t1.deleted = \'0\'\nand t1.type = \'project\'\ngroup by t1.id) tt','1','','admin','2023-04-06 13:41:05','admin','2023-04-06 13:41:05','0'),
(10020,'年度完成项目-项目完成分布图',2,'pie',0,'published','','[{\"type\":\"pie\",\"group\":[{\"field\":\"\\u9879\\u76ee\\u5b8c\\u6210\\u60c5\\u51b5\",\"name\":\"\\u9879\\u76ee\\u5b8c\\u6210\\u60c5\\u51b5\",\"group\":\"\"}],\"metric\":[{\"field\":\"id\",\"name\":\"\\u9879\\u76eeID\",\"valOrAgg\":\"count\"}]}]','[{\"field\":\"closedDate\",\"type\":\"date\",\"name\":\"\\u5173\\u95ed\\u65e5\\u671f\",\"default\":{\"begin\":\"\",\"end\":\"\"}}]','{\"id\":{\"name\":\"\\u9879\\u76eeID\",\"object\":\"project\",\"field\":\"id\",\"type\":\"number\"},\"\\u9879\\u76ee\\u5b8c\\u6210\\u60c5\\u51b5\":{\"name\":\"\\u9879\\u76ee\\u5b8c\\u6210\\u60c5\\u51b5\",\"object\":\"project\",\"field\":\"\\u9879\\u76ee\\u5b8c\\u6210\\u60c5\\u51b5\",\"type\":\"string\"},\"closedDate\":{\"name\":\"\\u5173\\u95ed\\u65e5\\u671f\",\"object\":\"project\",\"field\":\"closedDate\",\"type\":\"date\"}}','','select\nt1.id,\n(case when t1.realEnd<t1.end then \'提前完成项目\' when t1.realEnd=t1.end then \'正常完成项目\' else \'延期完成项目\' end) \'项目完成情况\',\nt1.closedDate\nfrom(\nselect\nid,\nclosedDate,\nend,\nif(left(realEnd, 4) = \'0000\', closedDate, realEnd) as realEnd\nfrom\nzt_project\nwhere deleted=\'0\'\nand status=\'closed\'\nand type=\'project\') t1','1','','admin','2023-04-06 12:22:34','admin','2023-04-06 12:22:34','0'),
(10021,'年度完成项目-执行完成分布图',2,'pie',0,'published','','[{\"type\":\"pie\",\"group\":[{\"field\":\"\\u6267\\u884c\\u5b8c\\u6210\\u60c5\\u51b5\",\"name\":\"\\u6267\\u884c\\u5b8c\\u6210\\u60c5\\u51b5\",\"group\":\"\"}],\"metric\":[{\"field\":\"id\",\"name\":\"\\u9879\\u76eeID\",\"valOrAgg\":\"count\"}]}]','[{\"field\":\"closedDate\",\"type\":\"date\",\"name\":\"\\u5173\\u95ed\\u65e5\\u671f\",\"default\":{\"begin\":\"\",\"end\":\"\"}}]','{\"id\":{\"name\":\"\\u9879\\u76eeID\",\"object\":\"project\",\"field\":\"id\",\"type\":\"number\"},\"\\u6267\\u884c\\u5b8c\\u6210\\u60c5\\u51b5\":{\"name\":\"\\u6267\\u884c\\u5b8c\\u6210\\u60c5\\u51b5\",\"object\":\"project\",\"field\":\"\\u6267\\u884c\\u5b8c\\u6210\\u60c5\\u51b5\",\"type\":\"string\"},\"closedDate\":{\"name\":\"\\u5173\\u95ed\\u65e5\\u671f\",\"object\":\"project\",\"field\":\"closedDate\",\"type\":\"date\"}}','','select\nt1.id,\n(case when t1.realEnd<t1.end then \'提前完成执行\' when t1.realEnd=t1.end then \'正常完成执行\' else \'延期完成执行\' end) \'执行完成情况\',\nt1.closedDate\nfrom(\nselect\nid,\nclosedDate,\nend,\nif(left(realEnd, 4) = \'0000\', closedDate, realEnd) as realEnd\nfrom\nzt_project\nwhere deleted=\'0\'\nand status=\'closed\'\nand type=\'sprint\') t1','1','','admin','2023-04-06 12:19:58','admin','2023-04-06 12:22:34','0'),
(10022,'年度完成项目-完成项目工时偏差率条形图',2,'cluBarY',0,'published','','[{\"type\":\"cluBarY\",\"xaxis\":[{\"field\":\"name\",\"name\":\"\\u4efb\\u52a1\\u540d\\u79f0\",\"group\":\"\"}],\"yaxis\":[{\"field\":\"rate\",\"name\":\"rate\",\"valOrAgg\":\"sum\"}]}]','[{\"field\":\"closedDate\",\"type\":\"date\",\"name\":\"\\u5173\\u95ed\\u65f6\\u95f4\",\"default\":{\"begin\":\"\",\"end\":\"\"}}]','{\"name\":{\"name\":\"\\u4efb\\u52a1\\u540d\\u79f0\",\"object\":\"task\",\"field\":\"name\",\"type\":\"string\"},\"id\":{\"name\":\"\\u7f16\\u53f7\",\"object\":\"task\",\"field\":\"id\",\"type\":\"number\"},\"closedDate\":{\"name\":\"\\u5173\\u95ed\\u65f6\\u95f4\",\"object\":\"task\",\"field\":\"closedDate\",\"type\":\"date\"},\"estimate\":{\"name\":\"\\u6700\\u521d\\u9884\\u8ba1\",\"object\":\"task\",\"field\":\"estimate\",\"type\":\"string\"},\"consumed\":{\"name\":\"\\u603b\\u8ba1\\u6d88\\u8017\",\"object\":\"task\",\"field\":\"consumed\",\"type\":\"string\"},\"left\":{\"name\":\"\\u9884\\u8ba1\\u5269\\u4f59\",\"object\":\"task\",\"field\":\"left\",\"type\":\"string\"},\"deviation\":{\"name\":\"deviation\",\"object\":\"task\",\"field\":\"deviation\",\"type\":\"number\"},\"rate\":{\"name\":\"rate\",\"object\":\"task\",\"field\":\"rate\",\"type\":\"number\"}}','{\"name\":{\"zh-cn\":\"\\u4efb\\u52a1\\u540d\\u79f0\",\"zh-tw\":\"\",\"en\":\"\",\"de\":\"\",\"fr\":\"\"},\"id\":{\"zh-cn\":\"\\u7f16\\u53f7\",\"zh-tw\":\"\",\"en\":\"\",\"de\":\"\",\"fr\":\"\"},\"closedDate\":{\"zh-cn\":\"\\u5173\\u95ed\\u65f6\\u95f4\",\"zh-tw\":\"\",\"en\":\"\",\"de\":\"\",\"fr\":\"\"},\"estimate\":{\"zh-cn\":\"\\u6700\\u521d\\u9884\\u8ba1\",\"zh-tw\":\"\",\"en\":\"\",\"de\":\"\",\"fr\":\"\"},\"consumed\":{\"zh-cn\":\"\\u603b\\u8ba1\\u6d88\\u8017\",\"zh-tw\":\"\",\"en\":\"\",\"de\":\"\",\"fr\":\"\"},\"left\":{\"zh-cn\":\"\\u9884\\u8ba1\\u5269\\u4f59\",\"zh-tw\":\"\",\"en\":\"\",\"de\":\"\",\"fr\":\"\"},\"deviation\":{\"zh-cn\":\"deviation\",\"zh-tw\":\"\",\"en\":\"\",\"de\":\"\",\"fr\":\"\"},\"rate\":{\"zh-cn\":\"\\u5de5\\u65f6\\u504f\\u5dee\\u7387\",\"zh-tw\":\"\",\"en\":\"\",\"de\":\"\",\"fr\":\"\"}}','select\n*,\nround(tt.deviation/tt.estimate,3) rate\nfrom(\nselect\nt1.name,\nt1.id,\nt1.closedDate,\nt2.estimate estimate,\nt2.consumed consumed,\nt2.`left`,\nt2.consumed-t2.estimate deviation\nfrom\nzt_project t1\nleft join\n(select\nproject,\nsum(estimate) estimate,\nsum(consumed) consumed,\nsum(`left`) `left`\nfrom\nzt_task\ngroup by project) t2\non t1.id=t2.project\nwhere t1.deleted=\'0\'\nand t1.status=\'closed\'\nand t1.type=\'project\') tt','1','','admin','2023-04-06 12:16:04','admin','2023-04-06 12:16:04','0'),
(10022,'年度完成项目-完成项目工时偏差条形图',2,'cluBarY',0,'published','','[{\"type\":\"cluBarY\",\"xaxis\":[{\"field\":\"name\",\"name\":\"\\u4efb\\u52a1\\u540d\\u79f0\",\"group\":\"\"}],\"yaxis\":[{\"field\":\"rate\",\"name\":\"rate\",\"valOrAgg\":\"sum\"}]}]','[{\"field\":\"closedDate\",\"type\":\"date\",\"name\":\"\\u5173\\u95ed\\u65f6\\u95f4\",\"default\":{\"begin\":\"\",\"end\":\"\"}}]','{\"name\":{\"name\":\"\\u4efb\\u52a1\\u540d\\u79f0\",\"object\":\"task\",\"field\":\"name\",\"type\":\"string\"},\"id\":{\"name\":\"\\u7f16\\u53f7\",\"object\":\"task\",\"field\":\"id\",\"type\":\"number\"},\"closedDate\":{\"name\":\"\\u5173\\u95ed\\u65f6\\u95f4\",\"object\":\"task\",\"field\":\"closedDate\",\"type\":\"date\"},\"estimate\":{\"name\":\"\\u6700\\u521d\\u9884\\u8ba1\",\"object\":\"task\",\"field\":\"estimate\",\"type\":\"string\"},\"consumed\":{\"name\":\"\\u603b\\u8ba1\\u6d88\\u8017\",\"object\":\"task\",\"field\":\"consumed\",\"type\":\"string\"},\"left\":{\"name\":\"\\u9884\\u8ba1\\u5269\\u4f59\",\"object\":\"task\",\"field\":\"left\",\"type\":\"string\"},\"deviation\":{\"name\":\"deviation\",\"object\":\"task\",\"field\":\"deviation\",\"type\":\"number\"},\"rate\":{\"name\":\"rate\",\"object\":\"task\",\"field\":\"rate\",\"type\":\"number\"}}','{\"name\":{\"zh-cn\":\"\\u4efb\\u52a1\\u540d\\u79f0\",\"zh-tw\":\"\",\"en\":\"\",\"de\":\"\",\"fr\":\"\"},\"id\":{\"zh-cn\":\"\\u7f16\\u53f7\",\"zh-tw\":\"\",\"en\":\"\",\"de\":\"\",\"fr\":\"\"},\"closedDate\":{\"zh-cn\":\"\\u5173\\u95ed\\u65f6\\u95f4\",\"zh-tw\":\"\",\"en\":\"\",\"de\":\"\",\"fr\":\"\"},\"estimate\":{\"zh-cn\":\"\\u6700\\u521d\\u9884\\u8ba1\",\"zh-tw\":\"\",\"en\":\"\",\"de\":\"\",\"fr\":\"\"},\"consumed\":{\"zh-cn\":\"\\u603b\\u8ba1\\u6d88\\u8017\",\"zh-tw\":\"\",\"en\":\"\",\"de\":\"\",\"fr\":\"\"},\"left\":{\"zh-cn\":\"\\u9884\\u8ba1\\u5269\\u4f59\",\"zh-tw\":\"\",\"en\":\"\",\"de\":\"\",\"fr\":\"\"},\"deviation\":{\"zh-cn\":\"deviation\",\"zh-tw\":\"\",\"en\":\"\",\"de\":\"\",\"fr\":\"\"},\"rate\":{\"zh-cn\":\"\\u5de5\\u65f6\\u504f\\u5dee\\u7387\",\"zh-tw\":\"\",\"en\":\"\",\"de\":\"\",\"fr\":\"\"}}','select\n*,\nround(tt.deviation/tt.estimate,3) rate\nfrom(\nselect\nt1.name,\nt1.id,\nt1.closedDate,\nt2.estimate estimate,\nt2.consumed consumed,\nt2.`left`,\nt2.consumed-t2.estimate deviation\nfrom\nzt_project t1\nleft join\n(select\nproject,\nsum(estimate) estimate,\nsum(consumed) consumed,\nsum(`left`) `left`\nfrom\nzt_task\ngroup by project) t2\non t1.id=t2.project\nwhere t1.deleted=\'0\'\nand t1.status=\'closed\'\nand t1.type=\'project\') tt','1','','admin','2023-04-06 12:16:04','admin','2023-04-06 12:16:04','0'),
(10101,'年度进行中项目-进行中的项目数',2,'card',0,'published','','{\"value\": {\"type\": \"agg\", \"field\": \"id\", \"agg\": \"count\"}, \"title\": {\"type\": \"text\", \"name\": \"\"}, \"type\": \"value\"}','[]','','','SELECT id FROM zt_project WHERE deleted = \'0\' AND status = \'doing\' AND type = \'project\'','1','','admin','2022-12-07 14:59:41','','2022-12-07 14:59:41','0'),
(10102,'年度进行中项目-进行中的迭代数',2,'card',0,'published','','{\"value\": {\"type\": \"agg\", \"field\": \"id\", \"agg\": \"count\"}, \"title\": {\"type\": \"text\", \"name\": \"\"}, \"type\": \"value\"}','[]','','','SELECT id,type FROM zt_project WHERE deleted = \'0\' AND status = \'doing\' AND type IN (\'sprint\', \'stage\', \'kanban\') AND multiple = \'1\'','1','','admin','2022-12-07 14:59:41','admin','2022-12-07 14:59:41','0'),
(10103,'年度进行中项目-进展顺利项目数',2,'card',0,'published','','{\"value\": {\"type\": \"agg\", \"field\": \"id\", \"agg\": \"count\"}, \"title\": {\"type\": \"text\", \"name\": \"\"}, \"type\": \"value\"}','[]','','','SELECT t1.id, t1.name, IFNULL(prograss, 0) AS prograss, ROUND(DATEDIFF(NOW(), t1.`begin`) / DATEDIFF(t1.`end`, t1.`begin`) * 100, 2) AS planPrograss,LEFT(t1.`end`, 4) AS endYear\nFROM zt_project AS t1\nLEFT JOIN (\n SELECT t22.project,\n ROUND(IF(SUM(t22.consumed) + SUM(IF(t22.status != \'closed\' && t22.status != \'cancel\', t22.`left`, 0)) > 0, SUM(t22.consumed) / (SUM(t22.consumed) + SUM(IF(t22.status != \'closed\' && t22.status != \'cancel\', t22.`left`, 0))), 0) * 100, 2) AS prograss\n FROM zt_project AS t21\n LEFT JOIN zt_task AS t22 ON t21.id = t22.execution\n WHERE t21.deleted = \'0\' AND t21.type IN (\'sprint\', \'kanban\')\n AND t22.deleted = \'0\' AND t22.parent < 1\n GROUP BY t22.project\n UNION\n SELECT t.project, ROUND(SUM(t.prograss * (t.percent / 100)), 2) as prograss\n FROM (\n SELECT t21.id,t21.percent, t22.project,\n IF(SUM(t22.consumed) + SUM(IF(t22.status != \'closed\' && t22.status != \'cancel\', t22.`left`, 0)) > 0, ROUND(SUM(t22.consumed) / (SUM(t22.consumed) + SUM(IF(t22.status != \'closed\' && t22.status != \'cancel\', t22.`left`, 0))) * 1000 / 1000 * 100, 2), 0) AS prograss\n FROM zt_project AS t21\n LEFT JOIN zt_task AS t22 ON t21.id = t22.execution\n WHERE t21.deleted = \'0\' AND t21.type = \'stage\'\n AND t22.deleted = \'0\' AND t22.parent < 1\n AND t22.id IS NOT NULL\n GROUP BY t21.id, t21.percent, t22.project\n ) t\n GROUP BY t.project\n) AS t2 ON t1.id = t2.project \nWHERE t1.deleted = \'0\'\nAND t1.status = \'doing\' \nAND t1.type = \'project\'\nAND ((IFNULL(prograss, 0) >= (DATEDIFF(NOW(), t1.`begin`) / DATEDIFF(t1.`end`, t1.`begin`) * 100) AND LEFT(t1.`end`, 4) != \'2059\' AND DATEDIFF(`end`, NOW()) >= 0) OR LEFT(t1.`end`, 4) = \'2059\' )','1','','admin','2022-12-07 14:59:41','admin','2022-12-07 14:59:41','0'),
@@ -510,9 +510,19 @@ CHANGE `repo` `repo` mediumint unsigned NOT NULL DEFAULT '0',
CHANGE `mr` `mr` mediumint unsigned NOT NULL DEFAULT '0',
CHANGE `entry` `entry` text NULL,
CHANGE `lines` `lines` varchar(10) NOT NULL DEFAULT '',
CHANGE `feedbackBy` `feedbackBy` varchar(100) NOT NULL DEFAULT '',
CHANGE `notifyEmail` `notifyEmail` varchar(100) NOT NULL DEFAULT '',
CHANGE `v1` `v1` varchar(40) NOT NULL DEFAULT '',
CHANGE `v2` `v2` varchar(40) NOT NULL DEFAULT '',
CHANGE `duplicateBug` `duplicateBug` mediumint unsigned NOT NULL DEFAULT '0',
CHANGE `linkBug` `linkBug` varchar(255) NOT NULL DEFAULT '',
CHANGE `case` `case` mediumint unsigned NOT NULL DEFAULT '0',
CHANGE `result` `result` mediumint unsigned NOT NULL DEFAULT '0',
CHANGE `testtask` `testtask` mediumint unsigned NOT NULL DEFAULT '0',
CHANGE `identify` `identify` mediumint unsigned NOT NULL DEFAULT '0',
CHANGE `deadline` `deadline` date NULL,
CHANGE `activatedCount` `activatedCount` smallint NOT NULL DEFAULT '0',
CHANGE `activatedDate` `activatedDate` datetime NULL,
CHANGE `assignedDate` `assignedDate` datetime NULL,
@@ -538,6 +548,7 @@ CHANGE `reviewedDate` `reviewedDate` date NULL,
CHANGE `lastEditedDate` `lastEditedDate` datetime NULL,
CHANGE `lastRunner` `lastRunner` varchar(30) NOT NULL DEFAULT '',
CHANGE `lastRunDate` `lastRunDate` datetime NULL,
CHANGE `color` `color` char(7) NOT NULL DEFAULT '',
CHANGE `frame` `frame` varchar(10) NOT NULL DEFAULT '',
CHANGE `stage` `stage` varchar(255) NOT NULL DEFAULT '',
CHANGE `howRun` `howRun` varchar(30) NOT NULL DEFAULT '',
@@ -550,6 +561,7 @@ CHANGE `fromCaseID` `fromCaseID` mediumint unsigned NOT NULL DEFAULT '0',
CHANGE `lastRunResult` `lastRunResult` char(30) NOT NULL DEFAULT '';
ALTER TABLE `zt_chart`
CHANGE `dataset` `dataset` varchar(30) NOT NULL DEFAULT '0',
CHANGE `editedBy` `editedBy` varchar(30) NOT NULL DEFAULT '',
CHANGE `editedDate` `editedDate` datetime NULL;
@@ -575,6 +587,10 @@ CHANGE `finishedBy` `finishedBy` char(30) NOT NULL DEFAULT '',
CHANGE `finishedDate` `finishedDate` datetime NULL;
ALTER TABLE `zt_design`
CHANGE `commit` `commit` text NULL,
CHANGE `commitedBy` `commitedBy` varchar(30) NOT NULL DEFAULT '',
CHANGE `status` `status` varchar(30) NOT NULL DEFAULT '',
CHANGE `version` `version` smallint NOT NULL DEFAULT '0',
CHANGE `editedBy` `editedBy` varchar(30) NOT NULL DEFAULT '',
CHANGE `editedDate` `editedDate` datetime NULL,
CHANGE `assignedTo` `assignedTo` varchar(30) NOT NULL DEFAULT '',
@@ -585,12 +601,17 @@ ALTER TABLE `zt_doc` ADD `editingDate` text NULL AFTER `editedDate`;
ALTER TABLE `zt_doc`
CHANGE `views` `views` smallint unsigned NOT NULL DEFAULT '0',
CHANGE `collector` `collector` text NULL,
CHANGE `groups` `groups` varchar(255) NOT NULL DEFAULT '',
CHANGE `users` `users` text NULL,
CHANGE `assignedTo` `assignedTo` varchar(30) NOT NULL DEFAULT '',
CHANGE `assignedDate` `assignedDate` datetime NULL,
CHANGE `approvedDate` `approvedDate` date NULL,
CHANGE `editedBy` `editedBy` varchar(30) NOT NULL DEFAULT '',
CHANGE `editedDate` `editedDate` datetime NULL;
ALTER TABLE `zt_doccontent`
CHANGE `digest` `digest` varchar(255) NOT NULL DEFAULT '';
ALTER TABLE `zt_doclib`
CHANGE `product` `product` mediumint unsigned NOT NULL DEFAULT '0',
CHANGE `project` `project` mediumint unsigned NOT NULL DEFAULT '0',
@@ -648,6 +669,25 @@ CHANGE `editedBy` `editedBy` varchar(30) NOT NULL DEFAULT '',
CHANGE `editedDate` `editedDate` datetime NULL;
ALTER TABLE `zt_host`
CHANGE `mac` `mac` varchar(128) NOT NULL DEFAULT '',
CHANGE `desc` `desc` text NULL,
CHANGE `tokenTime` `tokenTime` datetime NULL,
CHANGE `heartbeat` `heartbeat` datetime NULL,
CHANGE `vnc` `vnc` int NOT NULL DEFAULT '0',
CHANGE `ztf` `ztf` int NOT NULL DEFAULT '0',
CHANGE `zd` `zd` int NOT NULL DEFAULT '0',
CHANGE `ssh` `ssh` int NOT NULL DEFAULT '0',
CHANGE `serverRoom` `serverRoom` mediumint unsigned NOT NULL DEFAULT '0',
CHANGE `serverModel` `serverModel` varchar(256) NOT NULL DEFAULT '',
CHANGE `hardwareType` `hardwareType` varchar(64) NOT NULL DEFAULT '',
CHANGE `cpuBrand` `cpuBrand` varchar(128) NOT NULL DEFAULT '',
CHANGE `cpuModel` `cpuModel` varchar(128) NOT NULL DEFAULT '',
CHANGE `cpuNumber` `cpuNumber` varchar(16) NOT NULL DEFAULT '',
CHANGE `cpuCores` `cpuCores` varchar(30) NOT NULL DEFAULT '',
CHANGE `intranet` `intranet` varchar(128) NOT NULL DEFAULT '',
CHANGE `extranet` `extranet` varchar(128) NOT NULL DEFAULT '',
CHANGE `osName` `osName` varchar(64) NOT NULL DEFAULT '',
CHANGE `osVersion` `osVersion` varchar(64) NOT NULL DEFAULT '',
CHANGE `editedBy` `editedBy` varchar(30) NOT NULL DEFAULT '',
CHANGE `editedDate` `editedDate` datetime NULL;
@@ -721,6 +761,16 @@ CHANGE `activatedDate` `activatedDate` datetime NULL;
ALTER TABLE `zt_kanbancard`
CHANGE `begin` `begin` date NULL,
CHANGE `end` `end` date NULL,
CHANGE `name` `name` varchar(255) NOT NULL DEFAULT '',
CHANGE `pri` `pri` mediumint unsigned NOT NULL DEFAULT '0',
CHANGE `assignedTo` `assignedTo` text NULL,
CHANGE `desc` `desc` mediumtext NULL,
CHANGE `estimate` `estimate` float unsigned NOT NULL DEFAULT '0',
CHANGE `color` `color` char(7) NOT NULL DEFAULT '',
ALTER TABLE `zt_kanbancolumn`
CHANGE `type` `type` char(30) NOT NULL DEFAULT '';
CHANGE `fromID` `fromID` mediumint unsigned NOT NULL DEFAULT '0',
CHANGE `fromType` `fromType` varchar(30) NOT NULL DEFAULT '',
CHANGE `whitelist` `whitelist` text NULL,
@@ -882,6 +932,8 @@ ALTER TABLE `zt_projectstory`
CHANGE `branch` `branch` mediumint unsigned NOT NULL DEFAULT '0';
ALTER TABLE `zt_relation`
CHANGE `AVersion` `AVersion` char(30) NOT NULL DEFAULT '',
CHANGE `BVersion` `BVersion` char(30) NOT NULL DEFAULT '',
CHANGE `project` `project` mediumint NOT NULL DEFAULT '0',
CHANGE `product` `product` mediumint NOT NULL DEFAULT '0',
CHANGE `execution` `execution` mediumint NOT NULL DEFAULT '0',
@@ -1059,12 +1111,33 @@ ALTER TABLE `zt_team`
CHANGE `position` `position` varchar(30) NOT NULL DEFAULT '',
CHANGE `join` `join` date NULL;
ALTER TABLE `zt_testreport`
CHANGE `project` `project` mediumint unsigned NOT NULL DEFAULT '0',
CHANGE `product` `product` mediumint unsigned NOT NULL DEFAULT '0',
CHANGE `execution` `execution` mediumint unsigned NOT NULL DEFAULT '0',
CHANGE `stories` `stories` text NULL,
CHANGE `bugs` `bugs` text NULL,
CHANGE `cases` `cases` text NULL,
CHANGE `report` `report` text NULL,
CHANGE `deleted` `deleted` enum('0','1') NOT NULL DEFAULT '0';
ALTER TABLE `zt_testrun`
CHANGE `lastRunner` `lastRunner` varchar(30) NOT NULL DEFAULT '',
CHANGE `lastRunDate` `lastRunDate` datetime NULL,
CHANGE `lastRunResult` `lastRunResult` char(30) NOT NULL DEFAULT '';
ALTER TABLE `zt_testresult`
CHANGE `job` `job` mediumint unsigned NOT NULL DEFAULT '0',
CHANGE `compile` `compile` mediumint unsigned NOT NULL DEFAULT '0',
CHANGE `ZTFResult` `ZTFResult` text NULL,
CHANGE `duration` `duration` float NOT NULL DEFAULT '0',
CHANGE `xml` `xml` text NULL,
CHANGE `deploy` `deploy` mediumint unsigned NOT NULL DEFAULT '0';
ALTER TABLE `zt_testsuite`
CHANGE `project` `project` mediumint unsigned NOT NULL DEFAULT '0',
CHANGE `product` `product` mediumint unsigned NOT NULL DEFAULT '0',
CHANGE `deleted` `deleted` enum('0','1') NOT NULL DEFAULT '0',
CHANGE `lastEditedBy` `lastEditedBy` char(30) NOT NULL DEFAULT '',
CHANGE `lastEditedDate` `lastEditedDate` datetime NULL;
db/zentao.sql
+69 -70
View File
File diff suppressed because one or more lines are too long
lib/dao/dm.class.php
+2 -1
View File
@@ -70,9 +70,10 @@ class dm extends dao
*/
public function descTable($tableName)
{
$tableName = trim($tableName, '`');
$this->dbh->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
$sql = "select * from all_tab_columns where table_name = '$tableName'";
$rawFields = $this->dbh->rawQuery($sql)->fetchAll();
$rawFields = $this->dbh->query($sql)->fetchAll();
$this->dbh->setAttribute(PDO::ATTR_CASE, PDO::CASE_NATURAL);
$fields = array();
module/action/lang/de.php
+1 -1
View File
@@ -772,7 +772,7 @@ $lang->action->label->risk = 'Risk|risk|view|riskID=%s';
$lang->action->label->issue = 'Issue|issue|view|issueID=%s';
$lang->action->label->design = 'Design|design|view|designID=%s';
$lang->action->label->stakeholder = 'Stakeholder|stakeholder|view|userID=%s';
$lang->action->label->api = 'Interface|api|index|libID=%s&moduleID=%s&apiID=%s';
$lang->action->label->api = 'Interface|api|view|libID=%s&apiID=%s&moduleID=%s';
$lang->action->label->kanbanspace = 'Kanban Space|kanban|space|browseType=%s';
$lang->action->label->kanbanregion = 'Kanban Region|kanban|view|kanbanID=%s';
$lang->action->label->kanban = 'Kanban|kanban|view|kanbanID=%s';
module/action/lang/en.php
+1 -1
View File
@@ -772,7 +772,7 @@ $lang->action->label->risk = 'Risk|risk|view|riskID=%s';
$lang->action->label->issue = 'Issue|issue|view|issueID=%s';
$lang->action->label->design = 'Design|design|view|designID=%s';
$lang->action->label->stakeholder = 'Stakeholder|stakeholder|view|userID=%s';
$lang->action->label->api = 'Interface|api|index|libID=%s&moduleID=%s&apiID=%s';
$lang->action->label->api = 'Interface|api|view|libID=%s&apiID=%s&moduleID=%s';
$lang->action->label->kanbanspace = 'Kanban Space|kanban|space|browseType=%s';
$lang->action->label->kanbanregion = 'Kanban Region|kanban|view|kanbanID=%s';
$lang->action->label->kanban = 'Kanban|kanban|view|kanbanID=%s';
module/action/lang/fr.php
+1 -1
View File
@@ -772,7 +772,7 @@ $lang->action->label->risk = 'Risk|risk|view|riskID=%s';
$lang->action->label->issue = 'Issue|issue|view|issueID=%s';
$lang->action->label->design = 'Design|design|view|designID=%s';
$lang->action->label->stakeholder = 'Stakeholder|stakeholder|view|userID=%s';
$lang->action->label->api = 'Interface|api|index|libID=%s&moduleID=%s&apiID=%s';
$lang->action->label->api = 'Interface|api|view|libID=%s&apiID=%s&moduleID=%s';
$lang->action->label->kanbanspace = 'Kanban Space|kanban|space|browseType=%s';
$lang->action->label->kanbanregion = 'Kanban Region|kanban|view|kanbanID=%s';
$lang->action->label->kanban = 'Kanban|kanban|view|kanbanID=%s';
module/action/lang/zh-cn.php
+1 -1
View File
@@ -772,7 +772,7 @@ $lang->action->label->risk = '风险|risk|view|riskID=%s';
$lang->action->label->issue = '问题|issue|view|issueID=%s';
$lang->action->label->design = '设计|design|view|designID=%s';
$lang->action->label->stakeholder = '干系人|stakeholder|view|userID=%s';
$lang->action->label->api = '接口|api|index|libID=%s&moduleID=%s&apiID=%s';
$lang->action->label->api = '接口|api|view|libID=%s&apiID=%s&moduleID=%s';
$lang->action->label->kanbanspace = '看板空间|kanban|space|browseType=%s';
$lang->action->label->kanbanregion = '看板区域|kanban|view|kanbanID=%s';
$lang->action->label->kanban = '看板|kanban|view|kanbanID=%s';
module/action/model.php
+2 -1
View File
@@ -53,6 +53,7 @@ class actionModel extends model
if($objectType == 'story' and strpos(',reviewpassed,reviewrejected,reviewclarified,reviewreverted,synctwins,', ",$actionType,") !== false) $action->actor = $this->lang->action->system;
/* Use purifier to process comment. Fix bug #2683. */
if(empty($comment)) $comment = '';
$action->comment = fixer::stripDataTags($comment);
/* Process action. */
@@ -1624,7 +1625,7 @@ class actionModel extends model
elseif($action->objectType == 'api')
{
$api = $this->dao->select('id,lib,module')->from(TABLE_API)->where('id')->eq($action->objectID)->fetch();
$params = sprintf($vars, $api->lib, $api->module, $api->id);
$params = sprintf($vars, $api->lib, $api->id, $api->module);
}
elseif($action->objectType == 'branch')
{
module/api/config.php
+1
View File
@@ -24,6 +24,7 @@ $config->api->editor->createlib = array('id' => 'desc', 'tools' => 'simpleTo
$config->api->editor->editlib = array('id' => 'desc', 'tools' => 'simpleTools');
$config->api->editor->create = array('id' => 'desc', 'tools' => 'simpleTools');
$config->api->editor->edit = array('id' => 'desc', 'tools' => 'simpleTools');
$config->api->editor->view = array('id' => 'comment,lastComment', 'tools' => 'simple');
$config->api->editor->createRelease = array('id' => 'desc', 'tools' => 'simpleTools');
$config->api->editor->createstruct = array('id' => 'desc', 'tools' => 'simpleTools');
$config->api->editor->editstruct = array('id' => 'desc', 'tools' => 'simpleTools');
module/api/control.php
+38 -16
View File
@@ -41,8 +41,12 @@ class api extends control
*/
public function index($libID = 0, $moduleID = 0, $apiID = 0, $version = 0, $release = 0, $appendLib = 0, $browseType = '', $param = 0)
{
$this->session->set('spaceType', 'api', 'doc');
$this->session->set('structList', $this->app->getURI(true), 'doc');
if(!$apiID)
{
$this->session->set('spaceType', 'api', 'doc');
$this->session->set('structList', inLink('index', "libID=$libID&moduleID=$moduleID"), 'doc');
setCookie("docSpaceParam", '', $this->config->cookieLife, $this->config->webRoot, '', false, true);
}
$this->setMenu($libID);
$objectType = $this->objectType;
@@ -144,14 +148,14 @@ class api extends control
* @param int $libID
* @param int $apiID
* @param int $moduleID
* @param int $release
* @param int $version
* @param int $release
* @access public
* @return void
*/
public function view($libID, $apiID, $moduleID = 0, $release = 0, $version = 0)
public function view($libID, $apiID, $moduleID = 0, $version = 0, $release = 0)
{
$this->setMenu($libID);
if(!strpos($this->server->http_referer, 'space') and !strpos($this->server->http_referer, 'api')) setCookie("docSpaceParam", '', $this->config->cookieLife, $this->config->webRoot, '', false, true);
/* Get all api doc libraries. */
$libs = $this->doc->getApiLibs($libID);
@@ -180,24 +184,39 @@ class api extends control
$linkParams = "libID=$lib->id";
if($methodName != 'index') $linkParams = "objectID=$linkObject&$linkParams";
$crumbs[] = html::a(inLink($methodName, $linkParams), html::image("static/svg/interface.svg") . $lib->name);
$moduleList = $this->loadModel('tree')->getParents($api->module);
foreach($moduleList as $module)
$objectID = $this->objectID;
if($this->cookie->docSpaceParam)
{
$linkParams .= "&moduleID=$module->id";
$crumbs[] = html::a(inLink($methodName, $linkParams), $module->name);
}
$docParam = json_decode($this->cookie->docSpaceParam);
$type = $docParam->type;
$objectID = $docParam->objectID;
$libID = $docParam->libID;
$moduleID = $docParam->moduleID;
$browseType = $docParam->browseType;
$param = $docParam->param;
list($libs, $libID, $object, $objectID, $objectDropdown) = $this->doc->setMenuByType($type, $objectID, $libID);
$libTree = $this->doc->getLibTree($libID, $libs, $type, $moduleID, $objectID, $browseType, $param);
}
else
{
$objectDropdown = $this->generateLibsDropMenu($libs[$libID], $release);
$libTree = $this->doc->getLibTree($libID, $libs, 'api', $moduleID);
}
$this->view->title = $this->lang->api->pageTitle;
$this->view->libs = $libs;
$this->view->isRelease = $release > 0;
$this->view->release = $release;
$this->view->version = $version;
$this->view->libID = $libID;
$this->view->apiID = $apiID;
$this->view->crumbs = $crumbs;
$this->view->moduleID = $moduleID;
$this->view->objectType = $type;
$this->view->type = $type;
$this->view->objectID = $objectID;
$this->view->users = $this->user->getPairs('noclosed,noletter');
$this->view->moduleTree = $this->doc->getApiModuleTree($libID, $apiID, $release, $moduleID);
$this->view->objectDropdown = $this->generateLibsDropMenu($libs[$libID], $release);
$this->view->libTree = $libTree;
$this->view->objectDropdown = $objectDropdown;
$this->display();
}
@@ -653,7 +672,7 @@ class api extends control
}
else
{
return print(js::locate(inlink('index', "libID=$api->lib&module=$api->module"), 'parent'));
return print(js::locate($this->session->structList ? $this->session->structList : inlink('index', "libID=$api->lib&module=$api->module"), 'parent'));
}
}
}
@@ -752,7 +771,10 @@ class api extends control
$this->lang->doc->menu->api['exclude'] = 'api-' . $this->app->rawMethod;
$this->lang->doc->menu->{$this->session->spaceType}['subModule'] = 'api';
}
else
{
$this->lang->doc->menu->{$this->session->spaceType}['alias'] .= ',' . $this->app->rawMethod;
}
}
/**
module/api/css/common.css
+20
View File
@@ -163,3 +163,23 @@ form .table-data, #content .table-data {border: 1px solid #e2e2e3;}
.info .version, .info .crumbs {float: left;}
.info .crumbs {font-size: 13px; margin-top: 5px; font-weight: normal;}
.info .crumbs img {margin-right: 3px;}
.lib {width: unset; margin-bottom: unset;}
.flex {display: flex;}
.flex-none {flex: none;}
.flex-auto {flex: auto;}
.flex-full > .panel {box-shadow: none;}
.float-r {float: right;}
.h-full {height: 100%;}
.w-full {width: 100%;}
.overflow-x-auto {overflow-x: auto;}
.overflow-auto {overflow: auto;}
.overflow-visible {overflow: visible;}
.overflow-hidden {overflow: hidden;}
.img-lib {width: 14px; height: 14px; margin-bottom: 2px; flex: 0 0 14px;}
#mainContent {padding-top: 0; padding-bottom: 0;}
#mainContent #createDropdown {display: inline-block;}
#mainContent #createDropdown ul {position: absolute;}
#pageNav .dropdown-menu {max-height: inherit;}
#mainContent > .panel {margin-bottom: 0; height: calc(100vh - 125px); overflow-y: auto;}
#mainContent > .main-col {padding-left: 0;}
module/api/css/index.css
-20
View File
@@ -1,24 +1,4 @@
.lib {width: unset; margin-bottom: unset;}
.flex {display: flex;}
.flex-none {flex: none;}
.flex-auto {flex: auto;}
.flex-full > .panel {box-shadow: none;}
.float-r {float: right;}
.h-full {height: 100%;}
.w-full {width: 100%;}
.overflow-x-auto {overflow-x: auto;}
.overflow-auto {overflow: auto;}
.overflow-visible {overflow: visible;}
.overflow-hidden {overflow: hidden;}
.img-lib {width: 14px; height: 14px; margin-bottom: 2px; flex: 0 0 14px;}
.cell {padding: 0;}
#mainContent {padding-top: 0; padding-bottom: 0;}
#mainContent #createDropdown {display: inline-block;}
#mainContent #createDropdown ul {position: absolute;}
#pageNav .dropdown-menu {max-height: inherit;}
#mainContent > .panel {margin-bottom: 0; height: calc(100vh - 125px); overflow-y: auto;}
#mainContent > .main-col {padding-left: 0;}
.no-content {width: 100px; height: 100px; margin: 0 auto;}
.notice {text-align: center; padding-left: 15px; padding-top: 20px;}
.no-content-button {text-align: center; padding-top: 20px;}
module/api/css/view.css
+12
View File
@@ -0,0 +1,12 @@
.flex-content #content {flex: auto; overflow-y: auto; height: calc(100vh - 125px);}
.flex-content #history {flex: 0 0 302px; position: relative; overflow: auto;}
.flex-content #history > #closeBtn {position: absolute; right: 10px; top: 10px;}
#content .detail-content.article-content::-webkit-scrollbar,
#outlineMenu::-webkit-scrollbar,
#history::-webkit-scrollbar {height: 0px; width: 0px; background: transparent;}
#content .detail-content.article-content::-moz-scrollbar,
#outlineMenu::-moz-scrollbar,
#hostory::-moz-scrollbar {height: 0px; width: 0px; background: transparent;}
.main-col iframe {min-height: unset;}
.bottom-btn-tree {display: none;}
module/api/js/view.js
+39 -1
View File
@@ -104,7 +104,7 @@ $(function()
$('.menu-actions > a').blur(function() {$(this).css('background', 'none');})
/* Update doc content silently on switch doc version, story #40503 */
$(document).on('click', '.api-version-menu a, #mainActions .container a', function(event)
$('body').on('click', '.api-version-menu a, #mainActions .container a', function(event)
{
var $tmpDiv = $('<div>');
$tmpDiv.load($(this).data('url') + ' #mainContent', function()
@@ -117,5 +117,43 @@ $(function()
$('#outline li.has-list').addClass('open in');
$('#outline li.has-list>i+ul').prev('i').remove();
});
}).on('click', '.comment-edit-form .btn-hide-form', function()
{
$('.comment-edit-form #submit').attr('disabled', false);
}).on('click', '#docVersionMenu.diff > .drop-body > li', function(e)
{
e.stopPropagation();
}).on('click', '#docVersionMenu #changeBtn', function(e)
{
$('#docVersionMenu').addClass('diff');
e.stopPropagation();
}).on('click', '#hisTrigger', function()
{
var $history = $('#history');
var $icon = $(this);
if($history.hasClass('hidden'))
{
$history.removeClass('hidden');
$icon.addClass('text-primary');
}
else
{
$history.addClass('hidden');
$icon.removeClass('text-primary');
}
}).on('click', '#closeBtn', function()
{
$('#history').addClass('hidden');
$('#hisTrigger').removeClass('text-primary');
});
$('#history').append('<a id="closeBtn" href="###" class="btn btn-link"><i class="icon icon-close"></i></a>');
$('#history').find('.btn.pull-right').removeClass('pull-right');
$('.comment-edit-form').ajaxForm({
success: function(data) {
location.reload();
}
})
});
module/api/view/content.html.php
+7 -48
View File
@@ -1,5 +1,5 @@
<div class="main-col" data-min-width="500">
<div id="mainContent" class="main-row in">
<div id="mainContent" class="main-row in flex-content">
<div class="main-col col-8">
<div class="cell" id="content">
<div class="no-padding">
@@ -20,7 +20,6 @@
</ul>
</div>
</div>
<div class="crumbs"><?php echo implode(' > ', $crumbs);?></div>
</div>
<div class="actions">
<?php echo html::a("javascript:fullScreen()", '<span class="icon-fullscreen"></span>', '', "title='{$lang->fullscreen}' class='btn btn-link fullscreen-btn'");?>
@@ -31,6 +30,7 @@
if(common::hasPriv('api', 'delete')) echo html::a($this->createLink('api', 'delete', "apiID=$api->id"), '<i class="icon-trash"></i>', '', "title='{$lang->api->delete}' class='btn btn-link' target='hiddenwin'");
}
?>
<a id="hisTrigger" href="###" class="btn btn-link" title=<?php echo $lang->history?>><span class="icon icon-clock"></span></a>
</div>
</div>
</div>
@@ -146,53 +146,12 @@
<?php endif;?>
</div>
</div>
<!-- 历史记录 -->
<div class='cell'>
<?php
$canBeChanged = common::canBeChanged('api', $api);
if($canBeChanged) $actionFormLink = $this->createLink('action', 'comment', "objectType=api&objectID=$api->id");?>
<?php include '../../common/view/action.html.php';?>
</div>
</div>
<div class="side-col col-2" id="sidebar">
<div class="sidebar-toggle">
<i class="icon icon-angle-right"></i>
</div>
<div class="cell">
<details class="detail" open>
<summary class="detail-title"><?php echo $lang->api->basicInfo;?></summary>
<div class="detail-content">
<table class="table table-data">
<tbody>
<tr>
<th class='c-lib'><?php echo $lang->api->lib;?></th>
<td><?php echo $api->libName;?></td>
</tr>
<tr>
<th><?php echo $lang->doc->module;?></th>
<td><?php echo $api->moduleName ? $api->moduleName : '/';?></td>
</tr>
<tr>
<th><?php echo $lang->doc->addedDate;?></th>
<td><?php echo $api->addedDate;?></td>
</tr>
<tr>
<th><?php echo $lang->api->owner;?></th>
<td><?php echo zget($users, $api->owner, '');?></td>
</tr>
<tr>
<th><?php echo $lang->doc->editedBy;?></th>
<td><?php echo zget($users, $api->editedBy, '');?></td>
</tr>
<tr>
<th><?php echo $lang->doc->editedDate;?></th>
<td><?php echo $api->editedDate;?></td>
</tr>
</tbody>
</table>
</div>
</details>
</div>
<div id="history" class='panel hidden' style="margin-left: 2px;">
<?php
$canBeChanged = common::canBeChanged('api', $api);
if($canBeChanged) $actionFormLink = $this->createLink('action', 'comment', "objectType=api&objectID=$api->id");?>
<?php include '../../common/view/action.html.php';?>
</div>
</div>
</div>
module/api/view/index.html.php
+1 -1
View File
@@ -48,7 +48,7 @@
<div class="sidebar-toggle flex-center"><i class="icon icon-angle-left"></i></div>
<div class="main-col flex-full overflow-visible flex-auto overflow-visible" data-min-width="500">
<div class="cell<?php if($browseType == 'bySearch') echo ' show';?>" style="min-width: 400px" id="queryBox" data-module='api'></div>
<?php include 'apilist.html.php';?>
<?php include 'apilist.html.php';?>
</div>
<?php endif;?>
</div>
module/api/view/view.html.php
+29 -41
View File
@@ -11,48 +11,36 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?>
<?php js::set('confirmDelete', $lang->api->confirmDelete);?>
<div class="cell<?php if($browseType == 'bySearch') echo ' show';?>" id="queryBox" data-module=<?php echo 'api';?>></div>
<div class="fade main-row split-row" id="mainRow">
<?php if($libID):?>
<?php $sideWidth = common::checkNotCN() ? '270' : '238';?>
<div class="side-col" style="width:<?php echo $sideWidth;?>px" data-min-width="<?php echo $sideWidth;?>">
<div class="cell" style="min-height: 286px; overflow: visible;">
<div id='title'>
<li class='menu-title'>
<div class="title"><?php echo $this->lang->api->module;?></div>
</li>
<?php
$canTreeBrowse = common::hasPriv('tree', 'browse');
$canViewReleases = common::hasPriv('api', 'releases');
$canEditLib = common::hasPriv('api', 'editLib');
$canDeleteLib = common::hasPriv('api', 'deleteLib');
$haveMoreButton = ($canTreeBrowse or $canViewReleases or $canEditLib or $canDeleteLib);
if(!$isRelease and $haveMoreButton)
{
echo "<div class='menu-actions'>";
echo html::a('javascript:;', "<i class='icon icon-ellipsis-v'></i>", '', "data-toggle='dropdown' class='btn btn-link'");
echo "<ul class='dropdown-menu pull-right'>";
if($canTreeBrowse) echo '<li>' . html::a($this->createLink('tree', 'browse', "rootID=$libID&view=api", '', true), '<i class="icon-cog-outline"></i> ' . $this->lang->api->manageType, '', "class='iframe' data-width='1200px'") . '</li>';
if($canViewReleases) echo '<li>' . html::a($this->createLink('api', 'releases', "libID=$libID", '', true), '<i class="icon-version"></i> ' . $this->lang->api->managePublish, '', "class='iframe'") . '</li>';
echo "<li class='divider'></li>";
if($canEditLib) echo '<li>' . html::a($this->createLink('api', 'editLib', "rootID=$libID"), '<i class="icon-edit"></i> ' . $lang->api->editLib, '', "class='iframe'") . '</li>';
if($canDeleteLib) echo '<li>' . html::a($this->createLink('api', 'deleteLib', "rootID=$libID"), '<i class="icon-trash"></i> ' . $lang->api->deleteLib, 'hiddenwin') . '</li>';
echo '</ul></div>';
}
?>
</div>
<?php if(!$moduleTree):?>
<hr class="space">
<?php if(!$isRelease):?>
<div class="text-center text-muted tips"><?php echo $lang->api->noModule;?></div>
<?php endif;?>
<?php endif;?>
<?php echo $moduleTree;?>
</div>
<?php js::set('treeData', $libTree);?>
<?php js::set('apiID', $apiID);?>
<style>.panel-body{min-height: 180px}</style>
<div id="mainMenu" class="clearfix">
<div id="leftBar" class="btn-toolbar pull-left">
<?php echo $objectDropdown;?>
<?php $gobackLink = $this->session->structList ? $this->session->structList : inlink('index', "libID=$libID&moduleID=$moduleID");?>
<?php echo html::a($gobackLink, "<i class='icon-back'></i> " . $lang->goback, '', "class='btn btn-link'");?>
</div>
<div class="btn-toolbar pull-right">
<?php
if($libTree and common::hasPriv('api', 'struct')) echo html::a($this->createLink('api', 'struct', "libID=$libID"), "<i class='icon-treemap muted'> </i>" . $lang->api->struct, '', "class='btn btn-link'");
if($libTree and common::hasPriv('api', 'releases')) echo html::a($this->createLink('api', 'releases', "libID=$libID", 'html', true), "<i class='icon-version muted'> </i>" . $lang->api->releases, '', "class='btn btn-link iframe' data-width='800px'");
if($libTree and common::hasPriv('api', 'createRelease')) echo html::a($this->createLink('api', 'createRelease', "libID=$libID"), "<i class='icon-publish muted'> </i>" . $lang->api->createRelease, '', "class='btn btn-link iframe' data-width='800px'");
if($objectType == 'api' and common::hasPriv('api', 'createLib')) echo html::a($this->createLink('api', 'createLib', "type=" . ($objectType ? $objectType : 'nolink') . "&objectID=$objectID"), '<i class="icon icon-plus"></i> ' . $lang->api->createLib, '', 'class="btn btn-secondary iframe" data-width="800px"');
if($objectType != 'api' and common::hasPriv('doc', 'createLib')) echo html::a($this->createLink('doc', 'createLib', "type=" . ($objectType ? $objectType : 'nolink') . "&objectID=$objectID"), '<i class="icon icon-plus"></i> ' . $lang->api->createLib, '', 'class="btn btn-secondary iframe" data-width="800px"');
if($libTree and common::hasPriv('api', 'create')) echo html::a($this->createLink('api', 'create', "libID=$libID&moduleID=$moduleID"), '<i class="icon icon-plus"></i> ' . $lang->api->createApi, '', 'class="btn btn-primary"');
?>
</div>
</div>
<div id='mainContent' class="fade flex">
<div id='sideBar' class="panel side side-col col overflow-auto" data-min-width="150">
<?php include '../../doc/view/lefttree.html.php';?>
</div>
<div class="sidebar-toggle flex-center"><i class="icon icon-angle-left"></i></div>
<div class="main-col flex-full overflow-visible flex-auto overflow-visible" data-min-width="500">
<div class="cell<?php if($browseType == 'bySearch') echo ' show';?>" style="min-width: 400px" id="queryBox" data-module='api'></div>
<?php include 'apilist.html.php';?>
</div>
<?php endif;?>
<?php include 'apilist.html.php';?>
</div>
<?php include '../../common/view/footer.html.php';?>
module/block/view/docmycollectionblock.html.php
+1 -1
View File
@@ -20,7 +20,7 @@
.block-docmycollection .doc-list > .doc-box > .btn.no-priv p {pointer-events: none;}
.block-docmycollection .doc-list > .doc-box .date-interval {float: right; padding: 8px 0 8px 12px;}
.block-docmycollection .doc-list > .doc-box > .btn > h4 {padding-right: 5px;}
.block-docmycollection .doc-list > .doc-box .file-icon {margin-right: 2px; width: 14px;}
.block-docmycollection .doc-list > .doc-box .file-icon {margin-right: 2px; margin-bottom: 2px;}
.block-docmycollection .doc-list > .doc-box .plug-title {height: 16px; overflow: hidden;}
.block-docmycollection.block-sm .doc-list > .doc-box {flex: 0 1 100%;}
module/block/view/docrecentupdateblock.html.php
+1 -1
View File
@@ -20,7 +20,7 @@
.block-docrecentupdate .doc-list > .doc-box > .btn.no-priv p {pointer-events: none;}
.block-docrecentupdate .doc-list > .doc-box .date-interval {float: right; padding: 8px 0 8px 12px;}
.block-docrecentupdate .doc-list > .doc-box > .btn > h4 {padding-right: 5px;}
.block-docrecentupdate .doc-list > .doc-box .file-icon {margin-right: 2px; width: 14px;}
.block-docrecentupdate .doc-list > .doc-box .file-icon {margin-right: 2px; margin-bottom: 2px;}
.block-docrecentupdate .doc-list > .doc-box .plug-title {height: 16px; overflow: hidden;}
.block-docrecentupdate.block-sm .doc-list > .doc-box {flex: 0 1 100%;}
module/block/view/docstatisticblock.html.php
+1 -1
View File
@@ -15,7 +15,7 @@
.block-docstatistic .flex-column {flex-direction: column; padding-left: 10px;}
.block-docstatistic .statistic {flex: 0 1 32%;}
.block-docstatistic .created {flex: 0 1 48%;}
.block-docstatistic .edited {flex: 0 1 16%; padding-left: 20px;}
.block-docstatistic .edited {flex: 0 1 16%; padding-left: 0px;}
.block-docstatistic .divider {border-right: 1px solid #eee; padding-right: 12%;}
.block-docstatistic .panel-body {padding-top: 0;}
module/block/view/productdocblock.html.php
+7 -7
View File
@@ -51,14 +51,14 @@
.forty-percent {width: 40%;}
html[lang="de"] .block-productdoc .c-user{width: 105px;}
.block-productdoc #productType {position: absolute;top: 6px;left: 120px;}
.block-productdoc #productType {position: absolute;top: 8px;left: 120px;}
.block-productdoc #productType .btn {border:0px;}
.block-productdoc #productType .btn:hover {background-color:#f5f5f5;}
.block-productdoc .table .c-name > .doc-title {display: inline-block; overflow: hidden; background: transparent; padding-right:0px;}
.block-productdoc .table .c-name > span.doc-title {line-height: 0; vertical-align: inherit;}
.block-productdoc .table .c-name[data-status=draft] > .doc-title {max-width: calc(100% - 35px);}
.block-productdoc .table .c-name > .draft {background-color:rgba(129, 102, 238, 0.12); color:#8166EE;}
.block-productdoc .table .c-title > .doc-title {display: inline-block; overflow: hidden; background: transparent; padding-right:0px;}
.block-productdoc .table .c-title > span.doc-title {line-height: 0; vertical-align: inherit;}
.block-productdoc .table .c-title[data-status=draft] > .doc-title {max-width: calc(100% - 35px);}
.block-productdoc .table .c-title > .draft {background-color:rgba(129, 102, 238, 0.12); color:#8166EE;}
</style>
<?php $blockNavId = 'nav-' . uniqid(); ?>
<script>
@@ -113,7 +113,7 @@ function change<?php echo "block{$block->id}";?>ProductType(type)
</ul>
</div>
<div class="panel-body">
<div class="table-row">
<div class="table-row block-statistic">
<?php if(empty($products) and empty($involveds)):?>
<div class="table-empty-tip">
<p><span class="text-muted"><?php echo $lang->block->emptyTip;?></span></p>
@@ -159,7 +159,7 @@ function change<?php echo "block{$block->id}";?>ProductType(type)
<tbody>
<?php foreach($docGroup[$product->id] as $doc):?>
<tr>
<td class='c-name' data-status='<?php echo $doc->status?>'>
<td class='c-title' data-status='<?php echo $doc->status?>'>
<?php
$docType = zget($config->doc->iconList, $doc->type);
$icon = html::image("static/svg/{$docType}.svg", "class='file-icon'");
module/block/view/projectdocblock.html.php
+7 -7
View File
@@ -51,14 +51,14 @@
.forty-percent {width: 40%;}
html[lang="de"] .block-projectdoc .c-user{width: 105px;}
.block-projectdoc #projectType {position: absolute;top: 6px;left: 120px;}
.block-projectdoc #projectType {position: absolute;top: 8px;left: 120px;}
.block-projectdoc #projectType .btn {border:0px;}
.block-projectdoc #projectType .btn:hover {background-color:#f5f5f5;}
.block-projectdoc .table .c-name > .doc-title {display: inline-block; overflow: hidden; background: transparent; padding-right:0px;}
.block-projectdoc .table .c-name > span.doc-title {line-height: 0; vertical-align: inherit;}
.block-projectdoc .table .c-name[data-status=draft] > .doc-title {max-width: calc(100% - 35px);}
.block-projectdoc .table .c-name > .draft {background-color:rgba(129, 102, 238, 0.12); color:#8166EE;}
.block-projectdoc .table .c-title > .doc-title {display: inline-block; overflow: hidden; background: transparent; padding-right:0px;}
.block-projectdoc .table .c-title > span.doc-title {line-height: 0; vertical-align: inherit;}
.block-projectdoc .table .c-title[data-status=draft] > .doc-title {max-width: calc(100% - 35px);}
.block-projectdoc .table .c-title > .draft {background-color:rgba(129, 102, 238, 0.12); color:#8166EE;}
</style>
<script>
<?php $blockNavId = 'nav-' . uniqid(); ?>
@@ -113,7 +113,7 @@ function change<?php echo "block{$block->id}";?>ProjectType(type)
</ul>
</div>
<div class="panel-body">
<div class="table-row">
<div class="table-row block-statistic">
<?php if(empty($projects) and empty($involveds)):?>
<div class="table-empty-tip">
<p><span class="text-muted"><?php echo $lang->block->emptyTip;?></span></p>
@@ -159,7 +159,7 @@ function change<?php echo "block{$block->id}";?>ProjectType(type)
<tbody>
<?php foreach($docGroup[$project->id] as $doc):?>
<tr>
<td class='c-name' data-status='<?php echo $doc->status?>'>
<td class='c-title' data-status='<?php echo $doc->status?>'>
<?php
$docType = zget($config->doc->iconList, $doc->type);
$icon = html::image("static/svg/{$docType}.svg", "class='file-icon'");
module/bug/control.php
+1 -1
View File
@@ -857,7 +857,7 @@ class bug extends control
$this->view->stories = $stories;
$this->view->builds = $builds;
$this->view->users = $this->user->getPairs('devfirst|noclosed');
$this->view->projects = array('' => '') + $this->product->getProjectPairsByProduct($productID, $branch ? "0,$branch" : 0, 'id_desc', $projectID);
$this->view->projects = array('' => '') + $this->product->getProjectPairsByProduct($productID, $branch ? "0,$branch" : 0);
$this->view->projectID = $projectID;
$this->view->executions = array('' => '') + $this->product->getExecutionPairsByProduct($productID, $branch ? "0,$branch" : 0, 'id_desc', $projectID, 'multiple,stagefilter');
$this->view->executionID = $executionID;
module/bug/js/view.js
+1 -1
View File
@@ -44,7 +44,7 @@ $('#toTaskButton').on('click', function()
if(projectID && executionID != 0)
{
$('#cancelButton').click();
link = createLink('task', 'create', 'executionID=' + executionID + '&storyID=0&moduleID=0&taskID=0&todoID=0&extra=projectID=' + projectID + '&bugID=' + bugID);
var link = createLink('task', 'create', 'executionID=' + executionID + '&storyID=0&moduleID=0&taskID=0&todoID=0&extra=projectID=' + projectID + '&bugID=' + bugID);
window.parent.$.apps.open(link, $('#execution').data('multiple') == 0 ? 'project' : 'execution');
}
else if(projectID == 0)
module/chart/model.php
+6 -2
View File
@@ -100,10 +100,14 @@ class chartModel extends model
if(!$groups) return array('', array());
$chartGroups = array();
$this->loadModel('screen');
foreach($groups as $group)
{
$chartGroups[$group->id] = $this->dao->select('*')->from(TABLE_CHART)
->where('deleted')->eq(0)
->andWhere('builtin', true)->eq('0')
->orWhere('id')->in($this->config->screen->builtinChart)
->markRight(1)
->andWhere("FIND_IN_SET($group->id, `group`)")
->andWhere('stage')->ne('draft')
->orderBy($orderBy)
@@ -390,7 +394,7 @@ class chartModel extends model
$optionList = $this->getSysOptions($fields[$group]['type'], $fields[$group]['object'], $fields[$group]['field']);
foreach($xLabels as $index => $xLabel) $xLabels[$index] = isset($optionList[$xLabel]) ? $optionList[$xLabel] : $xLabel;
$xaxis = array('type' => 'category', 'data' => $xLabels);
$xaxis = array('type' => 'category', 'data' => $xLabels, 'boundaryGap' => false);
$yaxis = array('type' => 'value');
$legend = new stdclass();
$series = array();
@@ -448,7 +452,7 @@ class chartModel extends model
$optionList = $this->getSysOptions($fields[$group]['type'], $fields[$group]['object'], $fields[$group]['field']);
foreach($xLabels as $index => $xLabel) $xLabels[$index] = isset($optionList[$xLabel]) ? $optionList[$xLabel] : $xLabel;
$xaxis = array('type' => 'category', 'data' => $xLabels, 'axisLabel' => array('interval' => 0));
$xaxis = array('type' => 'category', 'data' => $xLabels, 'axisLabel' => array('interval' => 0), 'boundaryGap' => false);
$yaxis = array('type' => 'value');
$legend = new stdclass();
module/common/lang/menu.php
+1 -1
View File
@@ -501,7 +501,7 @@ $lang->doc->menu->dashboard = array('link' => "{$lang->dashboard}|doc|index");
$lang->doc->menu->my = array('link' => "{$lang->doc->mySpace}|doc|mySpace|type=mine", 'alias' => 'myspace');
$lang->doc->menu->product = array('link' => "{$lang->doc->productSpace}|doc|productSpace|", 'alias' => 'productspace');
$lang->doc->menu->project = array('link' => "{$lang->doc->projectSpace}|doc|projectSpace|", 'alias' => 'projectspace');
$lang->doc->menu->api = array('link' => "{$lang->doc->apiSpace}|api|index", 'alias' => 'api');
$lang->doc->menu->api = array('link' => "{$lang->doc->apiSpace}|api|index", 'alias' => '', 'exclude' => 'index');
$lang->doc->menu->custom = array('link' => "{$lang->doc->teamSpace}|doc|teamSpace|", 'alias' => 'teamspace');
$lang->doc->dividerMenu = ',product,';
module/dimension/config.php
+1 -1
View File
@@ -98,7 +98,7 @@ $config->dimension->chartUpgrade['efficiency']['staff']['cost'] = array('ch
$config->dimension->chartUpgrade['efficiency']['project'] = array();
$config->dimension->chartUpgrade['efficiency']['project']['progress'] = array('chart' => '10114,10115');
$config->dimension->chartUpgrade['efficiency']['project']['cost'] = array();
$config->dimension->chartUpgrade['efficiency']['project']['cost'] = array('chart' => '10022');
$config->dimension->chartUpgrade['efficiency']['project']['timelimit'] = array('chart' => '10014,10015,10016,10017,10020,10021,10018,10019');
$config->dimension->chartUpgrade['quality'] = array();
module/doc/control.php
+9
View File
@@ -1273,6 +1273,15 @@ class doc extends control
$this->session->set('spaceType', $type, 'doc');
$this->session->set('docList', $uri, 'doc');
$docSpaceParam = new stdclass();
$docSpaceParam->type = $type;
$docSpaceParam->objectID = $objectID;
$docSpaceParam->libID = $libID;
$docSpaceParam->moduleID = $moduleID;
$docSpaceParam->browseType = $browseType;
$docSpaceParam->param = $param;
setCookie("docSpaceParam", json_encode($docSpaceParam), $this->config->cookieLife, $this->config->webRoot, '', false, true);
if($moduleID) $libID = $this->tree->getById($moduleID)->root;
$isFirstLoad = $libID == 0 ? true : false;
if(empty($browseType)) $browseType = 'all';
module/doc/css/common.css
-1
View File
@@ -110,7 +110,6 @@ ol, ul {margin-bottom: 0}
#content .detail-content.article-content {overflow-y: auto; height: calc(100vh - 200px); padding-right: 20px;}
#content.scrollbar-hover .detail-content.article-content {height: 100%;}
#aclBox .acl-tip {color: #838a9d;}
.ajaxCollect > img.star-empty {margin-right: 0px;}
#outlineMenu {background: #fff; position: absolute; height: calc(100vh - 180px)!important; overflow-y: auto; top: 50px; right: 25px;}
.pl-0px {padding-left:0px !important;}
.icon {cursor: pointer;}
module/doc/css/view.css
+4 -3
View File
@@ -8,7 +8,8 @@
.main-col .doc-title .version .dropdown-menu a:hover {color: #ffffff;}
.main-col .doc-title .actions a + a {margin-left: 0px;}
.main-col .doc-title .actions i {font-size: 15px; color: #8c8c8c;}
#content .title {max-width: 54%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
#content .title {max-width: 40%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
.main-col .doc-title .actions a > span {color: #9EA3B0;}
#mainContent .scrollbar-hover {max-height: 2000px; overflow: scroll;}
#content .editor-preview {background: #fff}
#content .CodeMirror{border: none}
@@ -32,7 +33,7 @@
.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;}
.outline-toggle {position: absolute; right: 55px; top: 50px;}
.outline-toggle {position: absolute; right: 55px; top: 50px; background: #fff;}
.outline ul li {list-style: none;}
.outline-content {display: none; padding-top: 18px;}
.outline-content a {color: #838A9D;}
@@ -54,7 +55,7 @@
.overflow-auto {overflow: auto;}
.overflow-visible {overflow: visible;}
.overflow-hidden {overflow: hidden;}
.detail-title .actions .ajaxCollect > img {width: 20px;}
.detail-title .actions .ajaxCollect > img {width: 20px; height: 20px;}
.actions > .text {color: #8c8c8c; font-size: 14px;}
.flex-content {display: flex; width: 100%; height: 100%;}
.flex-content > #content {flex: auto; overflow-y: auto;}
module/doc/model.php
+5
View File
@@ -2391,6 +2391,11 @@ class docModel extends model
$currentModule = $this->app->rawModule;
$currentMethod = $this->app->rawMethod;
if($currentModule == 'api' and $currentMethod == 'index')
{
$currentModule = 'doc';
$currentMethod = $type . 'Space';
}
$dropMenuLink = helper::createLink('doc', 'ajaxGetDropMenu', "objectType=$type&objectID=$objectID&module=$currentModule&method=$currentMethod");
$output = "<div class='btn-group selectBox' id='swapper'><button data-toggle='dropdown' type='button' class='btn' id='currentItem' title='{$objectTitle}'><span class='text'>{$objectTitle}</span> <span class='caret' style='margin-bottom: -1px'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
module/doc/view/createtexttype.html.php
+1 -1
View File
@@ -27,7 +27,7 @@
<tbody>
<tr id='headerBox'>
<td width='90px'><?php echo html::backButton("<i class='icon icon-back icon-sm'></i> " . $lang->goback, "id='backBtn'", 'btn btn-secondary');?></td>
<td class="doc-title" colspan='3'><?php echo html::input('title', '', "placeholder='{$lang->doc->titlePlaceholder}' id='editorTitle' class='form-control' required");?></td>
<td class="doc-title" colspan='3'><?php echo html::input('title', '', "placeholder='{$lang->doc->titlePlaceholder}' id='editorTitle' class='form-control' required maxlength='100'");?></td>
<td class="text-right btn-tools">
<?php echo html::commonButton($lang->doc->saveDraft, "id='saveDraft' data-placement='bottom'", "btn btn-secondary");?>
<?php echo html::a('#modalBasicInfo', $lang->release->common, '', "data-toggle='modal' id='basicInfoLink' class='btn btn-primary'");?>
module/doc/view/lefttree.html.php
+16 -12
View File
@@ -74,6 +74,7 @@ li.drag-shadow ul {display: none !important;}
/* Release used for api space. */
js::set('release', isset($release) ? $release : 0);
js::set('versionLang', $lang->build->common);
js::set('spaceType', $this->session->spaceType);
/* ObjectType and objectID used for other space. */
js::set('objectType', isset($type) ? $type : '');
@@ -247,14 +248,14 @@ $(function()
function initTree(ele, treeData)
{
var imgObj = {
'annex': 'annex',
'api': 'interface',
'lib': 'wiki',
'execution': 'wiki-file-lib',
'text': 'wiki-file',
'word': 'word',
'ppt': 'ppt',
'excel': 'excel'
'annex' : 'annex',
'api' : 'interface',
'lib' : 'wiki',
'execution' : 'wiki-file-lib',
'text' : 'wiki-file',
'word' : 'word',
'ppt' : 'ppt',
'excel' : 'excel'
};
ele.tree(
@@ -269,7 +270,7 @@ $(function()
if(typeof docID != 'undefined' && item.id == docID) item.active = 1;
if(['text', 'word', 'ppt', 'excel'].indexOf(item.type) !== -1) item.hasAction = false;
var objectType = config.currentModule == 'api' ? item.objectType : item.type;
var objectType = config.currentModule == 'api' && ['project', 'product', 'execution'].indexOf(item.objectType) === false ? item.objectType : item.type;
var libClass = ['lib', 'annex', 'api', 'execution'].indexOf(objectType) !== -1 ? 'lib' : '';
var moduleClass = item.type == 'doc' || item.type == 'apiDoc' ? 'catalog' : '';
var sortClass = '';
@@ -312,7 +313,7 @@ $(function()
if(isFirstLoad) ele.data('zui.tree').collapse();
var $leaf = ele.find('li.active > a');
if($leaf.length && $('#fileTree').height() >= $('#sideBar').height()) $('#sideBar')[0].scrollTop = $($leaf[$leaf.length - 1]).offset().top - 100;
if($leaf.length && $('#fileTree').height() >= $('#sideBar').height() && $($leaf[$leaf.length - 1]).offset().top > $('#sideBar').height()) $('#sideBar')[0].scrollTop = $($leaf[$leaf.length - 1]).offset().top - 200;
ele.on('click', '.icon-drop', function(e)
{
@@ -443,6 +444,8 @@ $(function()
}
else
{
config.currentModule = 'doc';
config.currentMethod = 'projectspace';
initTree($('#projectTree'), treeData.project);
initTree($('#annexTree'), treeData.annex);
if(treeData.execution&& treeData.execution.length)
@@ -469,9 +472,10 @@ $(function()
if(!libID) libID = 0;
if(!moduleID) moduleID = 0;
linkParams = linkParams.replace('%s', 'libID=' + libID + '&moduleID=' + moduleID);
var moduleName = config.currentModule;
if(spaceType != 'api' && config.currentModule == 'api') linkParams = 'objectID=' + objectID + '&' + linkParams;
var moduleName = spaceType == 'api' ? 'api' : 'doc';
var methodName = '';
if(config.currentModule == 'api')
if(spaceType == 'api')
{
methodName = 'index';
linkParams = linkParams.substring(1);
module/doc/view/view.html.php
+3 -3
View File
@@ -23,9 +23,9 @@
<?php endif;?>
<div id="mainMenu" class="clearfix">
<div id="leftBar" class="btn-toolbar pull-left">
<?php echo $objectDropdown;?>
<?php $gobackLink = $this->session->docList ? $this->session->docList : inlink('teamSpace', "objectID=0&libID=$libID");?>
<?php echo html::a($gobackLink, "<i class='icon-back'></i> " . $lang->goback, '', "class='btn btn-link'");?>
<?php echo $objectDropdown;?>
<?php $gobackLink = $this->session->docList ? $this->session->docList : inlink('teamSpace', "objectID=0&libID=$libID");?>
<?php echo html::a($gobackLink, "<i class='icon-back'></i> " . $lang->goback, '', "class='btn btn-link'");?>
</div>
<?php if(empty($object->deleted)):?>
<div class="btn-toolbar pull-right">
module/file/model.php
+2 -2
View File
@@ -123,14 +123,14 @@ class fileModel extends model
* Save upload.
*
* @param string $objectType
* @param string $objectID
* @param int $objectID
* @param string $extra
* @param string $filesName
* @param string $labelsName
* @access public
* @return array
*/
public function saveUpload($objectType = '', $objectID = '', $extra = '', $filesName = 'files', $labelsName = 'labels')
public function saveUpload($objectType = '', $objectID = 0, $extra = '', $filesName = 'files', $labelsName = 'labels')
{
$fileTitles = array();
$now = helper::today();
module/my/model.php
+1 -1
View File
@@ -1440,7 +1440,7 @@ class myModel extends model
$review = new stdclass();
$review->id = $object->id;
$review->type = $objectType;
$review->time = $action->date;
$review->time = substr($action->date, 0, 19);
$review->result = strtolower($action->extra);
$review->status = $objectType == 'attend' ? $object->reviewStatus : ((isset($object->status) and !isset($flows[$objectType])) ? $object->status : 'done');
if(strpos($review->result, ',') !== false) list($review->result) = explode(',', $review->result);
module/my/view/audit.html.php
+2 -2
View File
@@ -89,7 +89,7 @@
?>
</td>
<td class='c-type'><?php echo $typeName;?></td>
<td class='c-time text-left'><?php echo $review->time?></td>
<td class='c-time text-left'><?php echo substr($review->time, 0, 19);?></td>
<?php if($rawMethod == 'contribute' and $browseType == 'reviewedbyme'):?>
<?php
$reviewResultList = array();
@@ -98,7 +98,7 @@
?>
<td class='c-status'><?php echo zget($reviewResultList, $review->result);?></td>
<?php endif;?>
<td class='c-status'><?php echo zget($statusList, $review->status, '')?></td>
<td class='c-status'><?php echo zget($statusList, $review->status, '');?></td>
<?php if($rawMethod == 'audit'):?>
<td class='c-actions text-left'>
<?php
module/screen/config.php
+4
View File
@@ -0,0 +1,4 @@
<?php
$config->screen->builtinScreen = array(6, 8);
$config->screen->builtinChart = array(10018, 10019, 10020, 10021, 10022, 10211, 10212, 10213, 10214, 10215, 10216, 10217, 10218, 10219, 10220);
$config->screen->builtinPivot = array(1000, 1001, 1002);
module/search/config.php
+1 -1
View File
@@ -152,7 +152,7 @@ $config->search->recPerPage = 10;
$config->search->summaryLength = 120;
$config->search->maxFileSize = 1024;
if($config->vision == 'lite')
if($config->vision == 'rnd')
{
$config->search->searchObject = array('trash', 'productlibDoc', 'productapiDoc', 'projectlibDoc', 'projectapiDoc');
}
module/story/js/view.js
+2 -2
View File
@@ -2,8 +2,8 @@ $(function()
{
if(canCreate)
{
link = createLink('story', 'create', 'productID=' + productID + "&branch=" + branch + '&moduleID=' + moduleID);
$('#modulemenu ul.nav li.right:first').before("<li class='right'><a href='" + link + "'><i class='icon-story-create icon-plus'></i> " + createStory + "</a></li>");
var createStoryLink = createLink('story', 'create', 'productID=' + productID + "&branch=" + branch + '&moduleID=' + moduleID);
$('#modulemenu ul.nav li.right:first').before("<li class='right'><a href='" + createStoryLink + "'><i class='icon-story-create icon-plus'></i> " + createStory + "</a></li>");
}
/* Add for task #5385. */
module/story/model.php
+6
View File
@@ -86,6 +86,12 @@ class storyModel extends model
$story->children = array();
if($story->parent == '-1') $story->children = $this->dao->select('*')->from(TABLE_STORY)->where('parent')->eq($storyID)->andWhere('deleted')->eq(0)->fetchAll('id');
$story->openedDate = substr($story->openedDate, 0, 19);
$story->assignedDate = substr($story->assignedDate, 0, 19);
$story->reviewedDate = substr($story->reviewedDate, 0, 19);
$story->closedDate = substr($story->closedDate, 0, 19);
$story->lastEditedDate= substr($story->lastEditedDate, 0, 19);
return $story;
}
module/testreport/model.php
+3 -3
View File
@@ -22,7 +22,7 @@ class testreportModel extends model
$execution = $this->loadModel('execution')->getByID($this->post->execution);
$data = fixer::input('post')
->stripTags($this->config->testreport->editor->create['id'], $this->config->allowedTags)
->setDefault('project', $execution->type == 'project' ? $execution->id : $execution->project)
->setDefault('project', empty($execution) ? 0 : ($execution->type == 'project' ? $execution->id : $execution->project))
->add('createdBy', $this->app->user->account)
->add('createdDate', helper::now())
->join('stories', ',')
@@ -482,7 +482,7 @@ class testreportModel extends model
->andWhere('t1.`case`')->in($cases)
->andWhere('t1.date')->ge($begin)
->andWhere('t1.date')->le($end . " 23:59:59")
->groupBy('name')
->groupBy('t1.caseResult')
->orderBy('value DESC')
->fetchAll('name');
@@ -514,7 +514,7 @@ class testreportModel extends model
->andWhere('t1.`case`')->in($cases)
->andWhere('t1.date')->ge($begin)
->andWhere('t1.date')->le($end . " 23:59:59")
->groupBy('name')
->groupBy('t1.lastRunner')
->orderBy('value DESC')
->fetchAll('name');
module/testtask/model.php
+5 -5
View File
@@ -563,7 +563,7 @@ class testtaskModel extends model
->on('t1.case = t2.id')
->where('t1.task')->eq($taskID)
->andWhere('t2.deleted')->eq(0)
->groupBy('name')
->groupBy('t1.lastRunResult')
->orderBy('value DESC')
->fetchAll('name');
@@ -588,7 +588,7 @@ class testtaskModel extends model
->leftJoin(TABLE_CASE)->alias('t2')->on('t1.case = t2.id')
->where('t1.task')->eq($taskID)
->andWhere('t2.deleted')->eq(0)
->groupBy('name')
->groupBy('t2.type')
->orderBy('value desc')
->fetchAll('name');
if(!$datas) return array();
@@ -611,7 +611,7 @@ class testtaskModel extends model
->leftJoin(TABLE_CASE)->alias('t2')->on('t1.case = t2.id')
->where('t1.task')->eq($taskID)
->andWhere('t2.deleted')->eq(0)
->groupBy('name')
->groupBy('t2.module')
->orderBy('value desc')
->fetchAll('name');
if(!$datas) return array();
@@ -635,7 +635,7 @@ class testtaskModel extends model
->leftJoin(TABLE_CASE)->alias('t2')->on('t1.case = t2.id')
->where('t1.task')->eq($taskID)
->andWhere('t2.deleted')->eq(0)
->groupBy('name')
->groupBy('t1.lastRunner')
->orderBy('value DESC')
->fetchAll('name');
if(!$datas) return array();
@@ -1905,7 +1905,7 @@ class testtaskModel extends model
$oldCase = $this->dao->select('*')->from(TABLE_CASE)->where('id')->eq($caseID)->fetch();
$case->version = $oldCase->version;
$case->openedDate = $oldCase->openedDate;
$changes = common::createChanges($oldCase, $case);
if($changes)
{
module/upgrade/config.php
-1
View File
@@ -429,7 +429,6 @@ $config->delete['18_4'][] = 'module/report/js/bugcreate.js';
$config->delete['18_4'][] = 'module/report/js/productsummary.js';
$config->delete['18_4'][] = 'module/report/js/projectdeviation.js';
$config->delete['18_4'][] = 'module/report/js/workload.js';
$config->delete['18_4'][] = 'module/report/view/blockreportlist.html.php';
$config->delete['18_4'][] = 'module/report/view/bugassign.html.php';
$config->delete['18_4'][] = 'module/report/view/bugcreate.html.php';
$config->delete['18_4'][] = 'module/report/view/preview.html.php';
module/upgrade/model.php
+33 -24
View File
@@ -8501,7 +8501,13 @@ class upgradeModel extends model
$component->chartConfig = $chartConfig;
$component->option = json_decode(zget($this->config->screen->chartOption, $chartType));
if(isset($component->option->title->text)) $component->option->title->text = $chart->name;
$component = $this->screen->getChartOption($chart, $component, json_decode($chart->filters, true));
$chart->fields = json_encode($chart->fieldSettings);
$chart->settings = json_encode($chart->settings);
$chart->langs = json_encode($chart->langs);
$chartFilters = !empty($chart->filters) ? json_decode($chart->filters, true) : array();
$component = $this->screen->getChartOption($chart, $component, $chartFilters);
}
$componentList[] = $component;
@@ -9032,37 +9038,40 @@ class upgradeModel extends model
}
/* Process settings. */
$params = json_decode($report->params);
$settings = new stdclass();
$settings->group1 = $params->group1;
$settings->group2 = $params->group2;
$settings->columnTotal = 'sum';
$columns = array();
foreach($params->reportField as $index => $field)
if($report->params)
{
$column = new stdclass();
$column->field = $field;
$column->slice = $field;
$column->stat = isset($params->reportType) ? zget($params->reportType, $index, 'noStat') : 'noStat';
$column->showTotal = (isset($params->reportTotal) && zget($params->reportTotal, $index, '') == '1') ? 'sum' : 'noShow';
$column->showMode = (isset($params->percent) && zget($params->percent, $index, '') == '1' && isset($params->contrast) && zget($params->contrast, $index, '') == 'crystalTotal') ? 'total' : 'default';
$column->monopolize = isset($params->showAlone) ? zget($params->showAlone, $index, '0') : '0';
$params = json_decode($report->params);
if($column->stat == 'sum')
$settings = new stdclass();
$settings->group1 = $params->group1;
$settings->group2 = $params->group2;
$settings->columnTotal = 'sum';
$columns = array();
foreach($params->reportField as $index => $field)
{
$sumAppend = isset($params->sumAppend) ? zget($params->sumAppend, $index, $field) : $field;
$column = new stdclass();
$column->field = $field;
$column->slice = $field;
$column->stat = isset($params->reportType) ? zget($params->reportType, $index, 'noStat') : 'noStat';
$column->showTotal = (isset($params->reportTotal) && zget($params->reportTotal, $index, '') == '1') ? 'sum' : 'noShow';
$column->showMode = (isset($params->percent) && zget($params->percent, $index, '') == '1' && isset($params->contrast) && zget($params->contrast, $index, '') == 'crystalTotal') ? 'total' : 'default';
$column->monopolize = isset($params->showAlone) ? zget($params->showAlone, $index, '0') : '0';
if($sumAppend == $field) $column->slice = 'noSlice';
if($sumAppend != $field) $column->field = $sumAppend;
if($column->stat == 'sum')
{
$sumAppend = isset($params->sumAppend) ? zget($params->sumAppend, $index, $field) : $field;
if($sumAppend == $field) $column->slice = 'noSlice';
if($sumAppend != $field) $column->field = $sumAppend;
}
$columns[] = $column;
}
$columns[] = $column;
$settings->columns = $columns;
}
$settings->columns = $columns;
/* Process fieldSettings. */
$sql = $data->sql;
if(!empty($filters))
{
tools/packDeb.php
+4 -4
View File
@@ -10,13 +10,13 @@ $fileList[] = "{$basePath}/ZenTaoPMS.$pmsVersion.php5.4_5.6.zip";
$fileList[] = "{$basePath}/ZenTaoPMS.$pmsVersion.php7.0.zip";
$fileList[] = "{$basePath}/ZenTaoPMS.$pmsVersion.php7.1.zip";
$fileList[] = "{$basePath}/ZenTaoPMS.$pmsVersion.php7.2_7.4.zip";
$fileList[] = "{$basePath}/ZenTaoPMS.$pmsVersion.php8.1.zip";
$fileList[] = "{$basePath}/ZenTaoPMS.$pmsVersion.php8.0.zip";
$fileList[] = "{$basePath}/ZenTaoALM.$pmsVersion.int.php5.4_5.6.zip";
$fileList[] = "{$basePath}/ZenTaoALM.$pmsVersion.int.php7.0.zip";
$fileList[] = "{$basePath}/ZenTaoALM.$pmsVersion.int.php7.1.zip";
$fileList[] = "{$basePath}/ZenTaoALM.$pmsVersion.int.php7.2_7.4.zip";
$fileList[] = "{$basePath}/ZenTaoALM.$pmsVersion.int.php8.1.zip";
$fileList[] = "{$basePath}/ZenTaoALM.$pmsVersion.int.php8.0.zip";
foreach($fileList as $file) if(!file_exists($file)) echo basename($file) . " is not exists\n";
@@ -30,7 +30,7 @@ foreach(array('zh-cn', 'en') as $langType)
$dirName = $langType == 'zh-cn' ? 'zentaopms' : 'zentaoalm';
/* Cycle the php versions. */
foreach(array('5.4_5.6', '7.0', '7.1', '7.2_7.4', '8.1') as $phpVersion)
foreach(array('5.4_5.6', '7.0', '7.1', '7.2_7.4', '8.0') as $phpVersion)
{
/* File name. */
$workDir = "tmp/$packPrefix.{$version}.{$phpVersion}/";
@@ -54,7 +54,7 @@ foreach(array('zh-cn', 'en') as $langType)
$command .= "sed -i 's/index.php/\/zentao\/index.php/' zentao/www/.htaccess\n";
$command .= "cd ../../\n";
$command .= "sudo dpkg -b buildroot/ {$packPrefix}.{$version}.php{$phpVersion}.1.all.deb\n";
$command .= "dpkg -b buildroot/ {$packPrefix}.{$version}.php{$phpVersion}.1.all.deb\n";
$command .= "mv *.deb ../../\n";
$command .= "rm -rf buildroot\n";
tools/packRpm.php
+3 -3
View File
@@ -10,13 +10,13 @@ $fileList[] = "{$basePath}/ZenTaoPMS.$pmsVersion.php5.4_5.6.zip";
$fileList[] = "{$basePath}/ZenTaoPMS.$pmsVersion.php7.0.zip";
$fileList[] = "{$basePath}/ZenTaoPMS.$pmsVersion.php7.1.zip";
$fileList[] = "{$basePath}/ZenTaoPMS.$pmsVersion.php7.2_7.4.zip";
$fileList[] = "{$basePath}/ZenTaoPMS.$pmsVersion.php8.1.zip";
$fileList[] = "{$basePath}/ZenTaoPMS.$pmsVersion.php8.0.zip";
$fileList[] = "{$basePath}/ZenTaoALM.$pmsVersion.int.php5.4_5.6.zip";
$fileList[] = "{$basePath}/ZenTaoALM.$pmsVersion.int.php7.0.zip";
$fileList[] = "{$basePath}/ZenTaoALM.$pmsVersion.int.php7.1.zip";
$fileList[] = "{$basePath}/ZenTaoALM.$pmsVersion.int.php7.2_7.4.zip";
$fileList[] = "{$basePath}/ZenTaoALM.$pmsVersion.int.php8.1.zip";
$fileList[] = "{$basePath}/ZenTaoALM.$pmsVersion.int.php8.0.zip";
foreach($fileList as $file) if(!file_exists($file)) echo basename($file) . " is not exists\n";
@@ -30,7 +30,7 @@ foreach(array('zh-cn', 'en') as $langType)
$dirName = $langType == 'zh-cn' ? 'zentaopms' : 'zentaoalm';
/* Cycle the php versions. */
foreach(array('5.4_5.6', '7.0', '7.1', '7.2_7.4', '8.1') as $phpVersion)
foreach(array('5.4_5.6', '7.0', '7.1', '7.2_7.4', '8.0') as $phpVersion)
{
/* File name. */
$workDir = "tmp/$packPrefix.{$version}.{$phpVersion}/";
tools/packZip.php
+5 -7
View File
@@ -6,8 +6,7 @@ $liteVersion = isset($argv[2]) ? $argv[2] : '';
/* File pathes. */
$basePath = dirname(dirname(__FILE__));
//$releasePath = getenv('ZENTAO_RELEASE_PATH');
$releasePath = '/home/z/ci/pip_release/';
$releasePath = getenv('ZENTAO_RELEASE_PATH');
$releasePath = !empty($releasePath) ? $releasePath : $basePath;
if(!file_exists($releasePath . '/zentaopms.zip')) die("Please give me encrypted packages.\n");
@@ -52,22 +51,21 @@ foreach(array('zh-cn', 'en') as $langType)
$dirName = $langType == 'zh-cn' ? 'zentaopms' : 'zentaoalm';
/* Cycle the php versions. */
foreach(array('5.4_5.6', '7.0', '7.1', '7.2_7.4', '8.1') as $phpVersion)
foreach(array('5.4_5.6', '7.0', '7.1', '7.2_7.4', '8.0') as $phpVersion)
{
/* File name. */
$workDir = "tmp/$packPrefix.{$version}.{$phpVersion}/";
$shellName = $workDir . "make.sh";
$encryptedPhpVersion = $phpVersion == '8.0' ? '7.2_7.4' : $phpVersion;
echo "Creating $shellName\n";
mkdir($workDir, 0777, true);
/* The commands of the shell. */
$command = "cd $workDir\n";
//$command .= "if [ ! -d ../$dirName ]; then unzip ../../$packPrefix.{$version}.zip -d ../ ; fi\n";
$command .= "unzip ../../$packPrefix.{$version}.zip\n";
//$command .= "cp -raf ../$dirName .\n";
$command .= "cp -rf ../../zentaobiz.php$phpVersion/* $dirName/\n";
$command .= "cp -rf ../../zentaomax.php$phpVersion/* $dirName/\n";
$command .= "cp -rf ../../zentaobiz.php$encryptedPhpVersion/* $dirName/\n";
$command .= "cp -rf ../../zentaomax.php$encryptedPhpVersion/* $dirName/\n";
$command .= "zip -r ../../$packPrefix.{$version}.php{$phpVersion}.zip $dirName\n";
$command .= "rm -rf $dirName/\n";
www/static/css/index-fcd7c9c0.css → www/static/css/index-125f7be3.css
+1 -1
View File
File diff suppressed because one or more lines are too long
www/static/css/index-125f7be3.css.gz
BIN
View File
Binary file not shown.
www/static/css/index-fcd7c9c0.css.gz
BIN
View File
Binary file not shown.
www/static/js/403-3723b7df.js → www/static/js/403-65afb14b.js
View File
www/static/js/404-10ec0fb5.js → www/static/js/404-d7ee56b4.js
View File
www/static/js/500-eac833ff.js → www/static/js/500-f95723e4.js
View File
www/static/js/CollapseItem-d1b01f0c.js → www/static/js/CollapseItem-2c94353e.js
View File
www/static/js/SettingItemBox-7b2092d6.js → www/static/js/SettingItemBox-b2997572.js
View File
www/static/js/chartEditStore-39509bd6.js.gz
BIN
View File
Binary file not shown.
www/static/js/chartEditStore-39509bd6.js → www/static/js/chartEditStore-9bac96ed.js
+1 -1
View File
File diff suppressed because one or more lines are too long
www/static/js/chartEditStore-9bac96ed.js.gz
BIN
View File
Binary file not shown.
www/static/js/chartLayoutStore-bb0cd4f0.js → www/static/js/chartLayoutStore-6af5bdff.js
+1 -1
View File
@@ -1 +1 @@
var T=Object.defineProperty;var a=Object.getOwnPropertySymbols;var h=Object.prototype.hasOwnProperty,l=Object.prototype.propertyIsEnumerable;var r=(e,t,s)=>t in e?T(e,t,{enumerable:!0,configurable:!0,writable:!0,value:s}):e[t]=s,i=(e,t)=>{for(var s in t||(t={}))h.call(t,s)&&r(e,s,t[s]);if(a)for(var s of a(t))l.call(t,s)&&r(e,s,t[s]);return e};import{c1 as g,aA as p,D as u,S as y}from"./index.js";import{u as A}from"./chartEditStore-39509bd6.js";var n=(e=>(e.SINGLE="single",e.DOUBLE="double",e))(n||{}),c=(e=>(e.THUMBNAIL="thumbnail",e.TEXT="text",e))(c||{}),S=(e=>(e.LAYERS="layers",e.CHARTS="charts",e.DETAILS="details",e.Chart_TYPE="chartType",e.LAYER_TYPE="layerType",e.PERCENTAGE="percentage",e.RE_POSITION_CANVAS="rePositionCanvas",e))(S||{});const C=A(),{GO_CHART_LAYOUT_STORE:o}=y,L=g(o),d=p({id:"useChartLayoutStore",state:()=>i({layers:!0,charts:!0,details:!1,chartType:n.SINGLE,layerType:c.THUMBNAIL,percentage:0,rePositionCanvas:!1},L),getters:{getLayers(){return this.layers},getCharts(){return this.charts},getDetails(){return this.details},getChartType(){return this.chartType},getLayerType(){return this.layerType},getPercentage(){return this.percentage},getRePositionCanvas(){return this.rePositionCanvas}},actions:{setItem(e,t){this.$patch(s=>{s[e]=t}),u(o,this.$state),this.rePositionCanvas=!0,setTimeout(()=>{C.computedScale()},500)},setItemUnHandle(e,t){this.$patch(s=>{s[e]=t})}}});export{S as C,c as L,n as a,d as u};
var T=Object.defineProperty;var a=Object.getOwnPropertySymbols;var h=Object.prototype.hasOwnProperty,l=Object.prototype.propertyIsEnumerable;var r=(e,t,s)=>t in e?T(e,t,{enumerable:!0,configurable:!0,writable:!0,value:s}):e[t]=s,i=(e,t)=>{for(var s in t||(t={}))h.call(t,s)&&r(e,s,t[s]);if(a)for(var s of a(t))l.call(t,s)&&r(e,s,t[s]);return e};import{c1 as g,aA as p,D as u,S as y}from"./index.js";import{u as A}from"./chartEditStore-9bac96ed.js";var n=(e=>(e.SINGLE="single",e.DOUBLE="double",e))(n||{}),c=(e=>(e.THUMBNAIL="thumbnail",e.TEXT="text",e))(c||{}),S=(e=>(e.LAYERS="layers",e.CHARTS="charts",e.DETAILS="details",e.Chart_TYPE="chartType",e.LAYER_TYPE="layerType",e.PERCENTAGE="percentage",e.RE_POSITION_CANVAS="rePositionCanvas",e))(S||{});const C=A(),{GO_CHART_LAYOUT_STORE:o}=y,L=g(o),d=p({id:"useChartLayoutStore",state:()=>i({layers:!0,charts:!0,details:!1,chartType:n.SINGLE,layerType:c.THUMBNAIL,percentage:0,rePositionCanvas:!1},L),getters:{getLayers(){return this.layers},getCharts(){return this.charts},getDetails(){return this.details},getChartType(){return this.chartType},getLayerType(){return this.layerType},getPercentage(){return this.percentage},getRePositionCanvas(){return this.rePositionCanvas}},actions:{setItem(e,t){this.$patch(s=>{s[e]=t}),u(o,this.$state),this.rePositionCanvas=!0,setTimeout(()=>{C.computedScale()},500)},setItemUnHandle(e,t){this.$patch(s=>{s[e]=t})}}});export{S as C,c as L,n as a,d as u};
www/static/js/config-9fed5e45.js → www/static/js/config-153f8180.js
+1 -1
View File
@@ -1 +1 @@
import{al as o}from"./index.js";import{e as t}from"./chartEditStore-39509bd6.js";import{N as r}from"./index-53129e1b.js";import"./plugin-45284851.js";import"./icon-3a32fadd.js";import"./chartLayoutStore-bb0cd4f0.js";import"./tables_list-16bd57ab.js";/* empty css */import"./SettingItemBox-7b2092d6.js";import"./CollapseItem-d1b01f0c.js";import"./useTargetData.hook-19e86696.js";const e={dataset:1e5,from:0,dur:3,precision:0,showSeparator:!0,numberSize:34,numberColor:"#4a9ef8",prefixText:"\uFFE5",prefixColor:"#4a9ef8",suffixText:"\u5143",suffixColor:"#4a9ef8"};class g extends t{constructor(){super(...arguments),this.key=r.key,this.chartConfig=o(r),this.option=o(e)}}export{g as default,e as option};
import{al as o}from"./index.js";import{e as t}from"./chartEditStore-9bac96ed.js";import{N as r}from"./index-645d17ce.js";import"./plugin-e1e7aece.js";import"./icon-2a87dc93.js";import"./chartLayoutStore-6af5bdff.js";import"./tables_list-16bd57ab.js";/* empty css */import"./SettingItemBox-b2997572.js";import"./CollapseItem-2c94353e.js";import"./useTargetData.hook-451e7e77.js";const e={dataset:1e5,from:0,dur:3,precision:0,showSeparator:!0,numberSize:34,numberColor:"#4a9ef8",prefixText:"\uFFE5",prefixColor:"#4a9ef8",suffixText:"\u5143",suffixColor:"#4a9ef8"};class g extends t{constructor(){super(...arguments),this.key=r.key,this.chartConfig=o(r),this.option=o(e)}}export{g as default,e as option};
www/static/js/config-39018764.js → www/static/js/config-1fd42300.js
+1 -1
View File
@@ -1 +1 @@
var p=Object.defineProperty,d=Object.defineProperties;var l=Object.getOwnPropertyDescriptors;var r=Object.getOwnPropertySymbols;var m=Object.prototype.hasOwnProperty,g=Object.prototype.propertyIsEnumerable;var e=(o,t,i)=>t in o?p(o,t,{enumerable:!0,configurable:!0,writable:!0,value:i}):o[t]=i,n=(o,t)=>{for(var i in t||(t={}))m.call(t,i)&&e(o,i,t[i]);if(r)for(var i of r(t))g.call(t,i)&&e(o,i,t[i]);return o},f=(o,t)=>d(o,l(t));import{al as a,ax as h}from"./index.js";import{e as c}from"./chartEditStore-39509bd6.js";import{H as s}from"./index-53129e1b.js";import"./plugin-45284851.js";import"./icon-3a32fadd.js";import"./chartLayoutStore-bb0cd4f0.js";import"./tables_list-16bd57ab.js";/* empty css */import"./SettingItemBox-7b2092d6.js";import"./CollapseItem-d1b01f0c.js";import"./useTargetData.hook-19e86696.js";const u={text:"",icon:"",textSize:30,textColor:"#ffffff",textWeight:"bold",placement:"left-top",distance:8,hint:"\u8FD9\u662F\u63D0\u793A\u6587\u672C",width:0,height:0,paddingX:16,paddingY:8,borderWidth:1,borderStyle:"solid",borderColor:"#1a77a5",borderRadius:6,color:"#ffffff",textAlign:"left",fontWeight:"normal",backgroundColor:"rgba(89, 196, 230, .2)",fontSize:24};class H extends c{constructor(){super(...arguments),this.key=s.key,this.chartConfig=a(s),this.option=a(u),this.attr=f(n({},h),{w:36,h:36,zIndex:1})}}export{H as default,u as option};
var p=Object.defineProperty,d=Object.defineProperties;var l=Object.getOwnPropertyDescriptors;var r=Object.getOwnPropertySymbols;var m=Object.prototype.hasOwnProperty,g=Object.prototype.propertyIsEnumerable;var e=(o,t,i)=>t in o?p(o,t,{enumerable:!0,configurable:!0,writable:!0,value:i}):o[t]=i,n=(o,t)=>{for(var i in t||(t={}))m.call(t,i)&&e(o,i,t[i]);if(r)for(var i of r(t))g.call(t,i)&&e(o,i,t[i]);return o},f=(o,t)=>d(o,l(t));import{al as a,ax as h}from"./index.js";import{e as c}from"./chartEditStore-9bac96ed.js";import{H as s}from"./index-645d17ce.js";import"./plugin-e1e7aece.js";import"./icon-2a87dc93.js";import"./chartLayoutStore-6af5bdff.js";import"./tables_list-16bd57ab.js";/* empty css */import"./SettingItemBox-b2997572.js";import"./CollapseItem-2c94353e.js";import"./useTargetData.hook-451e7e77.js";const u={text:"",icon:"",textSize:30,textColor:"#ffffff",textWeight:"bold",placement:"left-top",distance:8,hint:"\u8FD9\u662F\u63D0\u793A\u6587\u672C",width:0,height:0,paddingX:16,paddingY:8,borderWidth:1,borderStyle:"solid",borderColor:"#1a77a5",borderRadius:6,color:"#ffffff",textAlign:"left",fontWeight:"normal",backgroundColor:"rgba(89, 196, 230, .2)",fontSize:24};class H extends c{constructor(){super(...arguments),this.key=s.key,this.chartConfig=a(s),this.option=a(u),this.attr=f(n({},h),{w:36,h:36,zIndex:1})}}export{H as default,u as option};
www/static/js/config-e63fbe7f.js → www/static/js/config-298e0360.js
+1 -1
View File
@@ -1 +1 @@
var p=Object.defineProperty;var r=Object.getOwnPropertySymbols;var c=Object.prototype.hasOwnProperty,f=Object.prototype.propertyIsEnumerable;var s=(o,i,t)=>i in o?p(o,i,{enumerable:!0,configurable:!0,writable:!0,value:t}):o[i]=t,e=(o,i)=>{for(var t in i||(i={}))c.call(i,t)&&s(o,t,i[t]);if(r)for(var t of r(i))f.call(i,t)&&s(o,t,i[t]);return o};import{al as n}from"./index.js";import{e as m}from"./chartEditStore-39509bd6.js";import{k as h}from"./index-53129e1b.js";import"./plugin-45284851.js";import"./icon-3a32fadd.js";import"./chartLayoutStore-bb0cd4f0.js";import"./tables_list-16bd57ab.js";/* empty css */import"./SettingItemBox-7b2092d6.js";import"./CollapseItem-d1b01f0c.js";import"./useTargetData.hook-19e86696.js";var d=[["\u884C1\u52171","\u884C1\u52172","\u884C1\u52173"],["\u884C2\u52171","\u884C2\u52172","\u884C2\u52173"],["\u884C3\u52171","\u884C3\u52172","\u884C3\u52173"],["\u884C4\u52171","\u884C4\u52172","\u884C4\u52173"],["\u884C5\u52171","\u884C5\u52172","\u884C5\u52173"],["\u884C6\u52171","\u884C6\u52172","\u884C6\u52173"],["\u884C7\u52171","\u884C7\u52172","\u884C7\u52173"],["\u884C8\u52171","\u884C8\u52172","\u884C8\u52173"],["\u884C9\u52171","\u884C9\u52172","\u884C9\u52173"],["\u884C10\u52171","\u884C10\u52172","\u884C10\u52173"]];const u={header:["\u52171","\u52172","\u52173"],dataset:d,index:!0,columnWidth:[30,100,100],align:["center","right","right","right"],rowNum:5,waitTime:2,headerHeight:35,carousel:"single",headerBGC:"#00BAFF",oddRowBGC:"#003B51",evenRowBGC:"#0A2732"};class F extends m{constructor(i){super(),this.key=h.key,this.chartConfig=n(h),this.option=n(u);const{dataset:t,tableInfo:a,title:l}=i;this.chartConfig.title=l,this.option.dataset=t,this.option=e(e({},this.option),a),this.chartConfig.sourceID=i.sourceID,this.chartConfig.fields=i.fields,this.chartConfig.filters=i.filters}}export{F as default,u as option};
var p=Object.defineProperty;var r=Object.getOwnPropertySymbols;var c=Object.prototype.hasOwnProperty,f=Object.prototype.propertyIsEnumerable;var s=(o,i,t)=>i in o?p(o,i,{enumerable:!0,configurable:!0,writable:!0,value:t}):o[i]=t,e=(o,i)=>{for(var t in i||(i={}))c.call(i,t)&&s(o,t,i[t]);if(r)for(var t of r(i))f.call(i,t)&&s(o,t,i[t]);return o};import{al as n}from"./index.js";import{e as m}from"./chartEditStore-9bac96ed.js";import{k as h}from"./index-645d17ce.js";import"./plugin-e1e7aece.js";import"./icon-2a87dc93.js";import"./chartLayoutStore-6af5bdff.js";import"./tables_list-16bd57ab.js";/* empty css */import"./SettingItemBox-b2997572.js";import"./CollapseItem-2c94353e.js";import"./useTargetData.hook-451e7e77.js";var d=[["\u884C1\u52171","\u884C1\u52172","\u884C1\u52173"],["\u884C2\u52171","\u884C2\u52172","\u884C2\u52173"],["\u884C3\u52171","\u884C3\u52172","\u884C3\u52173"],["\u884C4\u52171","\u884C4\u52172","\u884C4\u52173"],["\u884C5\u52171","\u884C5\u52172","\u884C5\u52173"],["\u884C6\u52171","\u884C6\u52172","\u884C6\u52173"],["\u884C7\u52171","\u884C7\u52172","\u884C7\u52173"],["\u884C8\u52171","\u884C8\u52172","\u884C8\u52173"],["\u884C9\u52171","\u884C9\u52172","\u884C9\u52173"],["\u884C10\u52171","\u884C10\u52172","\u884C10\u52173"]];const u={header:["\u52171","\u52172","\u52173"],dataset:d,index:!0,columnWidth:[30,100,100],align:["center","right","right","right"],rowNum:5,waitTime:2,headerHeight:35,carousel:"single",headerBGC:"#00BAFF",oddRowBGC:"#003B51",evenRowBGC:"#0A2732"};class F extends m{constructor(i){super(),this.key=h.key,this.chartConfig=n(h),this.option=n(u);const{dataset:t,tableInfo:a,title:l}=i;this.chartConfig.title=l,this.option.dataset=t,this.option=e(e({},this.option),a),this.chartConfig.sourceID=i.sourceID,this.chartConfig.fields=i.fields,this.chartConfig.filters=i.filters}}export{F as default,u as option};
www/static/js/config-ec4c07ae.js → www/static/js/config-3758c52e.js
+1 -1
View File
@@ -1 +1 @@
var i=Object.defineProperty,h=Object.defineProperties;var p=Object.getOwnPropertyDescriptors;var r=Object.getOwnPropertySymbols;var c=Object.prototype.hasOwnProperty,g=Object.prototype.propertyIsEnumerable;var m=(e,a,t)=>a in e?i(e,a,{enumerable:!0,configurable:!0,writable:!0,value:t}):e[a]=t,n=(e,a)=>{for(var t in a||(a={}))c.call(a,t)&&m(e,t,a[t]);if(r)for(var t of r(a))g.call(a,t)&&m(e,t,a[t]);return e},o=(e,a)=>h(e,p(a));import{ax as N,al as E}from"./index.js";import{P as C,b as y,e as u}from"./chartEditStore-39509bd6.js";import{e as f,g as T}from"./index-53129e1b.js";import"./plugin-45284851.js";import"./icon-3a32fadd.js";import"./chartLayoutStore-bb0cd4f0.js";import"./tables_list-16bd57ab.js";/* empty css */import"./SettingItemBox-7b2092d6.js";import"./CollapseItem-d1b01f0c.js";import"./useTargetData.hook-19e86696.js";const s={key:"ThreeEarth01",chartKey:"VThreeEarth01",conKey:"VCThreeEarth01",title:"\u4E09\u7EF4\u5730\u7403",category:f.THREE,categoryName:T.THREE,package:C.DECORATES,chartFrame:y.STATIC,image:"threeEarth01.png"};var d=[{startArray:{name:"\u676D\u5DDE",N:30.246026,E:120.210792},endArray:[{name:"\u66FC\u8C37",N:22,E:100.49074172973633},{name:"\u6FB3\u5927\u5229\u4E9A",N:-23.68477416688374,E:133.857421875},{name:"\u65B0\u7586\u7EF4\u543E\u5C14\u81EA\u6CBB\u533A",N:41.748,E:84.9023},{name:"\u5FB7\u9ED1\u5170",N:35,E:51},{name:"\u5FB7\u9ED1\u5170",N:35,E:51},{name:"\u7F8E\u56FD",N:34.125447565116126,E:241.7431640625},{name:"\u82F1\u56FD",N:51.508742458803326,E:359.82421875},{name:"\u5DF4\u897F",N:-9.96885060854611,E:668.1445312499999}]},{startArray:{name:"\u5317\u4EAC",N:39.89491,E:116.322056},endArray:[{name:"\u897F\u85CF",N:29.660361,E:91.132212},{name:"\u5E7F\u897F",N:22.830824,E:108.30616},{name:"\u6C5F\u897F",N:28.676493,E:115.892151},{name:"\u8D35\u9633",N:26.647661,E:106.630153}]}];const l={dataset:d};class V extends u{constructor(){super(...arguments),this.key=s.key,this.attr=o(n({},N),{w:800,h:800,zIndex:-1}),this.chartConfig=E(s),this.option=E(l)}}export{V as default,l as option};
var i=Object.defineProperty,h=Object.defineProperties;var p=Object.getOwnPropertyDescriptors;var r=Object.getOwnPropertySymbols;var c=Object.prototype.hasOwnProperty,g=Object.prototype.propertyIsEnumerable;var m=(e,a,t)=>a in e?i(e,a,{enumerable:!0,configurable:!0,writable:!0,value:t}):e[a]=t,n=(e,a)=>{for(var t in a||(a={}))c.call(a,t)&&m(e,t,a[t]);if(r)for(var t of r(a))g.call(a,t)&&m(e,t,a[t]);return e},o=(e,a)=>h(e,p(a));import{ax as N,al as E}from"./index.js";import{P as C,b as y,e as u}from"./chartEditStore-9bac96ed.js";import{e as f,g as T}from"./index-645d17ce.js";import"./plugin-e1e7aece.js";import"./icon-2a87dc93.js";import"./chartLayoutStore-6af5bdff.js";import"./tables_list-16bd57ab.js";/* empty css */import"./SettingItemBox-b2997572.js";import"./CollapseItem-2c94353e.js";import"./useTargetData.hook-451e7e77.js";const s={key:"ThreeEarth01",chartKey:"VThreeEarth01",conKey:"VCThreeEarth01",title:"\u4E09\u7EF4\u5730\u7403",category:f.THREE,categoryName:T.THREE,package:C.DECORATES,chartFrame:y.STATIC,image:"threeEarth01.png"};var d=[{startArray:{name:"\u676D\u5DDE",N:30.246026,E:120.210792},endArray:[{name:"\u66FC\u8C37",N:22,E:100.49074172973633},{name:"\u6FB3\u5927\u5229\u4E9A",N:-23.68477416688374,E:133.857421875},{name:"\u65B0\u7586\u7EF4\u543E\u5C14\u81EA\u6CBB\u533A",N:41.748,E:84.9023},{name:"\u5FB7\u9ED1\u5170",N:35,E:51},{name:"\u5FB7\u9ED1\u5170",N:35,E:51},{name:"\u7F8E\u56FD",N:34.125447565116126,E:241.7431640625},{name:"\u82F1\u56FD",N:51.508742458803326,E:359.82421875},{name:"\u5DF4\u897F",N:-9.96885060854611,E:668.1445312499999}]},{startArray:{name:"\u5317\u4EAC",N:39.89491,E:116.322056},endArray:[{name:"\u897F\u85CF",N:29.660361,E:91.132212},{name:"\u5E7F\u897F",N:22.830824,E:108.30616},{name:"\u6C5F\u897F",N:28.676493,E:115.892151},{name:"\u8D35\u9633",N:26.647661,E:106.630153}]}];const l={dataset:d};class V extends u{constructor(){super(...arguments),this.key=s.key,this.attr=o(n({},N),{w:800,h:800,zIndex:-1}),this.chartConfig=E(s),this.option=E(l)}}export{V as default,l as option};
www/static/js/config-dedffec0.js → www/static/js/config-574ba80e.js
+1 -1
View File
@@ -1 +1 @@
var l=Object.defineProperty,m=Object.defineProperties;var n=Object.getOwnPropertyDescriptors;var t=Object.getOwnPropertySymbols;var h=Object.prototype.hasOwnProperty,d=Object.prototype.propertyIsEnumerable;var o=(i,p,r)=>p in i?l(i,p,{enumerable:!0,configurable:!0,writable:!0,value:r}):i[p]=r,e=(i,p)=>{for(var r in p||(p={}))h.call(p,r)&&o(i,r,p[r]);if(t)for(var r of t(p))d.call(p,r)&&o(i,r,p[r]);return i},s=(i,p)=>m(i,n(p));import{ax as g,al as a}from"./index.js";import{e as c}from"./chartEditStore-39509bd6.js";import{d as f}from"./index-53129e1b.js";import"./plugin-45284851.js";import"./icon-3a32fadd.js";import"./chartLayoutStore-bb0cd4f0.js";import"./tables_list-16bd57ab.js";/* empty css */import"./SettingItemBox-7b2092d6.js";import"./CollapseItem-d1b01f0c.js";import"./useTargetData.hook-19e86696.js";const C={dataset:3234,flipperLength:6,flipperBgColor:"#16293E",flipperTextColor:"#4A9EF8FF",flipperWidth:30,flipperHeight:50,flipperRadius:5,flipperGap:10,flipperType:"down",flipperSpeed:450};class B extends c{constructor(){super(...arguments),this.key=f.key,this.attr=s(e({},g),{w:300,h:100,zIndex:-1}),this.chartConfig=a(f),this.option=a(C)}}export{B as default,C as option};
var l=Object.defineProperty,m=Object.defineProperties;var n=Object.getOwnPropertyDescriptors;var t=Object.getOwnPropertySymbols;var h=Object.prototype.hasOwnProperty,d=Object.prototype.propertyIsEnumerable;var o=(i,p,r)=>p in i?l(i,p,{enumerable:!0,configurable:!0,writable:!0,value:r}):i[p]=r,e=(i,p)=>{for(var r in p||(p={}))h.call(p,r)&&o(i,r,p[r]);if(t)for(var r of t(p))d.call(p,r)&&o(i,r,p[r]);return i},s=(i,p)=>m(i,n(p));import{ax as g,al as a}from"./index.js";import{e as c}from"./chartEditStore-9bac96ed.js";import{d as f}from"./index-645d17ce.js";import"./plugin-e1e7aece.js";import"./icon-2a87dc93.js";import"./chartLayoutStore-6af5bdff.js";import"./tables_list-16bd57ab.js";/* empty css */import"./SettingItemBox-b2997572.js";import"./CollapseItem-2c94353e.js";import"./useTargetData.hook-451e7e77.js";const C={dataset:3234,flipperLength:6,flipperBgColor:"#16293E",flipperTextColor:"#4A9EF8FF",flipperWidth:30,flipperHeight:50,flipperRadius:5,flipperGap:10,flipperType:"down",flipperSpeed:450};class B extends c{constructor(){super(...arguments),this.key=f.key,this.attr=s(e({},g),{w:300,h:100,zIndex:-1}),this.chartConfig=a(f),this.option=a(C)}}export{B as default,C as option};
www/static/js/config-61ab47f7.js
-1
View File
@@ -1 +0,0 @@
import{al as o}from"./index.js";import{e as i}from"./chartEditStore-39509bd6.js";import{h as t}from"./index-53129e1b.js";import"./plugin-45284851.js";import"./icon-3a32fadd.js";import"./chartLayoutStore-bb0cd4f0.js";import"./tables_list-16bd57ab.js";/* empty css */import"./SettingItemBox-7b2092d6.js";import"./CollapseItem-d1b01f0c.js";import"./useTargetData.hook-19e86696.js";const r={dataset:"",fit:"contain",borderRadius:10};class h extends i{constructor(){super(...arguments),this.key=t.key,this.chartConfig=o(t),this.option=o(r)}}export{h as default,r as option};
www/static/js/config-a8ecb6d0.js → www/static/js/config-69076e63.js
+1 -1
View File
@@ -1 +1 @@
var f=Object.defineProperty,l=Object.defineProperties;var m=Object.getOwnPropertyDescriptors;var o=Object.getOwnPropertySymbols;var u=Object.prototype.hasOwnProperty,d=Object.prototype.propertyIsEnumerable;var p=(e,t,i)=>t in e?f(e,t,{enumerable:!0,configurable:!0,writable:!0,value:i}):e[t]=i,r=(e,t)=>{for(var i in t||(t={}))u.call(t,i)&&p(e,i,t[i]);if(o)for(var i of o(t))d.call(t,i)&&p(e,i,t[i]);return e},s=(e,t)=>l(e,m(t));import{ax as h,al as a}from"./index.js";import{e as c}from"./chartEditStore-39509bd6.js";import{c as n}from"./index-53129e1b.js";import"./plugin-45284851.js";import"./icon-3a32fadd.js";import"./chartLayoutStore-bb0cd4f0.js";import"./tables_list-16bd57ab.js";/* empty css */import"./SettingItemBox-7b2092d6.js";import"./CollapseItem-d1b01f0c.js";import"./useTargetData.hook-19e86696.js";const g={dataset:10*60,useEndDate:!1,endDate:new Date().getTime(),style:"\u65F6\u5206\u79D2",showDay:!1,flipperBgColor:"#16293E",flipperTextColor:"#4A9EF8FF",flipperWidth:30,flipperHeight:50,flipperRadius:5,flipperGap:10,flipperType:"down",flipperSpeed:450};class A extends c{constructor(){super(...arguments),this.key=n.key,this.attr=s(r({},h),{w:500,h:100,zIndex:-1}),this.chartConfig=a(n),this.option=a(g)}}export{A as default,g as option};
var f=Object.defineProperty,l=Object.defineProperties;var m=Object.getOwnPropertyDescriptors;var o=Object.getOwnPropertySymbols;var u=Object.prototype.hasOwnProperty,d=Object.prototype.propertyIsEnumerable;var p=(e,t,i)=>t in e?f(e,t,{enumerable:!0,configurable:!0,writable:!0,value:i}):e[t]=i,r=(e,t)=>{for(var i in t||(t={}))u.call(t,i)&&p(e,i,t[i]);if(o)for(var i of o(t))d.call(t,i)&&p(e,i,t[i]);return e},s=(e,t)=>l(e,m(t));import{ax as h,al as a}from"./index.js";import{e as c}from"./chartEditStore-9bac96ed.js";import{c as n}from"./index-645d17ce.js";import"./plugin-e1e7aece.js";import"./icon-2a87dc93.js";import"./chartLayoutStore-6af5bdff.js";import"./tables_list-16bd57ab.js";/* empty css */import"./SettingItemBox-b2997572.js";import"./CollapseItem-2c94353e.js";import"./useTargetData.hook-451e7e77.js";const g={dataset:10*60,useEndDate:!1,endDate:new Date().getTime(),style:"\u65F6\u5206\u79D2",showDay:!1,flipperBgColor:"#16293E",flipperTextColor:"#4A9EF8FF",flipperWidth:30,flipperHeight:50,flipperRadius:5,flipperGap:10,flipperType:"down",flipperSpeed:450};class A extends c{constructor(){super(...arguments),this.key=n.key,this.attr=s(r({},h),{w:500,h:100,zIndex:-1}),this.chartConfig=a(n),this.option=a(g)}}export{A as default,g as option};
www/static/js/config-e3fd7187.js → www/static/js/config-a19bc7cd.js
+1 -1
View File
@@ -1 +1 @@
var n=Object.defineProperty,f=Object.defineProperties;var c=Object.getOwnPropertyDescriptors;var r=Object.getOwnPropertySymbols;var h=Object.prototype.hasOwnProperty,d=Object.prototype.propertyIsEnumerable;var s=(o,t,i)=>t in o?n(o,t,{enumerable:!0,configurable:!0,writable:!0,value:i}):o[t]=i,a=(o,t)=>{for(var i in t||(t={}))h.call(t,i)&&s(o,i,t[i]);if(r)for(var i of r(t))d.call(t,i)&&s(o,i,t[i]);return o},e=(o,t)=>f(o,c(t));import{ax as g,al as m}from"./index.js";import{e as l}from"./chartEditStore-39509bd6.js";import{I as p}from"./index-53129e1b.js";import"./plugin-45284851.js";import"./icon-3a32fadd.js";import"./chartLayoutStore-bb0cd4f0.js";import"./tables_list-16bd57ab.js";/* empty css */import"./SettingItemBox-7b2092d6.js";import"./CollapseItem-d1b01f0c.js";import"./useTargetData.hook-19e86696.js";const u={dataset:"",borderRadius:10};class j extends l{constructor(){super(...arguments),this.key=p.key,this.attr=e(a({},g),{w:1200,h:800,zIndex:-1}),this.chartConfig=m(p),this.option=m(u)}}export{j as default,u as option};
var n=Object.defineProperty,f=Object.defineProperties;var c=Object.getOwnPropertyDescriptors;var r=Object.getOwnPropertySymbols;var h=Object.prototype.hasOwnProperty,d=Object.prototype.propertyIsEnumerable;var s=(o,t,i)=>t in o?n(o,t,{enumerable:!0,configurable:!0,writable:!0,value:i}):o[t]=i,a=(o,t)=>{for(var i in t||(t={}))h.call(t,i)&&s(o,i,t[i]);if(r)for(var i of r(t))d.call(t,i)&&s(o,i,t[i]);return o},e=(o,t)=>f(o,c(t));import{ax as g,al as m}from"./index.js";import{e as l}from"./chartEditStore-9bac96ed.js";import{I as p}from"./index-645d17ce.js";import"./plugin-e1e7aece.js";import"./icon-2a87dc93.js";import"./chartLayoutStore-6af5bdff.js";import"./tables_list-16bd57ab.js";/* empty css */import"./SettingItemBox-b2997572.js";import"./CollapseItem-2c94353e.js";import"./useTargetData.hook-451e7e77.js";const u={dataset:"",borderRadius:10};class j extends l{constructor(){super(...arguments),this.key=p.key,this.attr=e(a({},g),{w:1200,h:800,zIndex:-1}),this.chartConfig=m(p),this.option=m(u)}}export{j as default,u as option};
www/static/js/config-e84b17a3.js
+1
View File
@@ -0,0 +1 @@
import{al as o}from"./index.js";import{e as i}from"./chartEditStore-9bac96ed.js";import{h as t}from"./index-645d17ce.js";import"./plugin-e1e7aece.js";import"./icon-2a87dc93.js";import"./chartLayoutStore-6af5bdff.js";import"./tables_list-16bd57ab.js";/* empty css */import"./SettingItemBox-b2997572.js";import"./CollapseItem-2c94353e.js";import"./useTargetData.hook-451e7e77.js";const r={dataset:"",fit:"contain",borderRadius:10};class h extends i{constructor(){super(...arguments),this.key=t.key,this.chartConfig=o(t),this.option=o(r)}}export{h as default,r as option};
www/static/js/config-00c6129d.js → www/static/js/config-e9486798.js
+1 -1
View File
@@ -1 +1 @@
var u=Object.defineProperty,m=Object.defineProperties;var c=Object.getOwnPropertyDescriptors;var l=Object.getOwnPropertySymbols;var b=Object.prototype.hasOwnProperty,g=Object.prototype.propertyIsEnumerable;var o=(a,e,t)=>e in a?u(a,e,{enumerable:!0,configurable:!0,writable:!0,value:t}):a[e]=t,r=(a,e)=>{for(var t in e||(e={}))b.call(e,t)&&o(a,t,e[t]);if(l)for(var t of l(e))g.call(e,t)&&o(a,t,e[t]);return a},i=(a,e)=>m(a,c(e));import{al as n,ax as p}from"./index.js";import{P as f,b as C,e as d}from"./chartEditStore-39509bd6.js";import{Y as v}from"./tables_list-16bd57ab.js";import{i as h,j as y}from"./index-53129e1b.js";import"./plugin-45284851.js";import"./icon-3a32fadd.js";import"./chartLayoutStore-bb0cd4f0.js";/* empty css */import"./SettingItemBox-7b2092d6.js";import"./CollapseItem-d1b01f0c.js";import"./useTargetData.hook-19e86696.js";const s={key:"Select",chartKey:"VSelect",conKey:"VCSelect",title:"\u9009\u62E9",category:h.MORE,categoryName:y.MORE,package:f.INFORMATIONS,chartFrame:C.COMMON,image:v};var k=[{label:"\u8BF7\u9009\u62E9",value:""},{label:"\u8363\u6210",value:"26700"},{label:"\u6CB3\u5357",value:"20700",disabled:!0},{label:"\u6CB3\u5317",value:"18700"},{label:"\u5F90\u5DDE",value:"17800"},{label:"\u6F2F\u6CB3",value:"16756"},{label:"\u4E09\u95E8\u5CE1",value:"12343"},{label:"\u90D1\u5DDE",value:"9822"},{label:"\u5468\u53E3",value:"8912"},{label:"\u6FEE\u9633",value:"6834"},{label:"\u4FE1\u9633",value:"5875"},{label:"\u65B0\u4E61",value:"3832"},{label:"\u5927\u540C",value:"1811"}];const E={dataset:k,value:"",borderWidth:1,borderStyle:"solid",borderColor:"#1a77a5",background:"none",borderRadius:6,color:"#ffffff",textAlign:"center",fontWeight:"normal",backgroundColor:"transparent",fontSize:20,onChange(a,e){}};class V extends d{constructor(){super(...arguments),this.key=s.key,this.chartConfig=n(s),this.option=n(E),this.attr=i(r({},p),{w:200,h:36,zIndex:1})}}export{V as default,E as option};
var u=Object.defineProperty,m=Object.defineProperties;var c=Object.getOwnPropertyDescriptors;var l=Object.getOwnPropertySymbols;var b=Object.prototype.hasOwnProperty,g=Object.prototype.propertyIsEnumerable;var o=(a,e,t)=>e in a?u(a,e,{enumerable:!0,configurable:!0,writable:!0,value:t}):a[e]=t,r=(a,e)=>{for(var t in e||(e={}))b.call(e,t)&&o(a,t,e[t]);if(l)for(var t of l(e))g.call(e,t)&&o(a,t,e[t]);return a},i=(a,e)=>m(a,c(e));import{al as n,ax as p}from"./index.js";import{P as f,b as C,e as d}from"./chartEditStore-9bac96ed.js";import{Y as v}from"./tables_list-16bd57ab.js";import{i as h,j as y}from"./index-645d17ce.js";import"./plugin-e1e7aece.js";import"./icon-2a87dc93.js";import"./chartLayoutStore-6af5bdff.js";/* empty css */import"./SettingItemBox-b2997572.js";import"./CollapseItem-2c94353e.js";import"./useTargetData.hook-451e7e77.js";const s={key:"Select",chartKey:"VSelect",conKey:"VCSelect",title:"\u9009\u62E9",category:h.MORE,categoryName:y.MORE,package:f.INFORMATIONS,chartFrame:C.COMMON,image:v};var k=[{label:"\u8BF7\u9009\u62E9",value:""},{label:"\u8363\u6210",value:"26700"},{label:"\u6CB3\u5357",value:"20700",disabled:!0},{label:"\u6CB3\u5317",value:"18700"},{label:"\u5F90\u5DDE",value:"17800"},{label:"\u6F2F\u6CB3",value:"16756"},{label:"\u4E09\u95E8\u5CE1",value:"12343"},{label:"\u90D1\u5DDE",value:"9822"},{label:"\u5468\u53E3",value:"8912"},{label:"\u6FEE\u9633",value:"6834"},{label:"\u4FE1\u9633",value:"5875"},{label:"\u65B0\u4E61",value:"3832"},{label:"\u5927\u540C",value:"1811"}];const E={dataset:k,value:"",borderWidth:1,borderStyle:"solid",borderColor:"#1a77a5",background:"none",borderRadius:6,color:"#ffffff",textAlign:"center",fontWeight:"normal",backgroundColor:"transparent",fontSize:20,onChange(a,e){}};class V extends d{constructor(){super(...arguments),this.key=s.key,this.chartConfig=n(s),this.option=n(E),this.attr=i(r({},p),{w:200,h:36,zIndex:1})}}export{V as default,E as option};
www/static/js/config-271f15bc.js → www/static/js/config-eada5343.js
+1 -1
View File
@@ -1 +1 @@
import{al as o}from"./index.js";import{e as s}from"./chartEditStore-39509bd6.js";import{l as i}from"./index-53129e1b.js";import"./plugin-45284851.js";import"./icon-3a32fadd.js";import"./chartLayoutStore-bb0cd4f0.js";import"./tables_list-16bd57ab.js";/* empty css */import"./SettingItemBox-7b2092d6.js";import"./CollapseItem-d1b01f0c.js";import"./useTargetData.hook-19e86696.js";var a=[["\u884C1\u52171","\u884C1\u52172","\u884C1\u52173"],["\u884C2\u52171","\u884C2\u52172","\u884C2\u52173"],["\u884C3\u52171","\u884C3\u52172","\u884C3\u52173"],["\u884C4\u52171","\u884C4\u52172","\u884C4\u52173"],["\u884C5\u52171","\u884C5\u52172","\u884C5\u52173"],["\u884C6\u52171","\u884C6\u52172","\u884C6\u52173"],["\u884C7\u52171","\u884C7\u52172","\u884C7\u52173"],["\u884C8\u52171","\u884C8\u52172","\u884C8\u52173"],["\u884C9\u52171","\u884C9\u52172","\u884C9\u52173"],["\u884C10\u52171","\u884C10\u52172","\u884C10\u52173"]];const n={header:["\u52171","\u52172","\u52173"],dataset:a,index:!0,columnWidth:[30,100,100],align:["center","right","right","right"],rowNum:5,waitTime:2,headerHeight:35,carousel:"single",headerBGC:"#00BAFF",oddRowBGC:"#003B51",evenRowBGC:"#0A2732"};class x extends s{constructor(t){super(),this.key=i.key,this.chartConfig=o(i),this.option=o(n);const{dataset:e,title:r}=t;this.chartConfig.title=r,this.option.dataset=e,this.chartConfig.sourceID=t.sourceID,this.chartConfig.fields=t.fields}}export{x as default,n as option};
import{al as o}from"./index.js";import{e as s}from"./chartEditStore-9bac96ed.js";import{l as i}from"./index-645d17ce.js";import"./plugin-e1e7aece.js";import"./icon-2a87dc93.js";import"./chartLayoutStore-6af5bdff.js";import"./tables_list-16bd57ab.js";/* empty css */import"./SettingItemBox-b2997572.js";import"./CollapseItem-2c94353e.js";import"./useTargetData.hook-451e7e77.js";var a=[["\u884C1\u52171","\u884C1\u52172","\u884C1\u52173"],["\u884C2\u52171","\u884C2\u52172","\u884C2\u52173"],["\u884C3\u52171","\u884C3\u52172","\u884C3\u52173"],["\u884C4\u52171","\u884C4\u52172","\u884C4\u52173"],["\u884C5\u52171","\u884C5\u52172","\u884C5\u52173"],["\u884C6\u52171","\u884C6\u52172","\u884C6\u52173"],["\u884C7\u52171","\u884C7\u52172","\u884C7\u52173"],["\u884C8\u52171","\u884C8\u52172","\u884C8\u52173"],["\u884C9\u52171","\u884C9\u52172","\u884C9\u52173"],["\u884C10\u52171","\u884C10\u52172","\u884C10\u52173"]];const n={header:["\u52171","\u52172","\u52173"],dataset:a,index:!0,columnWidth:[30,100,100],align:["center","right","right","right"],rowNum:5,waitTime:2,headerHeight:35,carousel:"single",headerBGC:"#00BAFF",oddRowBGC:"#003B51",evenRowBGC:"#0A2732"};class x extends s{constructor(t){super(),this.key=i.key,this.chartConfig=o(i),this.option=o(n);const{dataset:e,title:r}=t;this.chartConfig.title=r,this.option.dataset=e,this.chartConfig.sourceID=t.sourceID,this.chartConfig.fields=t.fields}}export{x as default,n as option};
www/static/js/config-18fb2a90.js → www/static/js/config-f37a9b68.js
+1 -1
View File
@@ -1 +1 @@
import{al as o}from"./index.js";import{e as t}from"./chartEditStore-39509bd6.js";import{C as r}from"./index-53129e1b.js";import"./plugin-45284851.js";import"./icon-3a32fadd.js";import"./chartLayoutStore-bb0cd4f0.js";import"./tables_list-16bd57ab.js";/* empty css */import"./SettingItemBox-7b2092d6.js";import"./CollapseItem-d1b01f0c.js";import"./useTargetData.hook-19e86696.js";const i={border:6,color:"#ffffff",bgColor:"#84a5e9",borderColor:"#ffffff"};class b extends t{constructor(){super(...arguments),this.key=r.key,this.chartConfig=o(r),this.option=o(i)}}export{b as default,i as option};
import{al as o}from"./index.js";import{e as t}from"./chartEditStore-9bac96ed.js";import{C as r}from"./index-645d17ce.js";import"./plugin-e1e7aece.js";import"./icon-2a87dc93.js";import"./chartLayoutStore-6af5bdff.js";import"./tables_list-16bd57ab.js";/* empty css */import"./SettingItemBox-b2997572.js";import"./CollapseItem-2c94353e.js";import"./useTargetData.hook-451e7e77.js";const i={border:6,color:"#ffffff",bgColor:"#84a5e9",borderColor:"#ffffff"};class b extends t{constructor(){super(...arguments),this.key=r.key,this.chartConfig=o(r),this.option=o(i)}}export{b as default,i as option};
www/static/js/config-99034b42.js → www/static/js/config-f37f99a4.js
+1 -1
View File
@@ -1 +1 @@
import{al as a}from"./index.js";import{e as t}from"./chartEditStore-39509bd6.js";import{T as o}from"./index-53129e1b.js";import"./plugin-45284851.js";import"./icon-3a32fadd.js";import"./chartLayoutStore-bb0cd4f0.js";import"./tables_list-16bd57ab.js";/* empty css */import"./SettingItemBox-7b2092d6.js";import"./CollapseItem-d1b01f0c.js";import"./useTargetData.hook-19e86696.js";var r=[{name:"\u8363\u6210",value:26700},{name:"\u6CB3\u5357",value:20700},{name:"\u6CB3\u5317",value:18700},{name:"\u5F90\u5DDE",value:17800},{name:"\u6F2F\u6CB3",value:16756},{name:"\u4E09\u95E8\u5CE1",value:12343},{name:"\u90D1\u5DDE",value:9822},{name:"\u5468\u53E3",value:8912},{name:"\u6FEE\u9633",value:6834},{name:"\u4FE1\u9633",value:5875},{name:"\u65B0\u4E61",value:3832},{name:"\u5927\u540C",value:1811}];const i={dataset:r,rowNum:5,waitTime:2,unit:"",sort:!0,color:"#1370fb",textColor:"#CDD2F8FF",borderColor:"#1370fb80",carousel:"single",indexFontSize:12,leftFontSize:12,rightFontSize:12,valueFormatter(e){return e.value}};class F extends t{constructor(){super(...arguments),this.key=o.key,this.chartConfig=a(o),this.option=a(i)}}export{F as default,i as option};
import{al as a}from"./index.js";import{e as t}from"./chartEditStore-9bac96ed.js";import{T as o}from"./index-645d17ce.js";import"./plugin-e1e7aece.js";import"./icon-2a87dc93.js";import"./chartLayoutStore-6af5bdff.js";import"./tables_list-16bd57ab.js";/* empty css */import"./SettingItemBox-b2997572.js";import"./CollapseItem-2c94353e.js";import"./useTargetData.hook-451e7e77.js";var r=[{name:"\u8363\u6210",value:26700},{name:"\u6CB3\u5357",value:20700},{name:"\u6CB3\u5317",value:18700},{name:"\u5F90\u5DDE",value:17800},{name:"\u6F2F\u6CB3",value:16756},{name:"\u4E09\u95E8\u5CE1",value:12343},{name:"\u90D1\u5DDE",value:9822},{name:"\u5468\u53E3",value:8912},{name:"\u6FEE\u9633",value:6834},{name:"\u4FE1\u9633",value:5875},{name:"\u65B0\u4E61",value:3832},{name:"\u5927\u540C",value:1811}];const i={dataset:r,rowNum:5,waitTime:2,unit:"",sort:!0,color:"#1370fb",textColor:"#CDD2F8FF",borderColor:"#1370fb80",carousel:"single",indexFontSize:12,leftFontSize:12,rightFontSize:12,valueFormatter(e){return e.value}};class F extends t{constructor(){super(...arguments),this.key=o.key,this.chartConfig=a(o),this.option=a(i)}}export{F as default,i as option};
www/static/js/cssMode-0d678721.js.gz
BIN
View File
Binary file not shown.
www/static/js/cssMode-0d678721.js → www/static/js/cssMode-999d18d1.js
+1 -1
View File
@@ -1,4 +1,4 @@
var Le=Object.defineProperty;var Fe=(e,n,i)=>n in e?Le(e,n,{enumerable:!0,configurable:!0,writable:!0,value:i}):e[n]=i;var E=(e,n,i)=>(Fe(e,typeof n!="symbol"?n+"":n,i),i);import{m as je}from"./index-28a8b271.js";import"./index.js";import"./editorWorker-abdb3aef.js";import"./storage-217c57bb.js";import"./icon-3a32fadd.js";/*!-----------------------------------------------------------------------------
var Le=Object.defineProperty;var Fe=(e,n,i)=>n in e?Le(e,n,{enumerable:!0,configurable:!0,writable:!0,value:i}):e[n]=i;var E=(e,n,i)=>(Fe(e,typeof n!="symbol"?n+"":n,i),i);import{m as je}from"./index-ce63a5ac.js";import"./index.js";import"./editorWorker-abdb3aef.js";import"./storage-1d60daa3.js";import"./icon-2a87dc93.js";/*!-----------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Version: 0.33.0(4b1abad427e58dbedc1215d99a0902ffc885fcd4)
* Released under the MIT license
www/static/js/cssMode-999d18d1.js.gz
BIN
View File
Binary file not shown.
www/static/js/freemarker2-cca7cf09.js → www/static/js/freemarker2-f2347917.js
+1 -1
View File
@@ -1,4 +1,4 @@
var $=Object.defineProperty,v=Object.defineProperties;var E=Object.getOwnPropertyDescriptors;var m=Object.getOwnPropertySymbols;var D=Object.prototype.hasOwnProperty,B=Object.prototype.propertyIsEnumerable;var f=(t,n,_)=>n in t?$(t,n,{enumerable:!0,configurable:!0,writable:!0,value:_}):t[n]=_,i=(t,n)=>{for(var _ in n||(n={}))D.call(n,_)&&f(t,_,n[_]);if(m)for(var _ of m(n))B.call(n,_)&&f(t,_,n[_]);return t},d=(t,n)=>v(t,E(n));import{m as C}from"./index-28a8b271.js";import"./index.js";import"./editorWorker-abdb3aef.js";import"./storage-217c57bb.js";import"./icon-3a32fadd.js";/*!-----------------------------------------------------------------------------
var $=Object.defineProperty,v=Object.defineProperties;var E=Object.getOwnPropertyDescriptors;var m=Object.getOwnPropertySymbols;var D=Object.prototype.hasOwnProperty,B=Object.prototype.propertyIsEnumerable;var f=(t,n,_)=>n in t?$(t,n,{enumerable:!0,configurable:!0,writable:!0,value:_}):t[n]=_,i=(t,n)=>{for(var _ in n||(n={}))D.call(n,_)&&f(t,_,n[_]);if(m)for(var _ of m(n))B.call(n,_)&&f(t,_,n[_]);return t},d=(t,n)=>v(t,E(n));import{m as C}from"./index-ce63a5ac.js";import"./index.js";import"./editorWorker-abdb3aef.js";import"./storage-1d60daa3.js";import"./icon-2a87dc93.js";/*!-----------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Version: 0.33.0(4b1abad427e58dbedc1215d99a0902ffc885fcd4)
* Released under the MIT license
www/static/js/freemarker2-cca7cf09.js.gz → www/static/js/freemarker2-f2347917.js.gz
BIN
View File
Binary file not shown.
www/static/js/handlebars-11654087.js → www/static/js/handlebars-3158f105.js
+1 -1
View File
@@ -1,4 +1,4 @@
import{m as i}from"./index-28a8b271.js";import"./index.js";import"./editorWorker-abdb3aef.js";import"./storage-217c57bb.js";import"./icon-3a32fadd.js";/*!-----------------------------------------------------------------------------
import{m as i}from"./index-ce63a5ac.js";import"./index.js";import"./editorWorker-abdb3aef.js";import"./storage-1d60daa3.js";import"./icon-2a87dc93.js";/*!-----------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Version: 0.33.0(4b1abad427e58dbedc1215d99a0902ffc885fcd4)
* Released under the MIT license
www/static/js/html-a3e5cff9.js → www/static/js/html-6b3cef89.js
+1 -1
View File
@@ -1,4 +1,4 @@
import{m as s}from"./index-28a8b271.js";import"./index.js";import"./editorWorker-abdb3aef.js";import"./storage-217c57bb.js";import"./icon-3a32fadd.js";/*!-----------------------------------------------------------------------------
import{m as s}from"./index-ce63a5ac.js";import"./index.js";import"./editorWorker-abdb3aef.js";import"./storage-1d60daa3.js";import"./icon-2a87dc93.js";/*!-----------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Version: 0.33.0(4b1abad427e58dbedc1215d99a0902ffc885fcd4)
* Released under the MIT license
www/static/js/htmlMode-536642d9.js → www/static/js/htmlMode-5212bb73.js
+1 -1
View File
@@ -1,4 +1,4 @@
var Be=Object.defineProperty;var $e=(e,n,i)=>n in e?Be(e,n,{enumerable:!0,configurable:!0,writable:!0,value:i}):e[n]=i;var E=(e,n,i)=>($e(e,typeof n!="symbol"?n+"":n,i),i);import{m as qe}from"./index-28a8b271.js";import"./index.js";import"./editorWorker-abdb3aef.js";import"./storage-217c57bb.js";import"./icon-3a32fadd.js";/*!-----------------------------------------------------------------------------
var Be=Object.defineProperty;var $e=(e,n,i)=>n in e?Be(e,n,{enumerable:!0,configurable:!0,writable:!0,value:i}):e[n]=i;var E=(e,n,i)=>($e(e,typeof n!="symbol"?n+"":n,i),i);import{m as qe}from"./index-ce63a5ac.js";import"./index.js";import"./editorWorker-abdb3aef.js";import"./storage-1d60daa3.js";import"./icon-2a87dc93.js";/*!-----------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Version: 0.33.0(4b1abad427e58dbedc1215d99a0902ffc885fcd4)
* Released under the MIT license
www/static/js/htmlMode-5212bb73.js.gz
BIN
View File
Binary file not shown.
www/static/js/htmlMode-536642d9.js.gz
BIN
View File
Binary file not shown.
www/static/js/icon-3a32fadd.js → www/static/js/icon-2a87dc93.js
View File
www/static/js/icon-3a32fadd.js.gz → www/static/js/icon-2a87dc93.js.gz
View File
www/static/js/index-ed8c1e5b.js → www/static/js/index-038a896f.js
View File
www/static/js/index-7b46c300.js → www/static/js/index-07cbdfae.js
+1 -1
View File
@@ -1,4 +1,4 @@
var Gn=(s,n,r)=>new Promise((i,e)=>{var u=a=>{try{o(r.next(a))}catch(l){e(l)}},t=a=>{try{o(r.throw(a))}catch(l){e(l)}},o=a=>a.done?i(a.value):Promise.resolve(a.value).then(u,t);o((r=r.apply(s,n)).next())});import{c7 as pr,c8 as gr,bd as mr,c9 as yr,j as ln,d as un,bT as Rn,f as q,u as Mn,a5 as Ut,r as wt,X as Sr,Y as br,o as $t,m as Ue,e as Ot,ad as ce,v as tn,z as ue,a9 as Er,w as Pt,t as Nn,aj as Gt,c as le,p as Tn,F as Zn,A as kn,ca as qn,al as xr,R as Or,aa as Tr}from"./index.js";import{C as Ir}from"./index-7eb0b042.js";import{L as ye,u as Cr,C as Un}from"./chartLayoutStore-bb0cd4f0.js";import{u as fn}from"./chartEditStore-39509bd6.js";import{u as _n,d as Dr}from"./index-2d4639a9.js";import{a as Pr}from"./index-53129e1b.js";import{i as en}from"./icon-3a32fadd.js";import"./plugin-45284851.js";import"./index-8038fd82.js";import"./index-d11d11fc.js";import"./tables_list-16bd57ab.js";/* empty css */import"./SettingItemBox-7b2092d6.js";import"./CollapseItem-d1b01f0c.js";import"./useTargetData.hook-19e86696.js";var tr={exports:{}};/**!
var Gn=(s,n,r)=>new Promise((i,e)=>{var u=a=>{try{o(r.next(a))}catch(l){e(l)}},t=a=>{try{o(r.throw(a))}catch(l){e(l)}},o=a=>a.done?i(a.value):Promise.resolve(a.value).then(u,t);o((r=r.apply(s,n)).next())});import{c7 as pr,c8 as gr,bd as mr,c9 as yr,j as ln,d as un,bT as Rn,f as q,u as Mn,a5 as Ut,r as wt,X as Sr,Y as br,o as $t,m as Ue,e as Ot,ad as ce,v as tn,z as ue,a9 as Er,w as Pt,t as Nn,aj as Gt,c as le,p as Tn,F as Zn,A as kn,ca as qn,al as xr,R as Or,aa as Tr}from"./index.js";import{C as Ir}from"./index-5c08589c.js";import{L as ye,u as Cr,C as Un}from"./chartLayoutStore-6af5bdff.js";import{u as fn}from"./chartEditStore-9bac96ed.js";import{u as _n,d as Dr}from"./index-13d48476.js";import{a as Pr}from"./index-645d17ce.js";import{i as en}from"./icon-2a87dc93.js";import"./plugin-e1e7aece.js";import"./index-ca3b5c57.js";import"./index-9beebe5b.js";import"./tables_list-16bd57ab.js";/* empty css */import"./SettingItemBox-b2997572.js";import"./CollapseItem-2c94353e.js";import"./useTargetData.hook-451e7e77.js";var tr={exports:{}};/**!
* Sortable 1.14.0
* @author RubaXa <trash@rubaxa.org>
* @author owenm <owen23355@gmail.com>
www/static/js/index-07cbdfae.js.gz
BIN
View File
Binary file not shown.
www/static/js/index-2d4639a9.js → www/static/js/index-13d48476.js
+1 -1
View File
File diff suppressed because one or more lines are too long
www/static/js/index-28a8b271.js.gz
BIN
View File
Binary file not shown.
www/static/js/index-700fc5c1.js → www/static/js/index-2b285fb8.js
+1 -1
View File
File diff suppressed because one or more lines are too long
www/static/js/index-2b285fb8.js.gz
BIN
View File
Binary file not shown.
www/static/js/index-321a0346.js.gz
BIN
View File
Binary file not shown.
www/static/js/index-fe1e0948.js → www/static/js/index-4605ca11.js
+1 -1
View File
@@ -1 +1 @@
import{j as r,d as c,J as u,bl as i,r as d,o as a,m as _,A as p,c as f,w as m,z as v,t as b,ad as w,f as g,F as h}from"./index.js";import{u as x}from"./chartEditStore-39509bd6.js";import"./plugin-45284851.js";import"./icon-3a32fadd.js";const C=c({__name:"index",setup(k){const n=x();u();const o=i([{select:!0,title:"\u5168\u5C4F",event:()=>{var e;(e=window.fullscreen)==null||e.call(window)},className:"btn btn-full"},{select:!0,title:"\u5B58\u4E3A\u8349\u7A3F",event:()=>{var t;const e=n.getStorageInfo;(t=window.saveAsDraft)==null||t.call(window,e)},className:"btn btn-full"},{select:!0,title:"\u53D1\u5E03",event:()=>{var t;const e=n.getStorageInfo;(t=window.saveAsPublish)==null||t.call(window,e)},className:"btn btn-publish"}]);return(e,t)=>{const l=d("n-button");return a(!0),_(h,null,p(g(o),s=>(a(),f(l,{key:s.title,class:w(s.className),ghost:"",onClick:s.event},{default:m(()=>[v("span",null,b(s.title),1)]),_:2},1032,["class","onClick"]))),128)}}});var y=r(C,[["__scopeId","data-v-90aad402"]]);export{y as default};
import{j as r,d as c,J as u,bl as i,r as d,o as a,m as _,A as p,c as f,w as m,z as v,t as b,ad as w,f as g,F as h}from"./index.js";import{u as x}from"./chartEditStore-9bac96ed.js";import"./plugin-e1e7aece.js";import"./icon-2a87dc93.js";const C=c({__name:"index",setup(k){const n=x();u();const o=i([{select:!0,title:"\u5168\u5C4F",event:()=>{var e;(e=window.fullscreen)==null||e.call(window)},className:"btn btn-full"},{select:!0,title:"\u5B58\u4E3A\u8349\u7A3F",event:()=>{var t;const e=n.getStorageInfo;(t=window.saveAsDraft)==null||t.call(window,e)},className:"btn btn-full"},{select:!0,title:"\u53D1\u5E03",event:()=>{var t;const e=n.getStorageInfo;(t=window.saveAsPublish)==null||t.call(window,e)},className:"btn btn-publish"}]);return(e,t)=>{const l=d("n-button");return a(!0),_(h,null,p(g(o),s=>(a(),f(l,{key:s.title,class:w(s.className),ghost:"",onClick:s.event},{default:m(()=>[v("span",null,b(s.title),1)]),_:2},1032,["class","onClick"]))),128)}}});var y=r(C,[["__scopeId","data-v-90aad402"]]);export{y as default};
www/static/js/index-8145c21f.js → www/static/js/index-4f788cec.js
+1 -1
View File
File diff suppressed because one or more lines are too long
www/static/js/index-4f788cec.js.gz
BIN
View File
Binary file not shown.
www/static/js/index-53129e1b.js.gz
BIN
View File
Binary file not shown.
www/static/js/index-c7897000.js → www/static/js/index-548bbfc7.js
+1 -1
View File
File diff suppressed because one or more lines are too long

Some files were not shown because too many files have changed in this diff Show More