',
'
',
'
',
@@ -303,12 +306,13 @@ class StepsEditor extends zui.Component
$row.css('--name-indent', `${(item.level - 1) * 14}px`).find('.steps-editor-step-name').css('width', item.name.length * 12).text(item.name).css('paddingLeft', (item.level - 1) * 14);
$row.find('.steps-editor-step-text').attr('name', `${options.name}[${item.name}]`);
$row.find('.steps-editor-step-type').attr('name', `stepType[${item.name}]`).val(hasSub ? 'group' : (!!item.parent ? 'item' : 'step'));
+ if(options.postDataID) $row.find('.steps-editor-post-data-id').attr('name', `id[${item.name}]`);
const $expect = $row.find('.steps-editor-step-expect').attr(
{
name: `${options.expectsName}[${item.name}]`,
- disabled: hasSub ? 'disabled' : null
- }).toggleClass('disabled', hasSub);
- $expect.parent().toggleClass('disabled', hasSub);
+ disabled: hasSub && options.expectDisabled ? 'disabled' : null
+ }).toggleClass('disabled', hasSub && options.expectDisabled);
+ $expect.parent().toggleClass('disabled', hasSub && options.expectDisabled);
$row.find('.steps-editor-col-delete .btn').toggleClass('disabled', hasSub || this._items.length == 1);
$row.find('.steps-editor-col-delete .btn.disabled').attr('title', options.deleteStepTip);
$row.find('.steps-editor-col-add .btn-action[data-action="sub"]').toggleClass('disabled', item.level >= 3);
diff --git a/lib/zin/wg/stepseditor/v1.php b/lib/zin/wg/stepseditor/v1.php
index 6d38831510..ed8388b7e9 100644
--- a/lib/zin/wg/stepseditor/v1.php
+++ b/lib/zin/wg/stepseditor/v1.php
@@ -37,7 +37,9 @@ class stepsEditor extends wg
'subLevelText?: string', // 子级文本。
'expectDisabledTip?: string', // 预期输入框禁用提示。
'deleteStepTip?: string', // 有子层级禁用删除提示。
- 'dragNestedTip?: string' // 拖拽超出提示。
+ 'dragNestedTip?: string', // 拖拽超出提示。
+ 'expectDisabled: bool=true', // 是否禁用预期输入框。
+ 'postDataID: bool=false' // 是否提交表单时附加 ID。
);
public static function getPageJS(): ?string
@@ -64,10 +66,10 @@ class stepsEditor extends wg
$subLevelText = $this->prop('subLevelText', data('lang.testcase.stepSubLevel'));
$id = $this->prop('id') ? $this->prop('id') : $this->gid;
- $options = $this->props->pick(array('name', 'expectsName', 'data'));
+ $options = $this->props->pick(array('name', 'expectsName', 'data', 'postDataID', 'expectDisabled'));
$options['expectDisabledTip'] = $this->prop('expectDisabledTip', data('lang.testcase.expectDisabledTip'));
- $options['deleteStepTip'] = $this->prop('deleteStepTip', data('lang.testcase.deleteStepTip'));
- $options['dragNestedTip'] = $this->prop('dragNestedTip', data('lang.testcase.dragNestedTip'));
+ $options['deleteStepTip'] = $this->prop('deleteStepTip', data('lang.testcase.deleteStepTip'));
+ $options['dragNestedTip'] = $this->prop('dragNestedTip', data('lang.testcase.dragNestedTip'));
return div
(
diff --git a/lib/zin/wg/storylifeinfo/v1.php b/lib/zin/wg/storylifeinfo/v1.php
index 1d3a19f1bd..d260977aaf 100644
--- a/lib/zin/wg/storylifeinfo/v1.php
+++ b/lib/zin/wg/storylifeinfo/v1.php
@@ -31,9 +31,9 @@ class storyLifeInfo extends wg
'children' => wg(div
(
setClass('row gap-2 flex-wrap'),
- array_values(array_map(function($reviewer, $result) use($users, $lang)
+ array_values(array_map(function($reviewer, $result) use($users, $lang, $story)
{
- return !empty($result) ? span(setClass('mr-2'), set::title($lang->story->reviewed), set::style(array('color' => '#cbd0db')), zget($users, $reviewer)) : span(setClass('mr-2'), set::title($lang->story->toBeReviewed), zget($users, $reviewer));
+ return !empty($result) ? span(setClass('mr-2'), set::title($lang->story->reviewed), $story->status != 'changing' && $story->status != 'draft' ? set::style(array('color' => '#cbd0db')) : null, zget($users, $reviewer)) : span(setClass('mr-2'), set::title($lang->story->toBeReviewed), zget($users, $reviewer));
}, array_keys($reviewers), array_values($reviewers)))
))
);
diff --git a/lib/zin/wg/thinkmulticolumn/v1.php b/lib/zin/wg/thinkmulticolumn/v1.php
index 4a4fc98a39..187d0e243a 100644
--- a/lib/zin/wg/thinkmulticolumn/v1.php
+++ b/lib/zin/wg/thinkmulticolumn/v1.php
@@ -99,7 +99,7 @@ class thinkMulticolumn extends thinkQuestion
if(empty($fields)) $fields = array($defalutField, $defalutField, $defalutField, $defalutField);
foreach($fields as $key => $field) $batchItems[] = $this->buildFormBatchItem($field, (int)$key, $isRun, $quotedQuestions, !empty($result));
- if($isResult || $isRun) $result = $this->processResult($result);
+ if($isResult || $isRun || !empty($result)) $result = $this->processResult($result);
$detailWg[] = formBatch
(
setClass('think-form-batch'),
@@ -228,4 +228,4 @@ class thinkMulticolumn extends thinkQuestion
);
return $formItems;
}
-}
\ No newline at end of file
+}
diff --git a/lib/zin/wg/thinkstepbase/v1.php b/lib/zin/wg/thinkstepbase/v1.php
index 3ef9af292f..2e78a6c4dc 100644
--- a/lib/zin/wg/thinkstepbase/v1.php
+++ b/lib/zin/wg/thinkstepbase/v1.php
@@ -44,7 +44,7 @@ class thinkStepBase extends wg
if($mode != 'detail') return array();
$options = $step->options;
- if($options)
+ if($step->type == 'questions')
{
$questionType = $options->questionType;
$tips = $lang->thinkstep->$questionType;
@@ -111,7 +111,7 @@ class thinkStepBase extends wg
if(!empty($step->options->fields)) $step->options->fields = is_string($step->options->fields) ? explode(', ', $step->options->fields) : array_values((array)$step->options->fields);
- $questionType = !empty($step) && !empty($step->options) ? $step->options->questionType : '';
+ $questionType = !empty($step) && $step->type == 'questions' ? $step->options->questionType : '';
$isCheckBox = !empty($step) && $step->type == 'question' && in_array($questionType, $config->thinkstep->quoteQuestionType);
$isQuoteItem = $isCheckBox && !empty($step->options->setOption) && $step->options->setOption == 1;
$detailTip = array();
diff --git a/lib/zin/wg/thinktableinput/v1.php b/lib/zin/wg/thinktableinput/v1.php
index 3d53127068..cfb595672f 100644
--- a/lib/zin/wg/thinktableinput/v1.php
+++ b/lib/zin/wg/thinktableinput/v1.php
@@ -14,6 +14,7 @@ class thinkTableInput extends thinkQuestion
'fields?: array', // 行标题
'supportAdd?: bool', // 是否支持用户添加行
'canAddRows: number=1', // 可添加行数
+ 'inputType?: bool=flase', // 输入类型
);
public static function getPageJS(): string
@@ -31,7 +32,7 @@ class thinkTableInput extends thinkQuestion
{
global $lang;
$detailWg = parent::buildDetail();
- list($step, $fields, $supportAdd, $canAddRows, $mode) = $this->prop(array('step', 'fields', 'supportAdd', 'canAddRows', 'mode'));
+ list($step, $fields, $supportAdd, $canAddRows, $mode, $inputType) = $this->prop(array('step', 'fields', 'supportAdd', 'canAddRows', 'mode', 'inputType'));
if($mode != 'detail') return array();
if($step)
@@ -42,6 +43,7 @@ class thinkTableInput extends thinkQuestion
$answer = $step->answer;
$result = isset($answer->result) && !empty($answer->result) ? (array) $answer->result : array();
$customFields = !empty($answer->customFields) ? get_object_vars($answer->customFields) : array();
+ $inputType = isset($step->options->inputType)? $step->options->inputType : false;
}
$tableInputItems = array();
@@ -62,14 +64,29 @@ class thinkTableInput extends thinkQuestion
div
(
set::title($value),
- setClass('result-width', $index == 0 ? '' : 'mt-2'),
- textarea
+ setClass(empty($inputType) ? 'result-width' : '', $index == 0 ? '' : 'mt-2'),
+ empty($inputType) ? textarea
(
set::rows('2'),
set::name('result[' . $index . ']'),
set::value($value),
set::placeholder($lang->thinkrun->pleaseInput)
- )
+ ) : inputControl
+ (
+ input(set(array(
+ 'class' => 'w-72 h-10 dimension-weight',
+ 'name' => 'result[' . $index . ']',
+ 'type' => 'number',
+ 'min' => 1,
+ 'max' => 100,
+ 'value' => $value,
+ 'placeholder' => $lang->thinkrun->pleaseInput
+ )),
+ on::input('changeInput')
+ ),
+ to::suffix($lang->thinkwizard->dimension->percentageSign),
+ set::suffixWidth(32)
+ ),
),
div
(
@@ -200,7 +217,7 @@ class thinkTableInput extends thinkQuestion
$app->loadLang('thinkstep');
$formItems = parent::buildFormItem();
- list($step, $required, $requiredRows, $supportAdd, $canAddRows, $fields) = $this->prop(array('step','required', 'requiredRows', 'supportAdd', 'canAddRows', 'fields'));
+ list($step, $required, $requiredRows, $supportAdd, $canAddRows, $fields, $inputType) = $this->prop(array('step','required', 'requiredRows', 'supportAdd', 'canAddRows', 'fields', 'inputType'));
if($step)
{
$required = $step->options->required;
@@ -209,10 +226,12 @@ class thinkTableInput extends thinkQuestion
$requiredRows = $step->options->requiredRows;
$supportAdd = $step->options->supportAdd;
$canAddRows = $step->options->canAddRows;
+ $inputType = isset($step->options->inputType) ? $step->options->inputType : false;
}
$formItems[] = array (
formHidden('options[questionType]', 'tableInput'),
+ formHidden('options[inputType]', $inputType),
formRow
(
setClass('mb-3'),
diff --git a/misc/ci/Jenkinsfile b/misc/ci/Jenkinsfile
index 537129ddb1..1df7394924 100644
--- a/misc/ci/Jenkinsfile
+++ b/misc/ci/Jenkinsfile
@@ -224,7 +224,7 @@ pipeline {
script {
// 仅制作开源版时不上传收费版相关源码
if (params.publish_exts!="open") {
- buildPkg.uploadSource("php8.1", ["php7.0", "php7.1", "php7.2_7.4"])
+ buildPkg.uploadSource("php8.1", ["php0.0", "php8.1", "php7.0", "php7.1", "php7.2_7.4"])
}
}
}
diff --git a/misc/ci/Jenkinsfile.downgrade b/misc/ci/Jenkinsfile.downgrade
index e634a34b1c..b603b2a9a8 100755
--- a/misc/ci/Jenkinsfile.downgrade
+++ b/misc/ci/Jenkinsfile.downgrade
@@ -1,5 +1,5 @@
library 'z-common@master'
-library 'z-zentaopms@feat-240509'
+library 'z-zentaopms'
pipeline {
agent {
@@ -52,11 +52,11 @@ pipeline {
checkout scm
script {
def triggeredBy = currentBuild.getBuildCauses()
- println "Build triggered by: ${triggeredBy}"
+ println "Build triggered by: ${triggeredBy}"
env.GIT_URL = sh(returnStdout: true, script: 'git config --get remote.origin.url').trim()
env.GIT_COMMIT = sh(returnStdout: true, script: 'git rev-parse HEAD').trim()
-
+
def j = job.newJob()
env.GIT_BRANCH = j.getBranchById(env.GIT_COMMIT)
@@ -73,7 +73,7 @@ pipeline {
[name: "downRepoExt", subDir: true, url: "https://${env.GITFOX_HOST}/git/${env.DOWNGRADE_EXT_GIT_REPO}.git", credentialsId: "gitfox-zcorp-cc-ci-robot", branchs: ["downgrade/blank"] ]
])
}
-
+
}
}
@@ -86,11 +86,11 @@ pipeline {
sh 'git config --global --add safe.directory $PWD/zentaoext'
sh 'git config --global --add safe.directory $PWD/downRepo'
sh 'git config --global --add safe.directory $PWD/downRepoExt'
-
+
sh 'echo ${GIT_BRANCH}'
sh 'mkdir -pv ${ZENTAO_RELEASE_PATH} && chown 1000:1000 ${ZENTAO_RELEASE_PATH}'
sh 'make ciCommon'
-
+
withCredentials([gitUsernamePassword(credentialsId: 'gitfox-zcorp-cc-ci-robot', gitToolName: 'Default')]) {
sh '${ZENTAO_BUILD_PATH}/script/downgrade/fullDowngrade_v2.sh -c $PWD/misc -r $PWD/zentaopms -b ${GIT_BRANCH} -d downRepo -i -s -g $GIT_COMMIT -o "$ZENTAO_RELEASE_PATH" -p "$DOWNGRADE_VERSIONS" api extension framework lib module/*'
}
@@ -136,7 +136,7 @@ pipeline {
sh 'git config --global --add safe.directory $SRC_ZENTAOEXT_PATH/zentaomax'
sh 'git config --global --add safe.directory $SRC_ZENTAOEXT_PATH/zentaoipd'
sh 'cd $SRC_ZENTAOEXT_PATH;make build'
-
+
withCredentials([gitUsernamePassword(credentialsId: 'gitfox-zcorp-cc-ci-robot', gitToolName: 'Default')]) {
sh '${ZENTAO_BUILD_PATH}/script/downgrade/fullDowngrade_v2.sh -c $PWD/misc -r $ZENTAO_BUILD_PATH/zentaoext -b ${GIT_BRANCH} -d downRepoExt -i -s -g $GIT_COMMIT -o "$ZENTAO_RELEASE_PATH" -p "$DOWNGRADE_VERSIONS" bizext biz max ipd'
}
diff --git a/module/account/config.php b/module/account/config.php
deleted file mode 100644
index 46a33bf32e..0000000000
--- a/module/account/config.php
+++ /dev/null
@@ -1,10 +0,0 @@
-account->create = new stdclass;
-$config->account->create->requiredFields = 'name,account,provider';
-
-$config->account->edit = new stdclass;
-$config->account->edit->requiredFields = 'name,account,provider';
-
-$config->account->actions = new stdclass();
-$config->account->actions->view = array();
-$config->account->actions->view['suffixActions'] = array('edit');
diff --git a/module/account/config/dtable.php b/module/account/config/dtable.php
deleted file mode 100644
index 696c01de3e..0000000000
--- a/module/account/config/dtable.php
+++ /dev/null
@@ -1,69 +0,0 @@
-loadLang('serverroom');
-
-$config->account->dtable = new stdclass();
-
-$config->account->dtable->fieldList['id']['title'] = 'ID';
-$config->account->dtable->fieldList['id']['name'] = 'id';
-$config->account->dtable->fieldList['id']['type'] = 'id';
-
-$config->account->dtable->fieldList['name']['title'] = $lang->account->name;
-$config->account->dtable->fieldList['name']['name'] = 'name';
-$config->account->dtable->fieldList['name']['type'] = 'desc';
-$config->account->dtable->fieldList['name']['sortType'] = true;
-$config->account->dtable->fieldList['name']['flex'] = 4;
-$config->account->dtable->fieldList['name']['hint'] = true;
-$config->account->dtable->fieldList['name']['link'] = array('module' => 'account', 'method' => 'view', 'params' => 'id={id}');
-$config->account->dtable->fieldList['name']['data-toggle'] = 'modal';
-
-$config->account->dtable->fieldList['provider']['title'] = $lang->account->provider;
-$config->account->dtable->fieldList['provider']['name'] = 'provider';
-$config->account->dtable->fieldList['provider']['type'] = 'text';
-$config->account->dtable->fieldList['provider']['sortType'] = true;
-$config->account->dtable->fieldList['provider']['width'] = 80;
-$config->account->dtable->fieldList['provider']['map'] = $lang->serverroom->providerList;
-
-$config->account->dtable->fieldList['account']['title'] = $lang->account->account;
-$config->account->dtable->fieldList['account']['name'] = 'account';
-$config->account->dtable->fieldList['account']['type'] = 'text';
-$config->account->dtable->fieldList['account']['sortType'] = true;
-
-$config->account->dtable->fieldList['email']['title'] = $lang->account->email;
-$config->account->dtable->fieldList['email']['name'] = 'email';
-$config->account->dtable->fieldList['email']['type'] = 'text';
-$config->account->dtable->fieldList['email']['sortType'] = true;
-
-$config->account->dtable->fieldList['mobile']['title'] = $lang->account->mobile;
-$config->account->dtable->fieldList['mobile']['name'] = 'mobile';
-$config->account->dtable->fieldList['mobile']['type'] = 'text';
-$config->account->dtable->fieldList['mobile']['sortType'] = true;
-
-$config->account->dtable->fieldList['createdBy']['title'] = $lang->account->createdBy;
-$config->account->dtable->fieldList['createdBy']['name'] = 'createdBy';
-$config->account->dtable->fieldList['createdBy']['type'] = 'user';
-$config->account->dtable->fieldList['createdBy']['width'] = '100px';
-$config->account->dtable->fieldList['createdBy']['sortType'] = true;
-
-$config->account->actionList = array();
-$config->account->actionList['edit']['icon'] = 'edit';
-$config->account->actionList['edit']['text'] = $lang->edit;
-$config->account->actionList['edit']['hint'] = $lang->edit;
-$config->account->actionList['edit']['data-toggle'] = 'modal';
-$config->account->actionList['edit']['data-size'] = 'sm';
-$config->account->actionList['edit']['showText'] = true;
-$config->account->actionList['edit']['url'] = array('module' => 'account', 'method' => 'edit', 'params' => 'id={id}');
-
-$config->account->actionList['delete']['icon'] = 'trash';
-$config->account->actionList['delete']['text'] = $lang->delete;
-$config->account->actionList['delete']['hint'] = $lang->delete;
-$config->account->actionList['delete']['ajaxSubmit'] = true;
-$config->account->actionList['delete']['url'] = array('module' => 'account', 'method' => 'delete', 'params' => 'id={id}');
-
-$config->account->dtable->fieldList['actions']['name'] = 'actions';
-$config->account->dtable->fieldList['actions']['title'] = $lang->actions;
-$config->account->dtable->fieldList['actions']['type'] = 'actions';
-$config->account->dtable->fieldList['actions']['sortType'] = false;
-$config->account->dtable->fieldList['actions']['fixed'] = 'right';
-$config->account->dtable->fieldList['actions']['menu'] = array('edit', 'delete');
-$config->account->dtable->fieldList['actions']['list'] = $config->account->actionList;
diff --git a/module/account/config/form.php b/module/account/config/form.php
deleted file mode 100644
index fc30a45e93..0000000000
--- a/module/account/config/form.php
+++ /dev/null
@@ -1,27 +0,0 @@
-account->form = new stdclass();
-$config->account->form->create = array();
-$config->account->form->create['name'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
-$config->account->form->create['provider'] = array('type' => 'string', 'required' => true, 'default' => '');
-$config->account->form->create['adminURI'] = array('type' => 'string', 'required' => false, 'default' => '', 'filter' => 'trim');
-$config->account->form->create['account'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
-$config->account->form->create['password'] = array('type' => 'string', 'required' => false, 'default' => '', 'filter' => 'trim');
-$config->account->form->create['email'] = array('type' => 'string', 'required' => false, 'default' => '', 'filter' => 'trim');
-$config->account->form->create['mobile'] = array('type' => 'string', 'required' => false, 'default' => '', 'filter' => 'trim');
-$config->account->form->create['type'] = array('type' => 'string', 'required' => false, 'default' => '', 'filter' => 'trim');
-$config->account->form->create['status'] = array('type' => 'string', 'required' => false, 'default' => '', 'filter' => 'trim');
-$config->account->form->create['extra'] = array('type' => 'string', 'required' => false, 'default' => '', 'filter' => 'trim');
-$config->account->form->create['createdDate'] = array('type' => 'string', 'required' => false, 'default' => helper::now());
-
-$config->account->form->edit = array();
-$config->account->form->edit['name'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
-$config->account->form->edit['provider'] = array('type' => 'string', 'required' => true, 'default' => '');
-$config->account->form->edit['adminURI'] = array('type' => 'string', 'required' => false, 'default' => '', 'filter' => 'trim');
-$config->account->form->edit['account'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
-$config->account->form->edit['password'] = array('type' => 'string', 'required' => false, 'default' => '', 'filter' => 'trim');
-$config->account->form->edit['email'] = array('type' => 'string', 'required' => false, 'default' => '', 'filter' => 'trim');
-$config->account->form->edit['mobile'] = array('type' => 'string', 'required' => false, 'default' => '', 'filter' => 'trim');
-$config->account->form->edit['type'] = array('type' => 'string', 'required' => false, 'default' => '', 'filter' => 'trim');
-$config->account->form->edit['status'] = array('type' => 'string', 'required' => false, 'default' => '', 'filter' => 'trim');
-$config->account->form->edit['extra'] = array('type' => 'string', 'required' => false, 'default' => '', 'filter' => 'trim');
-$config->account->form->edit['editedDate'] = array('type' => 'string', 'required' => false, 'default' => helper::now());
diff --git a/module/account/config/search.php b/module/account/config/search.php
deleted file mode 100644
index 2e4df204de..0000000000
--- a/module/account/config/search.php
+++ /dev/null
@@ -1,25 +0,0 @@
-account->search['module'] = 'account';
-$config->account->search['fields']['name'] = $lang->account->name;
-$config->account->search['fields']['id'] = 'ID';
-$config->account->search['fields']['provider'] = $lang->account->provider;
-$config->account->search['fields']['account'] = $lang->account->account;
-$config->account->search['fields']['email'] = $lang->account->email;
-$config->account->search['fields']['mobile'] = $lang->account->mobile;
-$config->account->search['fields']['createdBy'] = $lang->account->createdBy;
-$config->account->search['fields']['createdDate'] = $lang->account->createdDate;
-$config->account->search['fields']['editedBy'] = $lang->account->editedBy;
-$config->account->search['fields']['editedDate'] = $lang->account->editedDate;
-
-$config->account->search['params']['name'] = array('operator' => 'include', 'control' => 'input', 'values' => '');
-$config->account->search['params']['id'] = array('operator' => 'include', 'control' => 'input', 'values' => '');
-$config->account->search['params']['provider'] = array('operator' => 'include', 'control' => 'input', 'values' => '');
-$config->account->search['params']['account'] = array('operator' => 'include', 'control' => 'input', 'values' => '');
-$config->account->search['params']['email'] = array('operator' => 'include', 'control' => 'input', 'values' => '');
-$config->account->search['params']['mobile'] = array('operator' => 'include', 'control' => 'input', 'values' => '');
-$config->account->search['params']['createdBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users');
-$config->account->search['params']['createdDate'] = array('operator' => '=', 'control' => 'date', 'values' => '');
-$config->account->search['params']['editedBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users');
-$config->account->search['params']['editedDate'] = array('operator' => '=', 'control' => 'date', 'values' => '');
diff --git a/module/account/control.php b/module/account/control.php
deleted file mode 100644
index 6f26839022..0000000000
--- a/module/account/control.php
+++ /dev/null
@@ -1,157 +0,0 @@
-
- * @package account
- * @link https://www.zentao.net
- */
-class account extends control
-{
- /**
- * 查看账号列表。
- * Browse accouts page.
- *
- * @param string $browseType
- * @param string $param
- * @param string $orderBy
- * @param int $recTotal
- * @param int $recPerPage
- * @param int $pageID
- * @access public
- * @return void
- */
- public function browse(string $browseType = 'all', string $param = '', string $orderBy = 'id_desc', int $recTotal = 0, int $recPerPage = 20, int $pageID = 1)
- {
- $this->app->loadLang('serverroom');
- $browseType = strtolower($browseType);
-
- $this->session->set('accountList', $this->app->getURI(true));
- $this->app->loadClass('pager', true);
- $pager = pager::init($recTotal, $recPerPage, $pageID);
-
- $accountList = $this->account->getList($browseType, $param, $orderBy, $pager);
-
- /* Build the search form. */
- $this->config->account->search['actionURL'] = $this->createLink('account', 'browse', "browseType=bySearch&queryID=myQueryID");
- $this->config->account->search['queryID'] = $param;
- $this->config->account->search['onMenuBar'] = 'no';
- $this->loadModel('search')->setSearchParams($this->config->account->search);
-
- $this->view->title = $this->lang->account->common;
- $this->view->accountList = $accountList;
- $this->view->users = $this->loadModel('user')->getPairs('noletter,noempty,noclosed');
- $this->view->pager = $pager;
- $this->view->param = $param;
- $this->view->orderBy = $orderBy;
- $this->view->browseType = $browseType;
-
- $this->display();
- }
-
- /**
- * 创建一个账号。
- * Create account.
- *
- * @access public
- * @return void
- */
- public function create()
- {
- if($_POST)
- {
- $account = form::data($this->config->account->form->create)
- ->add('createdBy', $this->app->user->account)
- ->get();
- if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
-
- $this->account->create($account);
- if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
-
- if(isInModal()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'load' => true));
- return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => helper::createLink('account', 'browse')));
- }
-
- $this->app->loadLang('serverroom');
- $this->view->title = $this->lang->account->create;
- $this->display();
- }
-
- /**
- * 编辑一个账号。
- * Edit one account.
- *
- * @param int $accountID
- * @access public
- * @return void
- */
- public function edit(int $accountID)
- {
- if($_POST)
- {
- $account = form::data($this->config->account->form->edit)
- ->add('editedBy', $this->app->user->account)
- ->get();
- if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
-
- $this->account->update($accountID, $account);
- if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
-
- return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse'), 'closeModal' => true));
- }
-
- $this->view->title = $this->lang->account->edit;
- $this->view->account = $this->account->fetchByID($accountID);
- $this->view->rooms = $this->loadModel('serverroom')->getPairs();
-
- $this->display();
- }
-
- /**
- * 查看账号信息。
- * View account.
- *
- * @param int $accountID
- * @access public
- * @return void
- */
- public function view(int $accountID)
- {
- $this->view->title = $this->lang->account->view;
- $this->view->account = $this->account->fetchByID($accountID);
- $this->view->rooms = $this->loadModel('serverroom')->getPairs();
- $this->view->actions = $this->loadModel('action')->getList('account', $accountID);
- $this->view->users = $this->loadModel('user')->getPairs('noletter');
- $this->view->optionMenu = $this->loadModel('tree')->getOptionMenu(0, 'account');
- $this->display();
- }
-
- /**
- * 删除一个账号。
- * Delete Account.
- *
- * @param int $accountID
- * @access public
- * @return void
- */
- public function delete(int $accountID)
- {
- $this->account->delete(TABLE_ACCOUNT, $accountID);
-
- if(dao::isError())
- {
- $response['result'] = 'fail';
- $response['message'] = dao::getError(true);
- }
- else
- {
- $response['result'] = 'success';
- $response['message'] = '';
- $response['load'] = true;
- }
- return $this->send($response);
- }
-}
diff --git a/module/account/css/common.ui.css b/module/account/css/common.ui.css
deleted file mode 100644
index 47fa6a4e50..0000000000
--- a/module/account/css/common.ui.css
+++ /dev/null
@@ -1 +0,0 @@
-#accountCreateForm .form-row {max-width: 500px;}
diff --git a/module/account/lang/de.php b/module/account/lang/de.php
deleted file mode 100644
index 74379aadd4..0000000000
--- a/module/account/lang/de.php
+++ /dev/null
@@ -1,33 +0,0 @@
-account = new stdclass;
-$lang->account->common = 'account';
-$lang->account->all = 'All account';
-$lang->account->browse = 'browse account';
-$lang->account->create = 'create account';
-$lang->account->edit = 'edit account';
-$lang->account->view = 'view account';
-
-$lang->account->editAction = 'edit account';
-$lang->account->deleteAction = 'delete account';
-
-$lang->account->id = 'id';
-$lang->account->provider = 'provider';
-$lang->account->type = 'type';
-$lang->account->name = 'name';
-$lang->account->adminURI = 'admin url';
-$lang->account->account = 'account';
-$lang->account->email = 'email';
-$lang->account->mobile = 'mobile';
-$lang->account->password = 'pasword';
-$lang->account->createdBy = 'created by';
-$lang->account->createdDate = 'created date';
-$lang->account->editedBy = 'edited by';
-$lang->account->editedDate = 'edited date';
-$lang->account->confirmDelete = 'confirm delete';
-$lang->account->byQuery = 'search';
-
-$lang->account->empty = 'No Account';
-
-$lang->account->typeList = array();
-
-$lang->account->featureBar['browse']['all'] = $lang->account->all;
diff --git a/module/account/lang/en.php b/module/account/lang/en.php
deleted file mode 100644
index 74379aadd4..0000000000
--- a/module/account/lang/en.php
+++ /dev/null
@@ -1,33 +0,0 @@
-account = new stdclass;
-$lang->account->common = 'account';
-$lang->account->all = 'All account';
-$lang->account->browse = 'browse account';
-$lang->account->create = 'create account';
-$lang->account->edit = 'edit account';
-$lang->account->view = 'view account';
-
-$lang->account->editAction = 'edit account';
-$lang->account->deleteAction = 'delete account';
-
-$lang->account->id = 'id';
-$lang->account->provider = 'provider';
-$lang->account->type = 'type';
-$lang->account->name = 'name';
-$lang->account->adminURI = 'admin url';
-$lang->account->account = 'account';
-$lang->account->email = 'email';
-$lang->account->mobile = 'mobile';
-$lang->account->password = 'pasword';
-$lang->account->createdBy = 'created by';
-$lang->account->createdDate = 'created date';
-$lang->account->editedBy = 'edited by';
-$lang->account->editedDate = 'edited date';
-$lang->account->confirmDelete = 'confirm delete';
-$lang->account->byQuery = 'search';
-
-$lang->account->empty = 'No Account';
-
-$lang->account->typeList = array();
-
-$lang->account->featureBar['browse']['all'] = $lang->account->all;
diff --git a/module/account/lang/fr.php b/module/account/lang/fr.php
deleted file mode 100644
index 74379aadd4..0000000000
--- a/module/account/lang/fr.php
+++ /dev/null
@@ -1,33 +0,0 @@
-account = new stdclass;
-$lang->account->common = 'account';
-$lang->account->all = 'All account';
-$lang->account->browse = 'browse account';
-$lang->account->create = 'create account';
-$lang->account->edit = 'edit account';
-$lang->account->view = 'view account';
-
-$lang->account->editAction = 'edit account';
-$lang->account->deleteAction = 'delete account';
-
-$lang->account->id = 'id';
-$lang->account->provider = 'provider';
-$lang->account->type = 'type';
-$lang->account->name = 'name';
-$lang->account->adminURI = 'admin url';
-$lang->account->account = 'account';
-$lang->account->email = 'email';
-$lang->account->mobile = 'mobile';
-$lang->account->password = 'pasword';
-$lang->account->createdBy = 'created by';
-$lang->account->createdDate = 'created date';
-$lang->account->editedBy = 'edited by';
-$lang->account->editedDate = 'edited date';
-$lang->account->confirmDelete = 'confirm delete';
-$lang->account->byQuery = 'search';
-
-$lang->account->empty = 'No Account';
-
-$lang->account->typeList = array();
-
-$lang->account->featureBar['browse']['all'] = $lang->account->all;
diff --git a/module/account/lang/zh-cn.php b/module/account/lang/zh-cn.php
deleted file mode 100644
index 7a62474833..0000000000
--- a/module/account/lang/zh-cn.php
+++ /dev/null
@@ -1,33 +0,0 @@
-account = new stdclass;
-$lang->account->common = '运维账号';
-$lang->account->all = '全部账号';
-$lang->account->browse = '账号列表';
-$lang->account->create = '添加账号';
-$lang->account->edit = '编辑账号';
-$lang->account->view = '账号详情';
-
-$lang->account->editAction = '编辑账号';
-$lang->account->deleteAction = '删除账号';
-
-$lang->account->id = 'id';
-$lang->account->provider = '服务商';
-$lang->account->type = '类型';
-$lang->account->name = '名称';
-$lang->account->adminURI = '登录地址';
-$lang->account->account = '账户';
-$lang->account->email = '邮件';
-$lang->account->mobile = '手机';
-$lang->account->password = '密码';
-$lang->account->createdBy = '由谁添加';
-$lang->account->createdDate = '添加时间';
-$lang->account->editedBy = '由谁编辑';
-$lang->account->editedDate = '编辑时间';
-$lang->account->confirmDelete = '确定删除';
-$lang->account->byQuery = '搜索';
-
-$lang->account->empty = '暂时没有账号';
-
-$lang->account->typeList = array();
-
-$lang->account->featureBar['browse']['all'] = $lang->account->all;
diff --git a/module/account/model.php b/module/account/model.php
deleted file mode 100644
index 6e1aa4590f..0000000000
--- a/module/account/model.php
+++ /dev/null
@@ -1,121 +0,0 @@
-
- * @package account
- * @link https://www.zentao.net
- */
-class accountModel extends model
-{
- /**
- * 获取账号列表。
- * Get account list.
- *
- * @param string $browseType
- * @param int $param
- * @param string $orderBy
- * @param object $pager
- * @access public
- * @return array
- */
- public function getList(string $browseType = 'all', string $param = '', string $orderBy = 'id_desc', object|null $pager = null): array
- {
- $query = '';
- if($browseType == 'bysearch')
- {
- /* Concatenate the conditions for the query. */
- if(!$this->session->accountQuery) $this->session->set('accountQuery', ' 1 = 1');
- if($param)
- {
- $query = $this->loadModel('search')->getQuery((int)$param);
- if($query)
- {
- $this->session->set('accountQuery', $query->sql);
- $this->session->set('accountForm', $query->form);
- }
- }
- $query = $this->session->accountQuery;
- }
-
- $accounts = $this->dao->select('*')->from(TABLE_ACCOUNT)
- ->where('deleted')->eq('0')
- ->beginIF($query)->andWhere($query)->fi()
- ->orderBy($orderBy)
- ->page($pager)
- ->fetchAll();
-
- $users = $this->loadModel('user')->getPairs('noclosed|nodeleted|noletter');
- foreach($accounts as $account) $account->createdBy = zget($users, $account->createdBy, '');
-
- return $accounts;
- }
-
- /**
- * 获取账号的id:name键值对。
- * Get account pairs.
- *
- * @access public
- * @return array
- */
- public function getPairs(): array
- {
- return $this->dao->select('id,name')->from(TABLE_ACCOUNT)->where('deleted')->eq('0')->fetchPairs();
- }
-
- /**
- * 创建一个账号。
- * Create account.
- *
- * @param object $account
- * @access public
- * @return int|false
- */
- public function create(object $account): int|false
- {
- $this->dao->insert(TABLE_ACCOUNT)->data($account)
- ->batchCheck($this->config->account->create->requiredFields, 'notempty')
- ->checkIf($account->email, 'email', 'email')
- ->checkIf($account->mobile, 'mobile', 'mobile')
- ->exec();
- if(dao::isError()) return false;
-
- $accountID = $this->dao->lastInsertID();
- $this->loadModel('action')->create('account', $accountID, 'created');
- return $accountID;
- }
-
- /**
- * 更新一个账号。
- * Update one account.
- *
- * @param int $id
- * @param object $account
- * @access public
- * @return bool
- */
- public function update(int $id, object $account): bool
- {
- $oldAccount = $this->fetchByID($id);
- $this->dao->update(TABLE_ACCOUNT)->data($account)->autoCheck()
- ->batchCheck($this->config->account->edit->requiredFields, 'notempty')
- ->checkIf($account->email, 'email', 'email')
- ->checkIf($account->mobile, 'mobile', 'mobile')
- ->where('id')->eq($id)
- ->exec();
-
- if(!dao::isError())
- {
- $changes = common::createChanges($oldAccount, $account);
- if(empty($changes)) return true;
-
- $actionID = $this->loadModel('action')->create('account', $id, 'Edited');
- $this->action->logHistory($actionID, $changes);
- return true;
- }
- return false;
- }
-}
diff --git a/module/account/test/model/create.php b/module/account/test/model/create.php
deleted file mode 100644
index f8dae98beb..0000000000
--- a/module/account/test/model/create.php
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/env php
-create();
-cid=0
-
-- 检查插入数据库的数据。
- - 属性name @测试账号
- - 属性provider @aliyun
- - 属性account @admin
- - 属性password @admin
-- 必填项检查。第name条的0属性 @『名称』不能为空。
-- 邮箱格式检查。第email条的0属性 @『邮件』应当为合法的EMAIL。
-- 手机格式检查。第mobile条的0属性 @『手机』应当为合法的手机号码。
-
-*/
-include dirname(__FILE__, 5) . '/test/lib/init.php';
-
-su('admin');
-
-zenData('account')->gen(0);
-
-$accountData = new stdclass();
-$accountData->name = '测试账号';
-$accountData->provider = 'aliyun';
-$accountData->adminURI = '';
-$accountData->account = 'admin';
-$accountData->password = 'admin';
-$accountData->email = 'admin@163.com';
-$accountData->mobile = '';
-$accountData->type = '';
-$accountData->status = '';
-$accountData->extra = '';
-$accountData->createdBy = 'admin';
-$accountData->createdDate = date('Y-m-d H:i:s');
-
-global $tester;
-$accountModel = $tester->loadModel('account');
-$accountID = $accountModel->create($accountData);
-$account = $accountModel->dao->select('*')->from(TABLE_ACCOUNT)->where('id')->eq($accountID)->fetch();
-r($account) && p('name,provider,account,password') && e('测试账号,aliyun,admin,admin'); // 检查插入数据库的数据。
-
-$accountData->name = '';
-$accountModel->create($accountData);
-r(dao::getError()) && p('name:0') && e('『名称』不能为空。'); //必填项检查。
-
-$accountData->name = '测试账号';
-$accountData->email = 'test';
-$accountModel->create($accountData);
-r(dao::getError()) && p('email:0') && e('『邮件』应当为合法的EMAIL。'); // 邮箱格式检查。
-
-$accountData->email = 'admin@163.com';
-$accountData->mobile = 'test';
-$accountModel->create($accountData);
-r(dao::getError()) && p('mobile:0') && e('『手机』应当为合法的手机号码。'); // 手机格式检查。
diff --git a/module/account/test/model/getlist.php b/module/account/test/model/getlist.php
deleted file mode 100644
index 4261b0649e..0000000000
--- a/module/account/test/model/getlist.php
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env php
-getList();
-timeout=0
-cid=0
-
-- 获取所有数据。 @10
-- 根据搜索条件搜索。 @10
-- 根据第一个保存条件搜索。 @0
-- 分页，每页5条，获取第一页。 @5
-
-*/
-include dirname(__FILE__, 5) . '/test/lib/init.php';
-
-su('admin');
-
-zenData('user')->gen(5);
-zenData('account')->gen(10);
-zenData('userquery')->gen(1);
-
-global $tester;
-$accountModel = $tester->loadModel('account');
-$accountModel->app->moduleName = 'account';
-$accountModel->app->methodName = 'browse';
-r(count($accountModel->getList())) && p() && e('10'); // 获取所有数据。
-r(count($accountModel->getList('bysearch', '0'))) && p() && e('10'); // 根据搜索条件搜索。
-r(count($accountModel->getList('bysearch', '1'))) && p() && e('0'); // 根据第一个保存条件搜索。
-
-$accountModel->app->loadClass('pager', $static = true);
-$pager = new pager(0, 5, 1);
-r(count($accountModel->getList('all', '', 'id_desc', $pager))) && p() && e('5'); // 分页，每页5条，获取第一页。
\ No newline at end of file
diff --git a/module/account/test/model/getpairs.php b/module/account/test/model/getpairs.php
deleted file mode 100644
index b1953a3400..0000000000
--- a/module/account/test/model/getpairs.php
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env php
-getPairs();
-timeout=0
-cid=0
-
-- 检查获取数据数。 @10
-- 检查部分数据。
- - 属性1 @运维账号1
- - 属性2 @运维账号2
-
-*/
-include dirname(__FILE__, 5) . '/test/lib/init.php';
-
-su('admin');
-
-zenData('account')->gen(10);
-
-global $tester;
-$accountModel = $tester->loadModel('account');
-$pairs = $accountModel->getPairs();
-r(count($pairs)) && p() && e('10'); // 检查获取数据数。
-r($pairs) && p('1,2') && e('运维账号1,运维账号2'); // 检查部分数据。
\ No newline at end of file
diff --git a/module/account/test/model/update.php b/module/account/test/model/update.php
deleted file mode 100644
index dfa8274d54..0000000000
--- a/module/account/test/model/update.php
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/usr/bin/env php
-update();
-timeout=0
-cid=0
-
-- 检查插入数据库的数据。
- - 属性id @1
- - 属性name @运维账号1
- - 属性provider @qingyun
-- 检查插入数据库的数据。
- - 属性id @1
- - 属性name @测试账号
- - 属性provider @aliyun
- - 属性account @admin
- - 属性password @admin
-- 必填项检查。第name条的0属性 @『名称』不能为空。
-- 邮箱格式检查。第email条的0属性 @『邮件』应当为合法的EMAIL。
-- 手机格式检查。第mobile条的0属性 @『手机』应当为合法的手机号码。
-
-*/
-include dirname(__FILE__, 5) . '/test/lib/init.php';
-
-su('admin');
-
-zenData('account')->gen(5);
-
-$account = new stdclass();
-$account->name = '测试账号';
-$account->provider = 'aliyun';
-$account->adminURI = '';
-$account->account = 'admin';
-$account->password = 'admin';
-$account->email = 'admin@163.com';
-$account->mobile = '';
-$account->type = '';
-$account->status = '';
-$account->extra = '';
-$account->createdBy = 'admin';
-$account->createdDate = date('Y-m-d H:i:s');
-
-global $tester;
-$accountID = 1;
-$accountModel = $tester->loadModel('account');
-$oldAccount = $accountModel->dao->select('*')->from(TABLE_ACCOUNT)->where('id')->eq($accountID)->fetch();
-$accountModel->update($accountID, $account);
-$newAccount = $accountModel->dao->select('*')->from(TABLE_ACCOUNT)->where('id')->eq($accountID)->fetch();
-
-r($oldAccount) && p('id,name,provider') && e('1,运维账号1,qingyun'); // 检查插入数据库的数据。
-r($newAccount) && p('id,name,provider,account,password') && e('1,测试账号,aliyun,admin,admin'); // 检查插入数据库的数据。
-
-$account->name = '';
-$accountModel->create($account);
-r(dao::getError()) && p('name:0') && e('『名称』不能为空。'); //必填项检查。
-
-$account->name = '测试账号';
-$account->email = 'test';
-$accountModel->create($account);
-r(dao::getError()) && p('email:0') && e('『邮件』应当为合法的EMAIL。'); // 邮箱格式检查。
-
-$account->email = 'admin@163.com';
-$account->mobile = 'test';
-$accountModel->create($account);
-r(dao::getError()) && p('mobile:0') && e('『手机』应当为合法的手机号码。'); // 手机格式检查。
\ No newline at end of file
diff --git a/module/account/ui/browse.html.php b/module/account/ui/browse.html.php
deleted file mode 100644
index 9639a37b53..0000000000
--- a/module/account/ui/browse.html.php
+++ /dev/null
@@ -1,44 +0,0 @@
-
- * @package account
- * @link https://www.zentao.net
- */
-
-namespace zin;
-
-$queryMenuLink = createLink('account', 'browse', "browseType=bySearch¶m={queryID}");
-featureBar
-(
- set::queryMenuLinkCallback(fn($key) => str_replace('{queryID}', (string)$key, $queryMenuLink)),
- li(searchToggle())
-);
-
-/* zin: Define the toolbar on main menu. */
-$canCreate = hasPriv('account', 'create');
-$createLink = $this->createLink('account', 'create');
-$createItem = array('text' => $lang->account->create, 'url' => $createLink, 'class' => 'primary', 'icon' => 'plus', 'data-toggle' => 'modal', 'data-size' => 'sm');
-
-$tableData = initTableData($accountList, $config->account->dtable->fieldList, $this->account);
-
-toolbar
-(
- $canCreate ? item(set($createItem)) : null,
-);
-
-dtable
-(
- set::userMap($users),
- set::cols(array_values($config->account->dtable->fieldList)),
- set::data($tableData),
- set::sortLink(createLink('account', 'browse', "browseType=$browseType¶m=$param&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")),
- set::orderBy($orderBy),
- set::footPager(usePager())
-);
-
-render();
diff --git a/module/account/ui/create.html.php b/module/account/ui/create.html.php
deleted file mode 100644
index 3559d9c43c..0000000000
--- a/module/account/ui/create.html.php
+++ /dev/null
@@ -1,78 +0,0 @@
-
- * @package account
- * @link https://www.zentao.net
- */
-
-namespace zin;
-
-formPanel
-(
- set::id('accountCreateForm'),
- set::title($lang->account->create),
- formRow
- (
- formGroup
- (
- set::name('name'),
- set::label($lang->account->name)
- )
- ),
- formRow
- (
- formGroup
- (
- set::width('1/2'),
- set::label($lang->account->provider),
- set::control('picker'),
- set::name('provider'),
- set::items($lang->serverroom->providerList)
- )
- ),
- formRow
- (
- formGroup
- (
- set::name('adminURI'),
- set::label($lang->account->adminURI)
- )
- ),
- formRow
- (
- formGroup
- (
- set::name('account'),
- set::label($lang->account->account)
- )
- ),
- formRow
- (
- formGroup
- (
- set::name('password'),
- set::label($lang->account->password)
- )
- ),
- formRow
- (
- formGroup
- (
- set::name('email'),
- set::label($lang->account->email)
- )
- ),
- formRow
- (
- formGroup
- (
- set::name('mobile'),
- set::label($lang->account->mobile)
- )
- )
-);
diff --git a/module/account/ui/edit.html.php b/module/account/ui/edit.html.php
deleted file mode 100644
index ea7c269ed2..0000000000
--- a/module/account/ui/edit.html.php
+++ /dev/null
@@ -1,85 +0,0 @@
-
- * @package account
- * @link https://www.zentao.net
- */
-
-namespace zin;
-
-formPanel
-(
- set::id('accountCreateForm'),
- set::title($lang->account->edit),
- formRow
- (
- formGroup
- (
- set::name('name'),
- set::label($lang->account->name),
- set::value($account->name)
- )
- ),
- formRow
- (
- formGroup
- (
- set::width('1/2'),
- set::label($lang->account->provider),
- set::control('picker'),
- set::name('provider'),
- set::items($lang->serverroom->providerList),
- set::value($account->provider)
- )
- ),
- formRow
- (
- formGroup
- (
- set::name('adminURI'),
- set::label($lang->account->adminURI),
- set::value($account->adminURI)
- )
- ),
- formRow
- (
- formGroup
- (
- set::name('account'),
- set::label($lang->account->account),
- set::value($account->account)
- )
- ),
- formRow
- (
- formGroup
- (
- set::name('password'),
- set::label($lang->account->password),
- set::value($account->password)
- )
- ),
- formRow
- (
- formGroup
- (
- set::name('email'),
- set::label($lang->account->email),
- set::value($account->email)
- )
- ),
- formRow
- (
- formGroup
- (
- set::name('mobile'),
- set::label($lang->account->mobile),
- set::value($account->mobile)
- )
- )
-);
diff --git a/module/account/ui/view.html.php b/module/account/ui/view.html.php
deleted file mode 100644
index fe77b8af19..0000000000
--- a/module/account/ui/view.html.php
+++ /dev/null
@@ -1,89 +0,0 @@
-
- * @package account
- * @link https://www.zentao.net
- */
-namespace zin;
-global $lang;
-
-if(isAjaxRequest('modal'))
-{
- $config->account->actionList['edit']['data-load'] = 'modal';
- unset($config->account->actionList['edit']['data-toggle']);
-}
-$actions = $this->loadModel('common')->buildOperateMenu($account);
-
-detailHeader
-(
- isAjaxRequest('modal') ? to::prefix() : '',
- to::title(
- entityLabel(
- set(array('entityID' => $account->id, 'level' => 1, 'text' => $account->name))
- )
- )
-);
-
-detailBody
-(
- sectionList
- (
- section
- (
- tableData
- (
- item
- (
- set::name($lang->account->name),
- $account->name
- ),
- item
- (
- set::name($lang->account->provider),
- \zget($lang->serverroom->providerList, $account->provider)
- ),
- item
- (
- set::name($lang->account->adminURI),
- $account->adminURI
- ),
- item
- (
- set::name($lang->account->account),
- $account->account
- ),
- item
- (
- set::name($lang->account->password),
- $account->password
- ),
- item
- (
- set::name($lang->account->email),
- $account->email
- ),
- item
- (
- set::name($lang->account->mobile),
- $account->mobile
- )
- )
- )
- ),
- history
- (
- set::commentUrl(createLink('action', 'comment', array('objectType' => 'account', 'objectID' => $account->id)))
- ),
- floatToolbar
- (
- set::object($account),
- isAjaxRequest('modal') ? null : to::prefix(backBtn(set::icon('back'), set::className('ghost text-white'), $lang->goback)),
- set::suffix($actions['suffixActions'])
- )
-);
-
-render();
diff --git a/module/account/view/browse.html.php b/module/account/view/browse.html.php
deleted file mode 100644
index 52ce8834ea..0000000000
--- a/module/account/view/browse.html.php
+++ /dev/null
@@ -1,98 +0,0 @@
-
- * @package account
- * @version $Id$
- * @link https://www.zentao.net
- */
-?>
-getModuleRoot() . 'common/view/header.html.php';?>
-account->confirmDelete)?>
-
-
-
-
' data-module='account'>
-
-
-
-
-
-
- account->empty;?>
- " . $lang->account->create, '', "class='btn btn-info' data-toggle='modal'");?>
-
-
-
-
-
-
- recTotal}&recPerPage={$pager->recPerPage}";?>
- | idAB);?> |
- account->name);?> |
- account->provider);?> |
- account->account);?> |
- account->email);?> |
- account->mobile);?> |
- account->createdBy);?> |
- actions?> |
-
-
-
-
-
- | id);?> |
- inlink('view', "id=$account->id", 'html'), $account->name);?> |
- serverroom->providerList, $account->provider);?> |
- account;?> |
- email;?> |
- mobile;?> |
- createdBy;?> |
-
- id}&from=self", " ", '', "data-toggle='modal' class='btn' title='{$lang->edit}'", '', true);
- if(common::hasPriv('account', 'delete', $account))
- {
- $deleteURL = $this->createLink('account', 'delete', "id=$account->id");
- echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"accountList\",confirmDelete)", '', '', "class='btn' title='{$lang->delete}'");
- }
- ?>
- |
-
-
-
-
-
-
-
-
-
-getModuleRoot() . 'common/view/footer.html.php';?>
diff --git a/module/account/view/create.html.php b/module/account/view/create.html.php
deleted file mode 100644
index 84b207c7df..0000000000
--- a/module/account/view/create.html.php
+++ /dev/null
@@ -1,52 +0,0 @@
-
- * @package account
- * @version $Id$
- * @link https://www.zentao.net
- */
-?>
-
-
-
diff --git a/module/account/view/edit.html.php b/module/account/view/edit.html.php
deleted file mode 100644
index bc9d9c6999..0000000000
--- a/module/account/view/edit.html.php
+++ /dev/null
@@ -1,66 +0,0 @@
-
- * @package account
- * @version $Id$
- * @link https://www.zentao.net
- */
-?>
-
-
-
-
-
diff --git a/module/account/view/view.html.php b/module/account/view/view.html.php
deleted file mode 100644
index dda23f6de9..0000000000
--- a/module/account/view/view.html.php
+++ /dev/null
@@ -1,65 +0,0 @@
-
- * @package account
- * @version $Id$
- * @link https://www.zentao.net
- */
-?>
-getModuleRoot() . 'common/view/header.html.php';?>
-account->confirmDelete)?>
-
-
-
account->view;?>
-
-
-
- getModuleRoot() . 'common/view/action.html.php'?>
-
-
-
-
- id", " " . $lang->edit, '', "class='btn iframe'", '', true, $account);
- if(!isonlybody()) common::printLink('account', 'browse', "", " " . $lang->goback, '', "class='btn'");
- ?>
-
-
-
-getModuleRoot() . 'common/view/footer.html.php';?>
diff --git a/module/action/lang/de.php b/module/action/lang/de.php
index 2238917d6b..3dc28a5fad 100644
--- a/module/action/lang/de.php
+++ b/module/action/lang/de.php
@@ -353,6 +353,14 @@ $lang->action->desc->updatecustom = '$date, updated by
$actoraction->desc->delist = '$date, delist by $actor.' . "\n";
$lang->action->desc->publish = '$date, publish by $actor.' . "\n";
+$lang->action->desc->manualbackup = '$date, Manually backed up by $actor.' . "\n";
+$lang->action->desc->autobackup = '$date, Automatic backup by $actor.' . "\n";
+$lang->action->desc->openautobackup = '$date, Enable automatic backup by $actor.' . "\n";
+$lang->action->desc->closeautobackup = '$date, Disable automatic backup by $actor.' . "\n";
+$lang->action->desc->autodeletebackups = '$date, Automatically clean up backups by $actor.' . "\n";
+$lang->action->desc->savebackupsettings = '$date, Save backup settings backups by $actor.' . "\n";
+$lang->action->desc->deleteexpiredbackup = '$date, Clean up expired backups by $actor.' . "\n";
+
/* Used to display dynamic information. */
$lang->action->label = new stdclass();
$lang->action->label->install = 'install ';
@@ -553,8 +561,13 @@ $lang->action->label->deletebackup = 'Deleted system backup';
$lang->action->label->restorebackup = 'Restored system backup';
$lang->action->label->upgradesystem = 'Executed system upgrade';
$lang->action->label->system = '';
-$lang->action->label->synced = 'synced';
-$lang->action->label->imported = 'imported';
+$lang->action->label->manualbackup = 'Manual backup';
+$lang->action->label->autobackup = 'Automatic backup';
+$lang->action->label->openautobackup = 'Enable automatic backup';
+$lang->action->label->closeautobackup = 'Disable automatic backup';
+$lang->action->label->autodeletebackups = 'Automatically clean up backups';
+$lang->action->label->savebackupsettings = 'Save backup settings';
+$lang->action->label->deleteexpiredbackup = 'Clean up expired backups';
/* Dynamic information is grouped by object. */
$lang->action->dynamicAction = new stdclass;
diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index 4c1c9dcbc5..97c12d471d 100755
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -353,6 +353,14 @@ $lang->action->desc->updatecustom = '$date, updated by $actor
$lang->action->desc->delist = '$date, delist by $actor.' . "\n";
$lang->action->desc->publish = '$date, publish by $actor.' . "\n";
+$lang->action->desc->manualbackup = '$date, Manually backed up by $actor.' . "\n";
+$lang->action->desc->autobackup = '$date, Automatic backup by $actor.' . "\n";
+$lang->action->desc->openautobackup = '$date, Enable automatic backup by $actor.' . "\n";
+$lang->action->desc->closeautobackup = '$date, Disable automatic backup by $actor.' . "\n";
+$lang->action->desc->autodeletebackups = '$date, Automatically clean up backups by $actor.' . "\n";
+$lang->action->desc->savebackupsettings = '$date, Save backup settings backups by $actor.' . "\n";
+$lang->action->desc->deleteexpiredbackup = '$date, Clean up expired backups by $actor.' . "\n";
+
/* Used to display dynamic information. */
$lang->action->label = new stdclass();
$lang->action->label->install = 'install ';
@@ -553,8 +561,13 @@ $lang->action->label->deletebackup = 'Deleted system backup';
$lang->action->label->restorebackup = 'Restored system backup';
$lang->action->label->upgradesystem = 'Executed system upgrade';
$lang->action->label->system = '';
-$lang->action->label->synced = 'synced';
-$lang->action->label->imported = 'imported';
+$lang->action->label->manualbackup = 'Manual backup';
+$lang->action->label->autobackup = 'Automatic backup';
+$lang->action->label->openautobackup = 'Enable automatic backup';
+$lang->action->label->closeautobackup = 'Disable automatic backup';
+$lang->action->label->autodeletebackups = 'Automatically clean up backups';
+$lang->action->label->savebackupsettings = 'Save backup settings';
+$lang->action->label->deleteexpiredbackup = 'Clean up expired backups';
/* Dynamic information is grouped by object. */
$lang->action->dynamicAction = new stdclass;
diff --git a/module/action/lang/fr.php b/module/action/lang/fr.php
index 20faa2656f..bb1421e968 100644
--- a/module/action/lang/fr.php
+++ b/module/action/lang/fr.php
@@ -353,6 +353,14 @@ $lang->action->desc->updatecustom = '$date, updated by $actor
$lang->action->desc->delist = '$date, delist by $actor.' . "\n";
$lang->action->desc->publish = '$date, publish by $actor.' . "\n";
+$lang->action->desc->manualbackup = '$date, Manually backed up by $actor.' . "\n";
+$lang->action->desc->autobackup = '$date, Automatic backup by $actor.' . "\n";
+$lang->action->desc->openautobackup = '$date, Enable automatic backup by $actor.' . "\n";
+$lang->action->desc->closeautobackup = '$date, Disable automatic backup by $actor.' . "\n";
+$lang->action->desc->autodeletebackups = '$date, Automatically clean up backups by $actor.' . "\n";
+$lang->action->desc->savebackupsettings = '$date, Save backup settings backups by $actor.' . "\n";
+$lang->action->desc->deleteexpiredbackup = '$date, Clean up expired backups by $actor.' . "\n";
+
/* Used to display dynamic information. */
$lang->action->label = new stdclass();
$lang->action->label->install = 'install ';
@@ -553,8 +561,13 @@ $lang->action->label->deletebackup = 'Deleted system backup';
$lang->action->label->restorebackup = 'Restored system backup';
$lang->action->label->upgradesystem = 'Executed system upgrade';
$lang->action->label->system = '';
-$lang->action->label->synced = 'synced';
-$lang->action->label->imported = 'imported';
+$lang->action->label->manualbackup = 'Manual backup';
+$lang->action->label->autobackup = 'Automatic backup';
+$lang->action->label->openautobackup = 'Enable automatic backup';
+$lang->action->label->closeautobackup = 'Disable automatic backup';
+$lang->action->label->autodeletebackups = 'Automatically clean up backups';
+$lang->action->label->savebackupsettings = 'Save backup settings';
+$lang->action->label->deleteexpiredbackup = 'Clean up expired backups';
/* Dynamic information is grouped by object. */
$lang->action->dynamicAction = new stdclass();
diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index 3586b66d85..2454d5a0e0 100755
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -353,6 +353,14 @@ $lang->action->desc->updatecustom = '$date, 由 $actoraction->desc->delist = '$date, 由 $actor 下架。' . "\n";
$lang->action->desc->publish = '$date, 由 $actor 发布。' . "\n";
+$lang->action->desc->manualbackup = '$date, 由 $actor 手动备份。' . "\n";
+$lang->action->desc->autobackup = '$date, 由 $actor 自动备份。' . "\n";
+$lang->action->desc->openautobackup = '$date, 由 $actor 开启自动备份。' . "\n";
+$lang->action->desc->closeautobackup = '$date, 由 $actor 关闭自动备份。' . "\n";
+$lang->action->desc->autodeletebackups = '$date, 由 $actor 自动清理备份。' . "\n";
+$lang->action->desc->savebackupsettings = '$date, 由 $actor 保存备份设置。' . "\n";
+$lang->action->desc->deleteexpiredbackup = '$date, 由 $actor 清理过期备份。' . "\n";
+
/* 用来显示动态信息。*/
$lang->action->label = new stdclass();
$lang->action->label->install = '安装了';
@@ -553,8 +561,15 @@ $lang->action->label->deletebackup = '删除了系统备份';
$lang->action->label->restorebackup = '还原了系统备份';
$lang->action->label->upgradesystem = '执行了系统升级';
$lang->action->label->system = '';
-$lang->action->label->synced = '同步了';
-$lang->action->label->imported = '导入了';
+$lang->action->label->manualbackup = '手动备份了';
+$lang->action->label->autobackup = '自动备份了';
+$lang->action->label->openautobackup = '开启自动备份';
+$lang->action->label->closeautobackup = '关闭自动备份';
+$lang->action->label->autodeletebackups = '自动清理备份';
+$lang->action->label->savebackupsettings = '保存备份设置';
+$lang->action->label->deleteexpiredbackup = '清理过期备份';
+
+
/* 动态信息按照对象分组 */
$lang->action->dynamicAction = new stdclass();
diff --git a/module/action/model.php b/module/action/model.php
index 0236f18a56..5b9ef02c89 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -271,7 +271,7 @@ class actionModel extends model
{
$history->oldValue = '';
$oldValues = explode(',', $history->old);
- foreach($oldValues as $key => $value) $history->oldValue .= zget($fieldList, $value) . ',';
+ foreach($oldValues as $value) $history->oldValue .= zget($fieldList, $value) . ',';
$history->oldValue = trim($history->oldValue, ',');
}
@@ -279,7 +279,7 @@ class actionModel extends model
{
$history->newValue = '';
$newValues = explode(',', $history->new);
- foreach($newValues as $key => $value) $history->newValue .= zget($fieldList, $value) . ',';
+ foreach($newValues as $value) $history->newValue .= zget($fieldList, $value) . ',';
$history->newValue = trim($history->newValue, ',');
}
}
@@ -294,7 +294,7 @@ class actionModel extends model
{
$history->oldValue = '';
$oldValues = explode(',', $history->old);
- foreach($oldValues as $key => $value) $history->oldValue .= zget($users, $value) . ',';
+ foreach($oldValues as $value) $history->oldValue .= zget($users, $value) . ',';
$history->oldValue = trim($history->oldValue, ',');
}
@@ -302,7 +302,7 @@ class actionModel extends model
{
$history->newValue = '';
$newValues = explode(',', $history->new);
- foreach($newValues as $key => $value) $history->newValue .= zget($users, $value) . ',';
+ foreach($newValues as $value) $history->newValue .= zget($users, $value) . ',';
$history->newValue = trim($history->newValue, ',');
}
}
@@ -777,13 +777,11 @@ class actionModel extends model
}
}
- if($action->objectType == 'story' && $action->action == 'closed')
+ $isCloseStory = $action->objectType == 'story' && $action->action == 'closed';
+ if($isCloseStory && !empty($extra) && strpos($extra, '|') !== false)
{
- if(!empty($extra) && strpos($extra, '|') !== false)
- {
- list($extra, $status) = explode('|', $extra);
- if(!empty($desc['extra'][$extra])) $actionDesc = str_replace('$extra', $desc['extra'][$extra], $desc['main']);
- }
+ list($extra) = explode('|', $extra);
+ if(!empty($desc['extra'][$extra])) $actionDesc = str_replace('$extra', $desc['extra'][$extra], $desc['main']);
}
if($action->objectType == 'module' && strpos(',created,moved,', $action->action) !== false)
@@ -957,18 +955,22 @@ class actionModel extends model
* 通过视野获取用户可访问的动态类型。
* Get the action types that the user can access through the vision.
*
+ * @param string $module
* @access public
* @return string
*/
- public function getActionCondition(): string
+ public function getActionCondition($module = ''): string
{
if($this->app->user->admin) return '';
$actionCondition = '';
- if(!empty($this->app->user->rights['acls']['actions']))
+ if(isset($this->app->user->rights['acls']['actions']))
{
+ if(empty($this->app->user->rights['acls']['actions'])) return '1 != 1';
+ if($module && !isset($this->app->user->rights['acls']['actions'][$module])) return '1 != 1';
foreach($this->app->user->rights['acls']['actions'] as $moduleName => $actions)
{
+ if($module && $module != $moduleName) continue;
if(isset($this->lang->mainNav->{$moduleName}) && !empty($this->app->user->rights['acls']['views']) && !isset($this->app->user->rights['acls']['views'][$moduleName])) continue;
$actionCondition .= "(`objectType` = '{$moduleName}' AND `action` " . helper::dbIN(array_keys($actions)) . ") OR ";
}
@@ -1454,8 +1456,9 @@ class actionModel extends model
$action = $this->getById($actionID);
if(!$action || $action->action != 'deleted') return false;
- list($table, $orderby, $field) = $this->actionTao->getUndeleteParamsByObjectType($action->objectType);
- $object = $this->actionTao->getObjectBaseInfo($table, array('id' => $action->objectID), $field, $orderby);
+ list($table, $orderby, $field, $queryKey) = $this->actionTao->getUndeleteParamsByObjectType($action->objectType);
+ if(empty($queryKey)) $queryKey = 'id';
+ $object = $this->actionTao->getObjectBaseInfo($table, array($queryKey => $action->objectID), $field, $orderby);
if(empty($object)) return false;
$result = $this->checkActionCanUndelete($action, $object);
@@ -1665,7 +1668,10 @@ class actionModel extends model
$actionType = strtolower($actionType);
if(!isset($this->config->search->fields->{$objectType})) return false;
- if((strpos($this->config->search->buildAction, ",{$actionType},") === false && $actionType != 'commented' && empty($_POST['comment'])) || ($actionType == 'commented' && empty($_POST['actioncomment']))) return false;
+
+ $isCommentedAction = $actionType == 'commented';
+ if(strpos($this->config->search->buildAction, ",{$actionType},") === false && !$isCommentedAction && empty($_POST['comment'])) return false;
+ if($isCommentedAction && empty($_POST['actioncomment'])) return false;
if($actionType == 'deleted' || $actionType == 'erased') return $this->search->deleteIndex($objectType, $objectID);
$field = $this->config->search->fields->{$objectType};
diff --git a/module/action/tao.php b/module/action/tao.php
index 2b5824fa40..3a02ab9a83 100644
--- a/module/action/tao.php
+++ b/module/action/tao.php
@@ -369,7 +369,12 @@ class actionTao extends actionModel
$name = $execution->name;
if($execution->type == 'kanban') $method = 'kanban';
- if($name) $action->extra = !common::hasPriv('execution', $method) || ($method == 'kanban' && isonlybody()) || $this->config->vision == 'or' ? $name : html::a(helper::createLink('execution', $method, "executionID={$action->execution}"), $name, '', "data-app='execution'");
+ if($name)
+ {
+ $isModalKanban = $method == 'kanban' && isonlybody();
+ $canShowLink = common::hasPriv('execution', $method) && !$isModalKanban && $this->config->vision != 'or';
+ $action->extra = $canShowLink ? html::a(helper::createLink('execution', $method, "executionID={$action->execution}"), $name, '', "data-app='execution'") : $name;
+ }
}
elseif($type == 'project')
{
@@ -790,7 +795,7 @@ class actionTao extends actionModel
{
$action->objectName = $this->dao->select('name')->from(TABLE_AI_ASSISTANT)->where('id')->eq($action->objectID)->fetch('name');
}
- if(empty($action->objectName) && (substr($objectType, 0, 6) == 'gitlab' || substr($objectType, 0, 5) == 'gitea' || substr($objectType, 0, 4) == 'gogs' || substr($objectType, 0, 2) == 'mr')) $action->objectName = $action->extra;
+ if (empty($action->objectName) && preg_match('/^(gitlab|gitea|gogs|mr)/', $objectType)) $action->objectName = $action->extra;
}
/**
@@ -983,9 +988,10 @@ class actionTao extends actionModel
*/
public function getUndeleteParamsByObjectType(string $objectType): array
{
- $table = $this->config->objectTables[$objectType];
- $orderby = '';
- $field = '*';
+ $table = $this->config->objectTables[$objectType];
+ $orderby = '';
+ $field = '*';
+ $queryKey = 'id';
switch($objectType)
{
case 'product':
@@ -996,11 +1002,12 @@ class actionTao extends actionModel
$field = 'id, acl, name, hasProduct';
break;
case 'doc':
- $table = TABLE_DOCCONTENT;
- $orderby = 'version desc';
+ $table = TABLE_DOCCONTENT;
+ $orderby = 'version desc';
+ $queryKey = 'doc';
default:
break;
- }
- return array($table, $orderby, $field);
+ }
+ return array($table, $orderby, $field, $queryKey);
}
}
diff --git a/module/admin/config.php b/module/admin/config.php
index 2924cd5a05..cd78c03143 100755
--- a/module/admin/config.php
+++ b/module/admin/config.php
@@ -63,7 +63,7 @@ $config->admin->plugins[194]->viewLink = 'https://www.zentao.net/extension-viewE
$config->admin->apiRoot = 'https://www.zentao.net';
$config->admin->cdnRoot = 'https://cdn.easycorp.cn/web';
-$config->admin->classURL = 'https://www.zentao.net/publicclass.html';
+$config->admin->classURL = 'https://www.zentao.net/zentao.html';
$config->admin->dynamicURL = 'https://www.zentao.net/dynamic.html';
$config->admin->downloadURL = 'https://www.zentao.net/download.html';
$config->admin->extensionURL = 'https://www.zentao.net/extension-browse.html';
@@ -73,7 +73,7 @@ $config->admin->extAPIURL = $config->admin->apiSite . 'extension-apiGetExte
$config->admin->patchAPIURL = $config->admin->apiSite . 'extension-apiGetExtensions-bymodule-MTIxOA==-0-100-1.json';
$config->admin->downloadAPIURL = $config->admin->apiSite . 'download.json';
$config->admin->dynamicAPIURL = $config->admin->apiSite . 'dynamic-activities-%s.json';
-$config->admin->videoAPIURL = $config->admin->apiSite . 'publicclass.json';
+$config->admin->videoAPIURL = $config->admin->apiSite . 'zentao.json';
$config->admin->liteMenuList = array('system', 'company', 'feature', 'message', 'extension', 'dev', 'ai');
$config->admin->helpURL['system'] = 'https://www.zentao.net/book/zentaopms/538.html';
diff --git a/module/admin/lang/menu.php b/module/admin/lang/menu.php
index ae246d0a5b..c14dd3a720 100644
--- a/module/admin/lang/menu.php
+++ b/module/admin/lang/menu.php
@@ -155,7 +155,7 @@ $lang->admin->menuList->feature['menuOrder']['15'] = 'execution';
$lang->admin->menuList->feature['menuOrder']['20'] = 'qa';
$lang->admin->menuList->feature['menuOrder']['25'] = 'kanban';
$lang->admin->menuList->feature['menuOrder']['30'] = 'doc';
-$lang->admin->menuList->feature['menuOrder']['50'] = 'user';
+$lang->admin->menuList->feature['menuOrder']['39'] = 'user';
$lang->admin->menuList->feature['dividerMenu'] = ',user,';
@@ -188,30 +188,24 @@ if(helper::hasFeature('devops'))
$lang->admin->menuList->platform['order'] = 55;
//$lang->admin->menuList->platform['subMenu']['environment'] = array('link' => "{$lang->devops->environment}|gitlab|browse|", 'subModule' => 'gitlab,jenkins,sonarqube,gitea,gogs', 'alias' => 'create,edit,import');
- $lang->admin->menuList->platform['subMenu']['resource'] = array('link' => "{$lang->devops->resource}|host|browse|", 'subModule' => 'host,account,serverroom,ops,tree,domain,service');
+ $lang->admin->menuList->platform['subMenu']['resource'] = array('link' => "{$lang->devops->resource}|serverroom|browse|", 'subModule' => 'serverroom,ops,tree,domain,service');
$lang->admin->menuList->platform['subMenu']['setrules'] = array('link' => "{$lang->devops->rules}|repo|setrules|");
- $lang->admin->menuList->platform['tabMenu']['resource']['host'] = array('link' => "{$lang->devops->host}|host|browse|", 'alias' => 'create,edit,browse,view,treemap,changestatus,group', 'subModule' => 'tree');
$lang->admin->menuList->platform['tabMenu']['resource']['serverroom'] = array('link' => "{$lang->devops->serverroom}|serverroom|browse|", 'alias' => 'create,edit,view,browse');
$lang->admin->menuList->platform['tabMenu']['resource']['service'] = array('link' => "{$lang->devops->service}|service|browse|", 'alias' => 'create,edit,view,browse,manage');
- $lang->admin->menuList->platform['tabMenu']['resource']['account'] = array('link' => "{$lang->devops->account}|account|browse|", 'alias' => 'create,edit,view,browse');
$lang->admin->menuList->platform['tabMenu']['resource']['domain'] = array('link' => "{$lang->devops->domain}|domain|browse|", 'alias' => 'create,edit,view,browse');
$lang->admin->menuList->platform['tabMenu']['resource']['provider'] = array('link' => "{$lang->devops->provider}|ops|provider|", 'alias' => 'provider');
$lang->admin->menuList->platform['tabMenu']['resource']['city'] = array('link' => "{$lang->devops->city}|ops|city|", 'alias' => 'city');
- $lang->admin->menuList->platform['tabMenu']['resource']['cpuBrand'] = array('link' => "{$lang->devops->cpuBrand}|ops|cpuBrand|", 'alias' => 'cpubrand');
$lang->admin->menuList->platform['tabMenu']['resource']['os'] = array('link' => "{$lang->devops->os}|ops|os|", 'alias' => 'os');
$lang->admin->menuList->platform['tabMenu']['resource']['stage'] = array('link' => "{$lang->devops->stage}|ops|stage|", 'alias' => 'stage');
- $lang->admin->menuList->platform['tabMenu']['menuOrder']['resource']['10'] = 'host';
$lang->admin->menuList->platform['tabMenu']['menuOrder']['resource']['15'] = 'serverroom';
$lang->admin->menuList->platform['tabMenu']['menuOrder']['resource']['20'] = 'service';
- $lang->admin->menuList->platform['tabMenu']['menuOrder']['resource']['25'] = 'account';
- $lang->admin->menuList->platform['tabMenu']['menuOrder']['resource']['30'] = 'domain';
- $lang->admin->menuList->platform['tabMenu']['menuOrder']['resource']['35'] = 'provider';
- $lang->admin->menuList->platform['tabMenu']['menuOrder']['resource']['40'] = 'city';
- $lang->admin->menuList->platform['tabMenu']['menuOrder']['resource']['45'] = 'cpuBrand';
- $lang->admin->menuList->platform['tabMenu']['menuOrder']['resource']['50'] = 'os';
- $lang->admin->menuList->platform['tabMenu']['menuOrder']['resource']['55'] = 'stage';
+ $lang->admin->menuList->platform['tabMenu']['menuOrder']['resource']['25'] = 'domain';
+ $lang->admin->menuList->platform['tabMenu']['menuOrder']['resource']['30'] = 'provider';
+ $lang->admin->menuList->platform['tabMenu']['menuOrder']['resource']['35'] = 'city';
+ $lang->admin->menuList->platform['tabMenu']['menuOrder']['resource']['40'] = 'os';
+ $lang->admin->menuList->platform['tabMenu']['menuOrder']['resource']['45'] = 'stage';
if($config->edition === 'open')
{
@@ -219,8 +213,8 @@ if(helper::hasFeature('devops'))
unset($lang->admin->menuList->platform['tabMenu']['resource']['service']);
unset($lang->admin->menuList->platform['tabMenu']['resource']['stage']);
unset($lang->admin->menuList->platform['tabMenu']['menuOrder']['resource']['20']);
- unset($lang->admin->menuList->platform['tabMenu']['menuOrder']['resource']['30']);
- unset($lang->admin->menuList->platform['tabMenu']['menuOrder']['resource']['55']);
+ unset($lang->admin->menuList->platform['tabMenu']['menuOrder']['resource']['25']);
+ unset($lang->admin->menuList->platform['tabMenu']['menuOrder']['resource']['45']);
}
//$lang->admin->menuList->platform['menuOrder']['15'] = 'environment';
diff --git a/module/api/config/dtable.php b/module/api/config/dtable.php
index b2f31cd45f..6f4af00e52 100644
--- a/module/api/config/dtable.php
+++ b/module/api/config/dtable.php
@@ -39,9 +39,11 @@ $config->api->dtable->struct->fieldList['actions']['fixed'] = 'right';
$config->api->dtable->struct->fieldList['actions']['name'] = 'actions';
$config->api->dtable->struct->fieldList['actions']['menu'] = array('editStruct', 'deleteStruct');
-$config->api->dtable->struct->fieldList['actions']['list']['editStruct']['icon'] = 'edit';
-$config->api->dtable->struct->fieldList['actions']['list']['editStruct']['hint'] = $lang->api->editStruct;
-$config->api->dtable->struct->fieldList['actions']['list']['editStruct']['url'] = helper::createLink('api', 'editStruct', 'lib={lib}&id={id}');
+$config->api->dtable->struct->fieldList['actions']['list']['editStruct']['icon'] = 'edit';
+$config->api->dtable->struct->fieldList['actions']['list']['editStruct']['hint'] = $lang->api->editStruct;
+$config->api->dtable->struct->fieldList['actions']['list']['editStruct']['data-toggle'] = 'modal';
+$config->api->dtable->struct->fieldList['actions']['list']['editStruct']['data-size'] = 'lg';
+$config->api->dtable->struct->fieldList['actions']['list']['editStruct']['url'] = helper::createLink('api', 'editStruct', 'lib={lib}&id={id}');
$config->api->dtable->struct->fieldList['actions']['list']['deleteStruct']['icon'] = 'trash';
$config->api->dtable->struct->fieldList['actions']['list']['deleteStruct']['hint'] = $lang->api->deleteStruct;
diff --git a/module/api/control.php b/module/api/control.php
index 02dd2a3fa9..61f247b94f 100755
--- a/module/api/control.php
+++ b/module/api/control.php
@@ -36,26 +36,25 @@ class api extends control
* @param int $version
* @param int $release
* @param string $browseType
- * @param int $param
+ * @param string $params
* @access public
* @return void
*/
- public function index(int $libID = 0, int $moduleID = 0, int $apiID = 0, int $version = 0, int $release = 0, string $browseType = '', int $param = 0)
+ public function index(int $libID = 0, int $moduleID = 0, int $apiID = 0, int $version = 0, int $release = 0, string $browseType = 'nolink', string $params = '', string $orderBy = 'order_asc', int $recTotal = 0, int $recPerPage = 20, int $pageID = 1, string $mode = '', string $search = '')
{
- /* Get an api doc. */
- if($apiID > 0)
- {
- /* 有apiID的直接打印详情页面。 */
- echo $this->fetch('api', 'view', "libID=$libID&apiID=$apiID&moduleID=$moduleID&version=$version&release=$release");
- return;
- }
-
/* 设置空间类型。 */
$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);
+ if(empty($mode))
+ {
+ if(!$libID) $mode = 'home';
+ elseif($apiID) $mode = 'view';
+ else $mode = 'list';
+ }
+
$this->setMenu($libID);
$objectType = $this->objectType;
$objectID = $this->objectID;
@@ -75,33 +74,268 @@ class api extends control
$objectType = !empty($lib->product) ? 'product' : (!empty($lib->project) ? 'project' : 'nolink');
$objectID = !empty($lib->product) ? $lib->product : (!empty($lib->project) ? $lib->project : 0);
- /* Build the search form. */
- if($lib)
- {
- $browseType = $release ? 'byrelease' : $browseType;
- $param = $release ? $release : $param;
- $queryID = $browseType == 'bySearch' ? (int)$param : 0;
- $actionURL = $this->createLink('api', 'index', "libID=$libID&moduleID=0&apiID=0&version=0&release=0&browseType=bySearch¶m=myQueryID");
- $this->api->buildSearchForm($lib, $queryID, $actionURL, $libs);
- }
-
- $this->view->title = $this->lang->api->pageTitle;
- $this->view->lib = $lib;
$this->view->libID = $libID;
- $this->view->libs = $libs;
- $this->view->release = $release;
+ $this->view->moduleID = $moduleID;
+ $this->view->apiID = (int)$apiID;
+ $this->view->release = (int)$release;
+ $this->view->apiVersion = (int)$version;
+ $this->view->mode = $mode;
+ $this->view->filterType = $browseType;
+ $this->view->search = $search;
+ $this->view->recTotal = $recTotal;
+ $this->view->recPerPage = $recPerPage;
+ $this->view->pageID = $pageID;
+ $this->view->orderBy = $orderBy;
$this->view->objectType = $objectType;
$this->view->objectID = $objectID;
- $this->view->moduleID = $moduleID;
- $this->view->version = $version;
- $this->view->apiList = $browseType == 'bySearch' ? $this->api->getApiListBySearch($libID, $queryID, '', array_keys($libs)) : $this->api->getListByModuleID($libID, $moduleID, $release);
- $this->view->libTree = $this->doc->getLibTree($libID, $libs, 'api', $moduleID, $objectID, $browseType, (int)$param);
- $this->view->objectDropdown = isset($libs[$libID]) ? $this->apiZen->generateLibsDropMenu($libs[$libID], $release) : '';
- $this->view->spaceType = 'api';
- $this->view->linkParams = '%s';
+ $this->view->params = $params;
+ $this->view->users = $this->loadModel('user')->getPairs('noclosed,noletter');
+ $this->view->title = $this->lang->api->pageTitle;
$this->display();
}
+ /**
+ * 获取接口空间首页页面。
+ * Get the api home page.
+ *
+ * @param string $type
+ * @param string $params
+ * @param int $recPerPage
+ * @param int $pageID
+ * @access public
+ * @return void
+ */
+ public function ajaxGetHome(string $type = 'nolink', string $params = 'notempty_unclosed', int $recPerPage = 20, int $pageID = 1)
+ {
+ if(!in_array($type, array('product', 'project', 'nolink'))) $type = 'nolink';
+
+ $libs = $this->doc->getApiLibs(0, $type);
+ $flags = explode('_', $params);
+ $unclosed = in_array('unclosed', $flags);
+ $notempty = in_array('notempty', $flags);
+ $apis = $this->api->getApiListBySearch(0, 0);
+ $recTotal = 0;
+ $recPerPage = $recPerPage ? max(1, $recPerPage) : 20;
+
+ $productsCount = array();
+ $projectsCount = array();
+ foreach($apis as $api)
+ {
+ if(!isset($libs[$api->lib])) continue;
+ $lib = $libs[$api->lib];
+ if(isset($lib->apiCount)) $lib->apiCount++;
+ else $lib->apiCount = 1;
+
+ if($lib->product)
+ {
+ if(isset($productsCount[$lib->product])) $productsCount[$lib->product]++;
+ else $productsCount[$lib->product] = 1;
+ }
+ if($lib->project)
+ {
+ if(isset($projectsCount[$lib->project])) $projectsCount[$lib->project]++;
+ else $projectsCount[$lib->project] = 1;
+ }
+ }
+
+ if($type === 'product' || $type === 'project')
+ {
+ $this->loadModel('program');
+ $this->app->loadLang('project');
+ $this->app->loadLang('product');
+ $programPairs = $this->loadModel('program')->getTopPairs($unclosed ? 'noclosed' : '');
+ $programs[] = (object)array('id' => 0, 'name' => $this->lang->$type->emptyProgram);
+ foreach($programPairs as $id => $name)
+ {
+ $program = new stdclass();
+ $program->id = $id;
+ $program->name = $name;
+ $programs[$id] = $program;
+ }
+ if($type == 'product')
+ {
+ $products = $this->loadModel('product')->getList(0, $unclosed ? 'noclosed' : 'all', 0, 0);
+ foreach($products as $product)
+ {
+ if(!isset($programs[$product->program])) continue;
+ $program = $programs[$product->program];
+ $program->products[] = $product;
+ $product->apiCount = isset($productsCount[$product->id]) ? $productsCount[$product->id] : 0;
+ $program->apiCount = isset($program->apiCount) ? $program->apiCount + $product->apiCount : $product->apiCount;
+ }
+ }
+ else
+ {
+ $projects = $this->program->getProjectList(0, $unclosed ? 'unclosed' : 'all', 0, 'order_asc,id_desc');
+ foreach($projects as $project)
+ {
+ $topParent = $project->parent ? explode(',', trim($project->path, ','))[0] : 0;
+ if(!isset($programs[$topParent])) continue;
+ $program = $programs[$topParent];
+ $program->projects[] = $project;
+ $project->apiCount = isset($projectsCount[$project->id]) ? $projectsCount[$project->id] : 0;
+ $program->apiCount = isset($program->apiCount) ? $program->apiCount + $project->apiCount : $project->apiCount;
+ }
+ }
+
+ if($notempty) $programs = array_filter($programs, function($program) {return isset($program->apiCount) && $program->apiCount > 0;});
+
+ $recTotal = count($programs);
+ $pageID = max(1, min($pageID, ceil($recTotal / $recPerPage)));
+ $programs = array_slice($programs, ($pageID - 1) * $recPerPage, $recPerPage);
+ }
+ else
+ {
+ if($notempty) $libs = array_filter($libs, function($lib) {return isset($lib->apiCount) && $lib->apiCount > 0;});
+ $recTotal = count($libs);
+ $pageID = max(1, min($pageID, ceil($recTotal / $recPerPage)));
+ $libs = array_slice($libs, ($pageID - 1) * $recPerPage, $recPerPage);
+ }
+
+ $this->app->loadClass('pager', true);
+
+ $this->view->programs = isset($programs) ? $programs : array();
+ $this->view->unclosed = $unclosed;
+ $this->view->notempty = $notempty;
+ $this->view->libs = $libs;
+ $this->view->type = $type;
+ $this->view->pager = new pager($recTotal, $recPerPage, $pageID);
+ $this->display();
+ }
+
+ /**
+ * 获取接口界面数据。
+ * Get the api UI data.
+ *
+ * @param string $spaceID
+ * @param string $picks
+ * @access public
+ * @return void
+ */
+ public function ajaxGetData(string $spaceID = 'nolink', string $picks = '')
+ {
+ $noPicks = empty($picks);
+ $picks = $noPicks ? '' : ",$picks,";
+ $pickLib = $noPicks || strpos($picks, ',lib,') !== false;
+ $pickModule = $noPicks || strpos($picks, ',module,') !== false;
+ $data = array('spaceID' => $spaceID);
+ $isNolink = $spaceID == 'nolink';
+
+ list($objectType, $objectID) = $isNolink ? array('', 0) : explode('.', $spaceID . '.');
+ if($noPicks || strpos($picks, ',space,') !== false)
+ {
+ $spaces['nolink'] = array('id' => 'nolink', 'name' => $this->lang->api->noLinked, 'type' => 'api');
+ list($normalObjects, $closedObjects) = $this->api->getOrderedObjects();
+ foreach($normalObjects as $type => $list)
+ {
+ foreach($list as $id => $name) $spaces["$type.{$id}"] = array('id' => "$type.{$id}", 'name' => $name, 'type' => 'api', 'objectType' => $type);
+ }
+ foreach($closedObjects as $type => $list)
+ {
+ foreach($list as $id => $name) $spaces["$type.{$id}"] = array('id' => "$type.{$id}", 'name' => $name, 'type' => 'api', 'objectType' => $type, 'closed' => true);
+ }
+ if(!$isNolink && !isset($spaces[$spaceID]))
+ {
+ $object = $this->loadModel($objectType)->getByID((int)$objectID);
+ $spaces[$spaceID] = array('id' => $spaceID, 'name' => $object->name, 'type' => 'api');
+ }
+ $data['spaces'] = array_values($spaces);
+ }
+
+ if($pickLib || $pickModule)
+ {
+ $libs = $isNolink ? $this->doc->getApiLibs(0, 'nolink') : $this->doc->getApiLibs(0, $objectType, (int)$objectID);
+ $libIds = array_keys($libs);
+ if($pickLib)
+ {
+ $releases = $this->api->getReleaseByQuery($libIds);
+ $releaseMap = array();
+ foreach($releases as $release) $releaseMap[$release->lib][] = $release;
+ foreach($libs as $lib)
+ {
+ $lib->versions = isset($releaseMap[$lib->id]) ? $releaseMap[$lib->id] : array();
+ if(!empty($lib->product)) $lib->space = "product.{$lib->product}";
+ elseif(!empty($lib->project)) $lib->space = "project.{$lib->project}";
+ else $lib->space = 'nolink';
+ }
+ $data['libs'] = array_values($libs);
+ }
+ }
+ if($pickModule) $data['modules'] = array_values($this->doc->getModulesOfLibs($libIds, 'api'));
+
+ if($noPicks || strpos($picks, ',doc,') !== false)
+ {
+ $apis = $this->api->getApiListBySearch(0, 0, $objectType);
+ $unsetProps = array('commonParams', 'params', 'paramsExample', 'response', 'responseExample');
+ foreach($apis as $api)
+ {
+ foreach($unsetProps as $prop) unset($api->$prop);
+ $api->originTitle = $api->title;
+ $api->icon = "api is-$api->method";
+ $api->api = true;
+ $api->title = "$api->method $api->path $api->title";
+ }
+ $data['docs'] = array_values($apis);
+ }
+
+ echo json_encode($data);
+ }
+
+ /**
+ * 获取指定库的 API 列表。
+ * Get the API list of the specified library.
+ *
+ * @param int $libID
+ * @param int $releaseID
+ * @access public
+ * @return void
+ */
+ public function ajaxGetLibApiList(int $libID, int $releaseID = 0)
+ {
+ if($releaseID)
+ {
+ $release = $this->api->getRelease(0, 'byID', $releaseID);
+ $apis = $release ? $this->api->getApiListByRelease($release) : array();
+ }
+ else
+ {
+ $apis = $this->api->getApiListBySearch($libID, 0);
+ }
+
+ $unsetProps = array('commonParams', 'params', 'paramsExample', 'response', 'responseExample');
+ foreach($apis as $api)
+ {
+ foreach($unsetProps as $prop) unset($api->$prop);
+ $api->originTitle = $api->title;
+ $api->icon = "api is-$api->method";
+ $api->api = true;
+ $api->title = "$api->method $api->path $api->title";
+ }
+
+ echo json_encode($apis);
+ }
+
+ /**
+ * 获取接口数据。
+ *
+ * @param int $apiID
+ * @param int $version
+ * @param int $release
+ * @access public
+ * @return void
+ */
+ public function ajaxGetApi(int $apiID, int $version = 0, int $release = 0)
+ {
+ $api = $this->api->getByID($apiID, $version, $release);
+ if($api)
+ {
+ $api->originTitle = $api->title;
+ $api->icon = "api is-$api->method";
+ $api->title = "$api->method $api->path $api->title";
+ }
+ $this->send($api);
+ }
+
/**
* API详情页面。
* View api.
@@ -116,43 +350,17 @@ class api extends control
*/
public function view(int $libID, int $apiID, int $moduleID = 0, int $version = 0, int $release = 0)
{
- if(strpos($this->server->http_referer, 'space') === false && strpos($this->server->http_referer, 'api') === false)
+ if(helper::isAjaxRequest('fetch'))
{
- setCookie("docSpaceParam", '', $this->config->cookieLife, $this->config->webRoot, '', false, true);
+ $api = $this->api->getByID($apiID, $version, $release);
+
+ $this->view->api = $api;
+ $this->view->typeList = $this->api->getTypeList($api->lib);
+ $this->display();
+ return;
}
- /* 获取文档目录列表和当前选中的文档目录. */
- $libs = $this->doc->getApiLibs($libID, $this->objectType, (int)$this->objectID);
- $api = $this->api->getByID($apiID, $version, $release);
- $libID = $api->lib;
- $lib = zget($libs, $libID);
- $api->desc = htmlspecialchars_decode($api->desc);
-
- if($libID && !isset($libs[$libID])) return $this->send(array('result' => 'fail', 'load' => array('alert' => $this->lang->doc->accessDenied, 'locate' => $this->createLink('api', 'index'))));
-
- /* 生成一些必要的参数。 */
- $type = $lib->product ? 'product' : ($lib->project ? 'project' : 'nolink');
- $objectID = $lib->product ? $lib->product : $lib->project;
- $linkObject = zget($lib, $type, 0);
- $spaceType = 'api';
- $moduleID = $api->module;
- $linkParams = "%s";
- if($this->app->tab != 'doc' && $type != 'nolink') $linkParams = "objectID=$linkObject&$linkParams";
-
- /* 解析cookie并获取左侧目录树。 */
- $this->apiZen->parseDocSpaceParam($libs, $libID, $type, $objectID, $moduleID, $spaceType, $release);
-
- $this->view->title = $this->lang->api->pageTitle;
- $this->view->isRelease = $release > 0;
- $this->view->release = $release;
- $this->view->version = $version;
- $this->view->apiID = $apiID;
- $this->view->api = $api;
- $this->view->linkParams = $linkParams;
- $this->view->typeList = $this->api->getTypeList($api->lib);
- $this->view->users = $this->user->getPairs('noclosed,noletter');
- $this->view->actions = $apiID ? $this->action->getList('api', $apiID) : array();
- $this->display();
+ echo $this->fetch('api', 'index', "libID=$libID&moduleID=$moduleID&apiID=$apiID&version=$version&release=$release");
}
/**
@@ -194,7 +402,7 @@ class api extends control
$this->api->deleteRelease($id);
if(dao::isError()) return $this->sendError(dao::getError());
- return $this->sendSuccess(array('load' => true, 'closeModal' => true));
+ return $this->sendSuccess(array('load' => true, 'closeModal' => true, 'docApp' => array(array('executeCommand', 'loadLazyContent', array('.api-release-list')), array('load', null, null, null, array('noLoading' => true, 'picks' => 'lib')))));
}
/**
@@ -218,7 +426,7 @@ class api extends control
if(dao::isError()) return $this->sendError(dao::getError());
- return $this->sendSuccess(array('load' => true, 'closeModal' => true));
+ return $this->sendSuccess(array('load' => true, 'closeModal' => true, 'docApp' => array(array('executeCommand', 'loadLazyContent', array('.api-release-list')), array('load', null, null, null, array('noLoading' => true, 'picks' => 'lib')))));
}
$this->display();
@@ -286,7 +494,7 @@ class api extends control
$this->api->createStruct($formData);
if(dao::isError()) return $this->sendError(dao::getError());
- return $this->sendSuccess(array('locate' => helper::createLink('api', 'struct', "libID=$libID")));
+ return $this->sendSuccess(array('locate' => helper::createLink('api', 'struct', "libID=$libID"), 'docApp' => array('executeCommand', 'loadLazyContent', array('.api-struct-list'))));
}
$options = array();
@@ -324,7 +532,7 @@ class api extends control
$this->api->updateStruct($formData);
if(dao::isError()) return $this->sendError(dao::getError());
- return $this->sendSuccess(array('locate' => helper::createLink('api', 'struct', "libID={$struct->lib}")));
+ return $this->sendSuccess(array('locate' => helper::createLink('api', 'struct', "libID={$struct->lib}"), 'docApp' => array('executeCommand', 'loadLazyContent', array('.api-struct-list'))));
}
$options = array();
@@ -353,7 +561,7 @@ class api extends control
$this->api->delete(TABLE_APISTRUCT, $structID);
if(dao::isError()) return $this->sendError(dao::getError());
- return $this->sendSuccess(array('load' => inlink('struct', "libID=$libID")));
+ return $this->sendSuccess(array('load' => inlink('struct', "libID=$libID"), 'docApp' => array('executeCommand', 'loadLazyContent', array('.api-struct-list'))));
}
/**
@@ -370,24 +578,26 @@ class api extends control
if(!empty($_POST))
{
/* 组装formData。 */
- $fields = $this->config->api->form->createLib;
- if($this->post->libType == 'project') $fields['project']['required'] = true;
- if($this->post->libType == 'product') $fields['product']['required'] = true;
+ $fields = $this->config->api->form->createLib;
+ $libType = $this->post->libType;
+ if($libType == 'project') $fields['project']['required'] = true;
+ if($libType == 'product') $fields['product']['required'] = true;
$formData = form::data($fields)->add('addedBy', $this->app->user->account)->add('addedDate', helper::now())->get();
$formData->product = $formData->libType == 'product' && !empty($formData->product) ? $formData->product : 0;
$formData->project = $formData->libType == 'project' && !empty($formData->project) ? $formData->project : 0;
$formData->execution = $formData->libType == 'project' && !empty($formData->execution) ? $formData->execution : 0;
- $this->doc->createApiLib($formData);
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
- if(helper::isAjaxRequest('modal')) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'load' => true));
+ $libID = $this->doc->createApiLib($formData);
+ $objectID = $libType == 'project' ? $this->post->project : $this->post->product;
+ if(helper::isAjaxRequest('modal')) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'load' => true, 'docApp' => array("selectSpace", ($libType == 'product' || $libType == 'project') ? "$libType.$objectID" : 'nolink', $libID, true)));
/* Set locate object data. */
- setCookie("objectType", $this->post->libType, $this->config->cookieLife, $this->config->webRoot);
- setCookie("objectID", $this->post->libType == 'project' ? $this->post->project : $this->post->product, $this->config->cookieLife, $this->config->webRoot);
+ setCookie("objectType", $libType, $this->config->cookieLife, $this->config->webRoot);
+ setCookie("objectID", $objectID, $this->config->cookieLife, $this->config->webRoot);
- return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => $this->createLink('api', 'index', "libID=$libID"), 'closeModal' => true));
+ return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => $this->createLink('api', 'index', "libID=$libID"), 'closeModal' => true, 'docApp' => array("selectSpace", ($libType == 'product' || $libType == 'project') ? "$libType.$objectID" : 'nolink', $libID, true)));
}
/* 设置默认访问控制的语言项。 */
@@ -426,7 +636,7 @@ class api extends control
$this->doc->updateApiLib($id, $formData);
if(dao::isError()) return $this->sendError(dao::getError());
- return $this->sendSuccess(array('message' => $this->lang->saveSuccess, 'closeModal' => true, 'load' => true));
+ return $this->sendSuccess(array('message' => $this->lang->saveSuccess, 'closeModal' => true, 'load' => true, 'docApp' => array('load', null, null, null, array('noLoading' => true, 'picks' => 'lib'))));
}
$type = $lib->product ? 'product' : ($lib->project ? 'project' : 'nolink');
@@ -489,7 +699,7 @@ class api extends control
if(dao::isError()) return $this->sendError(dao::getError());
if(isInModal()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'load' => true));
- return $this->sendSuccess(array('locate' => helper::createLink('api', 'index', "libID={$formData->lib}&moduleID={$formData->module}&apiID={$apiID}")));
+ return $this->sendSuccess(array('locate' => helper::createLink('api', 'index', "libID={$formData->lib}&moduleID={$formData->module}&apiID={$apiID}"), 'docApp' => array('executeCommand', 'loadApi', array($apiID, 0, 0, true))));
}
$this->setMenu($libID, $space);
@@ -526,7 +736,7 @@ class api extends control
$this->api->update($formData);
if(dao::isError()) return $this->sendError(dao::getError());
- return $this->sendSuccess(array('locate' => helper::createLink('api', 'index', "libID=$api->lib&moduleID=0&apiID=$apiID")));
+ return $this->sendSuccess(array('locate' => helper::createLink('api', 'index', "libID=$api->lib&moduleID=0&apiID=$apiID"), 'docApp' => array(array('executeCommand', 'selectApi', array($apiID)), array('executeCommand', 'loadApi'))));
}
$this->setMenu($api->lib);
@@ -818,29 +1028,23 @@ class api extends control
*
* @param string $objectType
* @param int $objectID
- * @param string $module
- * @param string $method
+ * @param int $libID
* @access public
* @return void
*/
- public function ajaxGetDropMenu(string $objectType, int $objectID, string $module, string $method)
+ public function ajaxGetDropMenu(string $objectType, int $objectID, int $libID = 0)
{
- list($normalObjects, $closedObjects) = $this->api->getOrderedObjects();
+ $objects = $this->api->getGroupedObjects();
+ $programs = $this->loadModel('program')->getList('all', 'order_asc', 'top');
+ $programs = array_filter($programs, function($program) {return $program->parent == '0';});
- $titleList = array($this->lang->api->noLinked);
- if(!empty($normalObjects['product'])) $titleList += array_values($normalObjects['product']);
- if(!empty($normalObjects['project'])) $titleList += array_values($normalObjects['project']);
- if(!empty($closedObjects['product'])) $titleList += array_values($closedObjects['product']);
- if(!empty($closedObjects['project'])) $titleList += array_values($closedObjects['project']);
-
- $this->view->objectType = $objectType;
- $this->view->objectID = $objectID;
- $this->view->module = $module;
- $this->view->method = $method;
- $this->view->normalObjects = $normalObjects;
- $this->view->closedObjects = $closedObjects;
- $this->view->nolinkLibs = $this->doc->getApiLibs(0, 'nolink');
- $this->view->objectsPinYin = common::convert2Pinyin($titleList);
+ $this->view->objectType = $objectType;
+ $this->view->objectID = $objectID;
+ $this->view->libID = $libID;
+ $this->view->programs = $programs;
+ $this->view->products = $objects['product'];
+ $this->view->projects = $objects['project'];
+ $this->view->nolinkLibs = $objects['nolink'];
$this->display();
}
diff --git a/module/api/css/index.ui.css b/module/api/css/index.ui.css
index 4b8eee72d0..e69de29bb2 100644
--- a/module/api/css/index.ui.css
+++ b/module/api/css/index.ui.css
@@ -1,23 +0,0 @@
-.base-url > p {margin: 0;}
-.table-empty-tip > div {display: inline-block;}
-.detail .list-group-item .heading.GET { background-color: #e7f0f7; }
-.detail .list-group-item .heading.GET a { color: #0f6ab4; }
-.detail .list-group { height: calc(100vh - 215px); overflow-y: auto; }
-.detail .list-group-item .heading.OPTIONS { background-color: #e7f0f7; }
-.detail .list-group-item .heading.OPTIONS a { color: #0f6ab4; }
-.detail .list-group-item .heading.POST { background-color: #e7f6ec; }
-.detail .list-group-item .heading.POST a { color: #10a54a; }
-.detail .list-group-item .heading.PUT { background-color: #f9f2e9; }
-.detail .list-group-item .heading.PUT a { color: #c5862b; }
-.detail .list-group-item .heading.PATCH { background-color: #f9f2e9; }
-.detail .list-group-item .heading.PATCH a { color: #c5862b; }
-.detail .list-group-item .heading.DELETE { background-color: #f5e8e8; border: 1px solid #e8c6c7; }
-.detail .list-group-item .heading.DELETE a { color: #a41e22; }
-.detail .list-group-item a { display: flex; align-items: center; }
-.detail .list-group-item .path, .detail .list-group-item .desc { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
-.detail .list-group-item .path { padding-left: 10px; font-size: 14px; color: black; flex: 1; }
-.detail .list-group-item .desc { width: auto; font-size: 14px; line-height: 38px; float: right; padding-right: 10px; max-width: 200px; }
-.detail .list-group-item {list-style: none; font-size: 14px; margin-bottom: 10px; line-height: 30px}
-.detail .list-group-item span.method {line-height: 38px; width: 65px;background: #2e7fff; color: #fff; text-align: center;}
-.detail .list-group-item .label+.label {margin-left: -4px;}
-.detail .list-group-item .label {border-radius: 0;}
diff --git a/module/api/css/releases.ui.css b/module/api/css/releases.ui.css
index 42cac2ff18..e69de29bb2 100644
--- a/module/api/css/releases.ui.css
+++ b/module/api/css/releases.ui.css
@@ -1 +0,0 @@
-.releaseModal .modal-dialog .modal-body {overflow-y: hidden;}
diff --git a/module/api/css/struct.ui.css b/module/api/css/struct.ui.css
index 8778f3c9dc..e69de29bb2 100644
--- a/module/api/css/struct.ui.css
+++ b/module/api/css/struct.ui.css
@@ -1 +0,0 @@
-#featureBar .divider {color: #D9D9D9;float: left; height: 20px; margin: 4px 15px 4px 8px; border-left: 1px solid rgba(0,0,0,.1);}
diff --git a/module/api/css/view.ui.css b/module/api/css/view.ui.css
index 04531d9200..e69de29bb2 100644
--- a/module/api/css/view.ui.css
+++ b/module/api/css/view.ui.css
@@ -1,12 +0,0 @@
-.panel-heading { justify-content: space-between; }
-.panel-actions { margin-left: auto; }
-.panel .path {font-size: 18px; font-weight: 600; margin: 0;}
-.panel h2 {font-size: 17px; font-weight: 600; margin: 0;}
-.panel h3 {font-size: 17px; margin-top: 20px; margin-bottom: 10px;}
-pre { display: block; padding: 9.5px; margin: 0px 0px 10px; font-size: 12px; line-height: 1.38462; color: rgb(49, 60, 82); word-break: break-all; overflow-wrap: break-word; background-color: rgb(245, 245, 245); border: 1px solid rgb(204, 204, 204); border-radius: 4px; }
-
-.scrollbar-hover { overflow-y: scroll; }
-#mainContent .panel+.panel {flex: none}
-#history{position: relative; width: 400px}
-#history .history-changes {max-width: 400px !important; word-wrap: break-word;}
-#history > #closeBtn { position: absolute; right: 10px; top: 10px;}
diff --git a/module/api/js/index.ui.js b/module/api/js/index.ui.js
new file mode 100644
index 0000000000..9ca21dc0a2
--- /dev/null
+++ b/module/api/js/index.ui.js
@@ -0,0 +1,525 @@
+/**
+ * 定义页面上的自定义渲染器。
+ * Define the custom renderers on the page.
+ */
+const customRenders =
+{
+ /**
+ * 落地页渲染，根据 API 接口类型显示不同的内容。
+ * Home page render, show different content according to the API interface type.
+ */
+ home: function()
+ {
+ const docApp = this;
+ const filterType = docApp.location.filterType || 'nolink';
+ const pager = $.extend({page: 1, recPerPage: 20}, docApp.signals.pager.value);
+ const params = docApp.signals.params.value || 'notempty_unclosed';
+ const homeViewUrl = $.createLink('api', 'ajaxgethome', `type=${filterType}¶ms=${params}&recPerPage=${pager.recPerPage}&pageID=${pager.page}`);
+ return {fetcher: homeViewUrl, clearBeforeLoad: false, className: 'doc-api-home h-full', class: 'h-full col',htmlRender: (element, props) => $(element).morphInner(`${props.html}
`)};
+ },
+
+ /**
+ * 定义 API 文档编辑器渲染，包括查看、编辑和创建。
+ * Define the API doc editor render, including view, edit and create.
+ */
+ editor: function()
+ {
+ const mode = this.mode;
+ if(mode === 'create')
+ {
+ const libID = this.libID;
+ const moduleID = this.moduleID;
+ return {fetcher: $.createLink('api', 'create', `libID=${libID}&moduleID=${moduleID}&space=api`), loadingText: getDocAppLang('loading')};
+ }
+ if(mode === 'edit')
+ {
+ const doc = this.doc.data;
+ return {fetcher: $.createLink('api', 'edit', `apiID=${doc.id}`), loadingText: getDocAppLang('loading')};
+ }
+ const doc = this.doc.data;
+ if(!docAppHasPriv('view')) return {html: `${doc ? doc.title : ''}
${getDocAppLang('accessDenied')}
`};
+ const release = this.signals.libReleaseMap.value[doc.lib] || 0;
+ const version = this.signals.docVersion.value || 0;
+ return {fetcher: $.createLink('api', 'view', `libID=${doc.lib}&apiID=${doc.id}&moduleID=${doc.module}&version=${version}&release=${release}`), loadingText: getDocAppLang('loadingDocsData'), className: 'doc-editor-content'};
+ },
+
+ /**
+ * 定义 API 文档列表渲染，包括结构和版本。
+ * Define the API doc list render, including structs and releases.
+ */
+ list: function()
+ {
+ const listType = this.signals.listType.value;
+ const libID = this.libID;
+ const releaseID = this.signals.libReleaseMap.value[libID] || 0;
+ if(listType === 'structs') return {fetcher: $.createLink('api', 'struct', `libID=${this.libID}&releaseID=${releaseID}`), loadingText: getDocAppLang('loading'), className: 'api-struct-list'};
+ if(listType === 'releases') return {fetcher: $.createLink('api', 'releases', `libID=${this.libID}`), loadingText: getDocAppLang('loading'), className: 'api-release-list'};
+ },
+
+ /**
+ * 定义 API 文档列表筛选菜单渲染，当展示结构和版本时不显示筛选菜单。
+ * Define the API doc list filter menu render, not show the filter menu when showing structs and releases.
+ */
+ filters: function()
+ {
+ const listType = this.signals.listType.value;
+ if(this.mode !== 'list' || !listType) return;
+ return null;
+ },
+
+ /**
+ * 定义 API 文档列表工具栏渲染。
+ * Define the API doc list toolbar render.
+ */
+ toolbar: function()
+ {
+ const listType = this.signals.listType.value;
+ if(this.mode === 'list' && listType)
+ {
+ const items = [];
+ if(docAppHasPriv('createStruct') && listType === 'structs') items.push({text: getDocAppLang('createStruct'), icon: 'plus', btnType: 'primary', 'data-toggle': 'modal', 'data-size': 'lg', url: $.createLink('api', 'createStruct', `libID=${this.libID}`)});
+ if(docAppHasPriv('createRelease') && listType === 'releases') items.push({text: getDocAppLang('createRelease'), icon: 'plus', btnType: 'primary', 'data-toggle': 'modal', url: $.createLink('api', 'createRelease', `libID=${this.libID}`)});
+ if(!items.length) return null;
+ return {component: 'toolbar', props: {items: items}};
+ }
+ },
+
+ /**
+ * 定义顶部面包屑导航渲染。
+ * Define the top breadcrumb render.
+ */
+ 'app-nav': function(items)
+ {
+ const lib = this.lib;
+ if(!lib) return items;
+ const versions = lib.data.versions;
+ if(versions && versions.length)
+ {
+ const viewIndex = items.findIndex(item => item[0] === 'lib');
+ if(viewIndex >= 0)
+ {
+ const libView = items[viewIndex][1];
+ const libID = lib.data.id;
+ const release = this.signals.libReleaseMap.value[libID] || 0;
+ const options = [{text: getDocAppLang('latestVersion'), value: 0, selected: !release, command: `changeLibRelease/${libID}/0`}];
+ versions.forEach(version => options.push({selected: release === version.id, text: `v${version.version}`, value: version.id, command: `changeLibRelease/${libID}/${version.id}`}));
+ const currentVersion = versions.find(x => x.id === release);
+ const versionPicker = zui.renderCustomContent(
+ {
+ content:
+ {
+ component: 'DropdownButton',
+ props:
+ {
+ text : currentVersion ? currentVersion.version : getDocAppLang('latestVersion'),
+ size : 'xs',
+ type : 'gray-pale',
+ rounded : 'full',
+ className: 'h-4 gap-1 mr-2',
+ items : options,
+ }
+ }
+ });
+ items[viewIndex] = ['lib', [libView, versionPicker]];
+ }
+ }
+ const listType = this.signals.listType.value;
+ if(this.mode !== 'list' || !listType) return items;
+ if(listType === 'structs') items.push([listType, zui.renderCustomContent({className: 'mx-2', content: getDocAppLang('struct')})]);
+ if(listType === 'releases') items.push([listType, zui.renderCustomContent({className: 'mx-2', content: getDocAppLang('releases')})]);
+ return items;
+ },
+
+ /**
+ * 定义侧边栏渲染，显示结构、版本和模块。
+ * Define the sidebar render, show structs, releases and modules.
+ */
+ 'sidebar-before': function()
+ {
+ if(!this.libID) return;
+
+ const canViewStructs = docAppHasPriv('struct');
+ const canViewReleases = docAppHasPriv('releases');
+ if(!canViewStructs && !canViewReleases) return;
+
+ const isListMode = this.mode === 'list';
+ const lang = getDocAppLang();
+ const listType = this.signals.listType.value;
+ const items = [];
+ if(canViewStructs) items.push({text: lang.struct, selected: listType === 'structs' && isListMode, icon: 'treemap muted', command: 'showStructs'}, {type: 'divider', className: 'my-1'});
+ if(canViewReleases) items.push({text: lang.releases, selected: listType === 'releases' && isListMode, icon: 'version muted', command: 'showReleases'}, {type: 'divider', className: 'my-1'});
+ items.push({text: lang.module, icon: 'list muted', command: 'showModules'});
+ return {
+ component: 'tree',
+ className: 'p-2 pb-0 api-lib-menu',
+ props: {items: items, itemProps: {className: 'state'}}
+ };
+ }
+};
+
+/**
+ * 获取查看视图的 URL，用于更新浏览器地址栏。
+ * Get the view mode URL for updating the browser address bar.
+ */
+function getViewModeUrl(options)
+{
+ const doc = this.doc;
+ options = $.extend({release: (doc ? this.signals.libReleaseMap.value[doc.lib] : 0) || 0}, options);
+ let url;
+ if(this.mode === 'view')
+ {
+ const params = zui.formatString('libID={libID}&apiID={docID}&moduleID={moduleID}&version={docVersion}&release={release}', options).replace('&version=0&release=0', '');
+ url = $.createLink('api', 'view', params);
+ }
+ else
+ {
+ const params = zui.formatString('libID={libID}&moduleID={moduleID}&apiID={docID}&version={docVersion}&release={release}&browseType={filterType}¶ms={params}&orderBy={orderBy}&recTotal={recTotal}&recPerPage={recPerPage}&pageID={page}&mode={mode}&search={search}', options).replace('libID=0&moduleID=0&apiID=0&version=0&release=0&browseType=all¶ms=0&orderBy=order_asc&recTotal=0&recPerPage=20&pageID=1&mode=&search=', '').replace('&apiID=0&version=0&release=0&browseType=all¶ms=0&orderBy=order_asc&recTotal=0&recPerPage=20&pageID=1&mode=&search=', '').replace('&browseType=all¶ms=0&orderBy=order_asc&recTotal=0&recPerPage=20&pageID=1&mode=&search=', '');
+ url = $.createLink('api', 'index', params);
+ }
+ return url;
+}
+
+/**
+ * 获取文档详情侧边栏标签页定义。
+ * Get the doc view sidebar tabs.
+ *
+ * @param {object} doc
+ */
+function getDocViewSidebarTabs(doc, info)
+{
+ const lang = getDocAppLang();
+ if(info.isNewDoc || info.mode === 'create') return [];
+ return [
+ {key: 'info', icon: 'info', title: lang.docInfo},
+ info.mode === 'edit' ? null : {key: 'outline', icon: 'list-box', title: lang.docOutline},
+ {key: 'history', icon: 'history', title: lang.history},
+ ].filter(Boolean);
+}
+
+function getSpaceFetcher(spaceType, spaceID)
+{
+ const parts = String(spaceID).split('.');
+ const objectType = parts[0] || 'nolink';
+ const objectID = parts[1] || 0;
+ const libID = getDocApp().libID;
+ return $.createLink('api', 'ajaxGetDropMenu', `objectType=${objectType}&objectID=${objectID}&libID=${libID}`);
+}
+
+function handleClickSpaceMenu(event, value)
+{
+ event.preventDefault();
+ if($(event.target).closest('.dropmenu-nav').length) return;
+ const parts = String(value).split('.');
+ const type = parts[0];
+ const id = parts[1] || 0;
+ const docApp = getDocApp();
+ if(type === 'product' || type === 'project') docApp.selectSpace(value, true, true);
+ else docApp.selectSpace('nolink', +id, true);
+}
+
+function getSpaceMenuText(text, state)
+{
+ const spaceID = this.spaceID;
+ if(spaceID === 'nolink') return text;
+ const libTypeList = getDocAppLang('libTypeList');
+ return `${libTypeList[spaceID.split('.')[0]]} / ${text}`;
+}
+
+function getSpaceMenuOptions(spaceType, spaceID)
+{
+ const libID = this.libID;
+ return {
+ popWidth : 350,
+ onClickItem : handleClickSpaceMenu,
+ defaultValue: spaceID === 'nolink' ? `lib.${libID}`: spaceID,
+ display : getSpaceMenuText.bind(this)
+ };
+}
+
+/* 扩展文档应用操作按钮生成定义。 Extend the doc app action definition. */
+$.extend(window.docAppActions,
+{
+ /**
+ * 定义文档编辑时的操作按钮。
+ * Define the actions on toolbar of the doc editing page.
+ */
+ 'doc-edit': function(info)
+ {
+ const doc = info.data;
+ if(!doc) return;
+
+ const lang = getDocAppLang();
+ return [
+ {text: lang.save, size: 'md', className: 'btn-wide', type: 'primary', command: 'saveApiDoc'},
+ {text: lang.cancel, size: 'md', className: 'btn-wide', type: 'primary-outline', command: 'cancelEditDoc'},
+ ];
+ },
+ /**
+ * 定义文档创建时的操作按钮。
+ * Define the actions on toolbar of the doc editing page.
+ */
+ 'doc-create': function(info)
+ {
+ const doc = info.data;
+ if(!doc) return;
+
+ const lang = getDocAppLang();
+ return [
+ {text: lang.save, size: 'md', className: 'btn-wide', type: 'primary', command: 'saveApiDoc'},
+ {text: lang.cancel, size: 'md', className: 'btn-wide', type: 'primary-outline', command: 'cancelCreateDoc'},
+ ];
+ },
+});
+
+/* 扩展文档应用命令定义。 Extend the doc app command definition. */
+$.extend(window.docAppCommands,
+{
+ /**
+ * 保存 API 文档数据。
+ * Save the API doc data.
+ */
+ saveApiDoc: function()
+ {
+ /* 触发 API 表单的提交事件。 */
+ $('#docApp .doc-view form').trigger('submit');
+ },
+
+ /**
+ * 取消编辑 API 文档库。
+ * Create api lib.
+ */
+ createLib: function(_, args)
+ {
+ const docApp = getDocApp();
+ const spaceID = args[0] || docApp.spaceID;
+ const parts = String(spaceID).split('.');
+ const url = $.createLink('api', 'createLib', `type=${parts[0] || 'nolink'}&objectID=${parts[1] || 0}`);
+ zui.Modal.open({size: 'sm', url: url});
+ },
+
+ /**
+ * 加载指定的 API 文档。
+ * Load the specified API doc.
+ */
+ loadApi: function(_, args)
+ {
+ const apiID = args[0] || this.docID;
+ const version = args[1] || 0;
+ const release = args[2] || 0;
+ const select = !!args[3];
+ $.getJSON($.createLink('api', 'ajaxGetApi', `apiID=${apiID}&version=${version}&release=${release}`), function(result)
+ {
+ if(!result || typeof result !== 'object') return;
+ const docApp = getDocApp();
+ docApp.update('doc', result);
+ if(select) docApp.selectDoc(apiID);
+ });
+ },
+
+ /**
+ * 选择 API 文档。
+ * Select the specified API doc.
+ */
+ selectApi: function(_, args)
+ {
+ const apiID = args[0];
+ getDocApp().selectDoc(apiID);
+ },
+
+ /**
+ * 显示结构列表。
+ * Show the struct list.
+ */
+ showStructs: function()
+ {
+ getDocApp().changeState(
+ {
+ mode: 'list',
+ moduleID: 0,
+ docID: 0,
+ listType: 'structs',
+ });
+ },
+
+ /**
+ * 显示版本列表。
+ * Show the release list.
+ */
+ showReleases: function()
+ {
+ getDocApp().changeState(
+ {
+ mode: 'list',
+ moduleID: 0,
+ docID: 0,
+ listType: 'releases',
+ });
+ },
+
+ /**
+ * 显示API 目录。
+ * Show the api catalog.
+ */
+ showModules: function()
+ {
+ getDocApp().changeState(
+ {
+ mode: 'list',
+ moduleID: 0,
+ docID: 0,
+ listType: '',
+ });
+ },
+
+ /**
+ * 获取库的 API 列表。
+ * Get the API list of the library.
+ */
+ loadLibApi: function(_, args)
+ {
+ const docApp = getDocApp();
+ const libReleaseMap = docApp.signals.libReleaseMap.value;
+ const libID = args[0] || docApp.libID;
+ if(!libID) return;
+
+ const releaseID = args[1] || libReleaseMap[libID] || 0;
+ const url = $.createLink('api', 'ajaxGetLibApiList', `libID=${libID}&releaseID=${releaseID}`);
+ $.getJSON(url, function(data)
+ {
+ const lib = docApp.getLib(libID);
+ if(lib && lib.docs && lib.docs.length) docApp.delete('doc', lib.docs.map(x => x.data.id));
+ docApp.update('doc', data);
+ });
+ },
+
+ /**
+ * 更改当前库的发布版本。
+ * Change the release of the current library.
+ */
+ changeLibRelease: function(_, args)
+ {
+ const docApp = getDocApp();
+ const libID = args[0];
+ const release = args[1];
+ const libReleaseMap = docApp.signals.libReleaseMap.value;
+ if(libReleaseMap[libID] === release) return;
+ libReleaseMap[libID] = release;
+ docApp.signals.libReleaseMap.value = $.extend({}, libReleaseMap);
+ docApp.executeCommand('loadLibApi', [libID, release]);
+ const doc = docApp.doc;
+ if(doc && doc.data.lib === libID) docApp.executeCommand('loadApi', [doc.data.id, 0, release]);
+ },
+
+ /**
+ * 加载懒加载内容。
+ * Load the lazy content.
+ */
+ loadLazyContent: function(_, args)
+ {
+ const selector = args[0];
+ if(!selector) return;
+ $(selector).closest('.lazy-content').trigger('loadContent');
+ },
+
+ /**
+ * 更新懒加载内容。
+ * Update the lazy content.
+ */
+ updateLazyContent: function(context, args)
+ {
+ const event = context.event;
+ const $element = $(event.currentTarget);
+ const selector = args[0] || $element.data('lazyTarget');
+ const $lazy = (selector ? $(selector) : $element).closest('.lazy-content');
+ const url = $element.data('url') || $element.attr('href');
+ if(url) $lazy.trigger('loadContent', url);
+ event.preventDefault();
+ event.stopPropagation();
+ },
+
+ /**
+ * 更新首页内容。
+ * Update the home content.
+ */
+ loadHome: function(context, args)
+ {
+ const event = context.event;
+ const $element = $(event.currentTarget);
+ const data = $element.data();
+ const type = args[0] !== undefined ? args[0] : data.type;
+ const params = args[1] !== undefined ? args[1] : data.params;
+ const recPerPage = args[2] !== undefined ? args[2] : data.recPerPage;
+ const pageID = args[3] !== undefined ? args[3] : data.pageID;
+ window.loadHome(type, params, recPerPage, pageID);
+ },
+
+ /**
+ * 显示首页菜单。
+ * Show the home item menu.
+ */
+ showHomeItemMenu: function(context, args)
+ {
+ const event = context.event;
+ const type = args[0];
+ const id = args[1];
+ const lang = getDocAppLang();
+ const items = [];
+
+ if(type === 'nolink')
+ {
+ if(docAppHasPriv('editLib')) items.push({text: lang.actions.editLib, command: `editLib/${id}`});
+ if(docAppHasPriv('deleteLib')) items.push({text: lang.actions.deleteLib, command: `deleteLib/${id}`});
+ }
+ else if(docAppHasPriv('createLib'))
+ {
+ items.push({text: lang.createLib, command: `createLib/${type}.${id}`});
+ }
+
+ if(items.length)
+ {
+ zui.ContextMenu.show({event: event, items: items, placement: 'bottom-end'});
+ }
+ event.preventDefault();
+ event.stopPropagation();
+ },
+});
+
+window.loadHome = function(type, params, recPerPage, pageID)
+{
+ const location = {};
+ if(typeof type === 'object') $.extend(location, type);
+ else if(type !== undefined) location.filterType = type;
+ if(params !== undefined) location.params = params;
+ if(recPerPage !== undefined || pageID !== undefined)
+ {
+ location.pager = {};
+ if(recPerPage !== undefined) location.pager.recPerPage = recPerPage;
+ if(pageID !== undefined) location.pager.page = pageID;
+ }
+ if(Object.keys(location).length) getDocApp().switchView(location, 'home');
+};
+
+/**
+ * 重写文档应用的配置选项方法。
+ * Override the method to set the doc app options.
+ */
+window._setDocAppOptions = window.setDocAppOptions; // Save the original method.
+window.setDocAppOptions = function(_, options) // Override the method.
+{
+ options = window._setDocAppOptions(_, options);
+ const oldIsMatchFilter = options.isMatchFilter; // Save the original isMatchFilter method.
+ return $.extend(options,
+ {
+ defaultState : {libReleaseMap: {}, listType: ''},
+ spaceMenuOptions : getSpaceMenuOptions,
+ customRenders : customRenders,
+ viewModeUrl : getViewModeUrl,
+ getDocViewSidebarTabs: getDocViewSidebarTabs,
+ getSpaceFetcher : getSpaceFetcher,
+ isMatchFilter : function(type, filterType, item)
+ {
+ if(type === 'api') return (item.objectType || 'nolink').toLowerCase() === filterType.toLowerCase();
+ return oldIsMatchFilter.call(this, type, filterType, item);
+ }
+ });
+};
diff --git a/module/api/js/view.ui.js b/module/api/js/view.ui.js
index f48b4a6e9e..e69de29bb2 100644
--- a/module/api/js/view.ui.js
+++ b/module/api/js/view.ui.js
@@ -1,104 +0,0 @@
-/**
- * Display the document in full screen.
- *
- * @access public
- * @return void
- */
-window.fullScreen = function()
-{
- var element = document.getElementById('content');
- var requestMethod = element.requestFullScreen || element.webkitRequestFullScreen || element.mozRequestFullScreen || element.msRequestFullscreen;
- if(requestMethod)
- {
- var afterEnterFullscreen = function()
- {
- $('#content').addClass('scrollbar-hover');
- $('#content').css('background', '#fff');
- $.cookie.set('isFullScreen', 1, {expires:config.cookieLife, path:config.webRoot});
- };
-
- var whenFailEnterFullscreen = function(error)
- {
- $.cookie.set('isFullScreen', 0, {expires:config.cookieLife, path:config.webRoot});
- };
-
- try
- {
- var result = requestMethod.call(element);
- if(result && (typeof result.then === 'function' || result instanceof window.Promise))
- {
- result.then(afterEnterFullscreen).catch(whenFailEnterFullscreen);
- }
- else
- {
- afterEnterFullscreen();
- }
- }
- catch (error)
- {
- whenFailEnterFullscreen(error);
- }
- }
-}
-
-/**
- * Exit full screen.
- *
- * @access public
- * @return void
- */
-function exitFullScreen()
-{
- $('#content').removeClass('scrollbar-hover');
- $.cookie.set('isFullScreen', 0, {expires:config.cookieLife, path:config.webRoot});
-}
-
-document.addEventListener('fullscreenchange', function (e)
-{
- if(!document.fullscreenElement) exitFullScreen();
-});
-
-document.addEventListener('webkitfullscreenchange', function (e)
-{
- if(!document.webkitFullscreenElement) exitFullScreen();
-});
-
-document.addEventListener('mozfullscreenchange', function (e)
-{
- if(!document.mozFullScreenElement) exitFullScreen();
-});
-
-document.addEventListener('msfullscreenChange', function (e)
-{
- if(!document.msfullscreenElement) exitFullScreen();
-});
-
-$(function()
-{
- if($.cookie.get('isFullScreen') == 1) fullScreen();
-
- /* Update doc content silently on switch doc version, story #40503 */
- $('.panel').on('click', '#closeBtn', function()
- {
- $('#history').addClass('hidden');
- $('#hisTrigger').removeClass('text-primary');
- });
-
- $('#history').append('');
-});
-
-window.showHistory = function()
-{
- var $history = $('#history');
- var $icon = $('#hisTrigger');
- if($history.hasClass('hidden'))
- {
- $history.removeClass('hidden');
- $icon.addClass('text-primary');
- }
- else
- {
- $history.addClass('hidden');
- $icon.removeClass('text-primary');
- }
-}
diff --git a/module/api/lang/de.php b/module/api/lang/de.php
index 53a14a803a..567f6c59fd 100644
--- a/module/api/lang/de.php
+++ b/module/api/lang/de.php
@@ -15,6 +15,7 @@ $lang->api->sql = 'SQL Query API';
$lang->api->manage = 'API management';
$lang->api->index = 'API Space';
+$lang->api->view = 'API Detail';
$lang->api->editLib = 'Edit';
$lang->api->releases = 'Release';
$lang->api->deleteRelease = 'Delete Release';
@@ -63,6 +64,7 @@ $lang->api->zentaoAPI = "Zentao API v1";
$lang->api->search = "Search";
$lang->api->allLibs = "AllLibs";
$lang->api->noLinked = "No Linked {$lang->productCommon} and {$lang->projectCommon}";
+$lang->api->apiCatalog = 'Api Catalogs';
$lang->api->addCatalog = 'Add Catalog';
$lang->api->editCatalog = 'Edit Catalog';
$lang->api->sortCatalog = 'Catalog Sorting';
@@ -160,6 +162,9 @@ $lang->api->format = 'Format';
$lang->api->libType = 'Api Library Type';
$lang->api->product = $lang->productCommon;
$lang->api->project = $lang->projectCommon;
+$lang->api->apiTotalInfo = 'Total %d APIs';
+$lang->api->showNotEmpty = 'Show not empty';
+$lang->api->showClosed = 'Show with closed';
$lang->api->methodOptions = array(
'GET' => 'GET',
@@ -229,8 +234,17 @@ $lang->apistruct->name = 'Name';
$lang->api_lib_release = new stdClass();
$lang->api_lib_release->version = 'Version';
+$lang->api_lib_release->desc = 'Description';
$lang->api->error = new stdclass();
$lang->api->error->onlySelect = 'Das SQL Interface erlaubt nur SELECT Abfragen.';
$lang->api->error->disabled = 'For security reasons, this feature is disabled. You can go to the config directory and modify the configuration item %s to open this function.';
$lang->api->error->notInput = 'Debugging is not supported temporarily due to field parameter type restrictions';
+
+$lang->api->filterTypes[] = array('all', 'All');
+$lang->api->filterTypes[] = array('createdByMe', 'Created by me');
+$lang->api->filterTypes[] = array('editedByMe', 'Edited by me');
+
+$lang->api->homeFilterTypes['nolink'] = $lang->api->libTypeList['nolink'];
+$lang->api->homeFilterTypes['product'] = $lang->api->libTypeList['product'];
+$lang->api->homeFilterTypes['project'] = $lang->api->libTypeList['project'];
diff --git a/module/api/lang/en.php b/module/api/lang/en.php
index a11887e5d4..bc7646ce73 100644
--- a/module/api/lang/en.php
+++ b/module/api/lang/en.php
@@ -15,6 +15,7 @@ $lang->api->sql = 'SQL Query API';
$lang->api->manage = 'API management';
$lang->api->index = 'API Space';
+$lang->api->view = 'API Detail';
$lang->api->editLib = 'Edit';
$lang->api->releases = 'Release';
$lang->api->deleteRelease = 'Delete Release';
@@ -59,10 +60,12 @@ $lang->api->confirmDeleteLib = "Do you want to delete this interface library?
$lang->api->confirmDeleteStruct = "Do you want to delete this data struct?";
$lang->api->filterStruct = "use struct";
$lang->api->defaultVersion = "Current Version";
+$lang->api->latestVersion = 'Lastest Version';
$lang->api->zentaoAPI = "Zentao API v1";
$lang->api->search = "Search";
$lang->api->allLibs = "AllLibs";
-$lang->api->noLinked = "No Linked {$lang->productCommon} and {$lang->projectCommon}";
+$lang->api->noLinked = "Stand-alone APIs";
+$lang->api->apiCatalog = 'Api Catalogs';
$lang->api->addCatalog = 'Add Catalog';
$lang->api->editCatalog = 'Edit Catalog';
$lang->api->sortCatalog = 'Catalog Sorting';
@@ -160,6 +163,9 @@ $lang->api->format = 'Format';
$lang->api->libType = 'Api Library Type';
$lang->api->product = $lang->productCommon;
$lang->api->project = $lang->projectCommon;
+$lang->api->apiTotalInfo = 'Total %d APIs';
+$lang->api->showNotEmpty = 'Show not empty';
+$lang->api->showClosed = 'Show with closed';
$lang->api->methodOptions = array(
'GET' => 'GET',
@@ -183,9 +189,9 @@ $lang->api->requestTypeOptions['application/x-www-form-urlencoded'] = 'applicati
$lang->api->requestTypeOptions['multipart/form-data'] = 'multipart/form-data';
$lang->api->libTypeList = array();
-$lang->api->libTypeList['product'] = $lang->productCommon . ' Api Library';
-$lang->api->libTypeList['project'] = $lang->projectCommon . ' Api Library';
-$lang->api->libTypeList['nolink'] = 'Independent Api Library';
+$lang->api->libTypeList['product'] = $lang->productCommon . ' API';
+$lang->api->libTypeList['project'] = $lang->projectCommon . ' API';
+$lang->api->libTypeList['nolink'] = 'Independent API';
$lang->api->statusOptions = array(
'done' => 'Done',
@@ -229,8 +235,17 @@ $lang->apistruct->name = 'Name';
$lang->api_lib_release = new stdClass();
$lang->api_lib_release->version = 'Version';
+$lang->api_lib_release->desc = 'Description';
$lang->api->error = new stdclass();
$lang->api->error->onlySelect = 'SQL API only allows SELECT query.';
$lang->api->error->disabled = 'For security reasons, this feature is disabled. Go to the config directory and modify the configuration item %s to enable it.';
$lang->api->error->notInput = 'Debugging is not supported temporarily due to field parameter type restrictions';
+
+$lang->api->filterTypes[] = array('all', 'All');
+$lang->api->filterTypes[] = array('createdByMe', 'Created by me');
+$lang->api->filterTypes[] = array('editedByMe', 'Edited by me');
+
+$lang->api->homeFilterTypes['nolink'] = $lang->api->libTypeList['nolink'];
+$lang->api->homeFilterTypes['product'] = $lang->api->libTypeList['product'];
+$lang->api->homeFilterTypes['project'] = $lang->api->libTypeList['project'];
diff --git a/module/api/lang/fr.php b/module/api/lang/fr.php
index af0df723ae..c8a7f8bb30 100644
--- a/module/api/lang/fr.php
+++ b/module/api/lang/fr.php
@@ -15,6 +15,7 @@ $lang->api->sql = 'SQL Query API';
$lang->api->manage = 'API management';
$lang->api->index = 'API Space';
+$lang->api->view = 'API Detail';
$lang->api->editLib = 'Edit';
$lang->api->releases = 'Release';
$lang->api->deleteRelease = 'Delete Release';
@@ -63,6 +64,7 @@ $lang->api->zentaoAPI = "Zentao API v1";
$lang->api->search = "Search";
$lang->api->allLibs = "AllLibs";
$lang->api->noLinked = "No Linked {$lang->productCommon} and {$lang->projectCommon}";
+$lang->api->apiCatalog = 'Api Catalogs';
$lang->api->addCatalog = 'Add Catalog';
$lang->api->editCatalog = 'Edit Catalog';
$lang->api->sortCatalog = 'Catalog Sorting';
@@ -160,6 +162,9 @@ $lang->api->format = 'Format';
$lang->api->libType = 'Api Library Type';
$lang->api->product = $lang->productCommon;
$lang->api->project = $lang->projectCommon;
+$lang->api->apiTotalInfo = 'Total %d APIs';
+$lang->api->showNotEmpty = 'Show not empty';
+$lang->api->showClosed = 'Show with closed';
$lang->api->methodOptions = array(
'GET' => 'GET',
@@ -229,8 +234,17 @@ $lang->apistruct->name = 'Name';
$lang->api_lib_release = new stdClass();
$lang->api_lib_release->version = 'Version';
+$lang->api_lib_release->desc = 'Description';
$lang->api->error = new stdclass();
$lang->api->error->onlySelect = 'Cette interface SQL ne supporte que les requêtes SELECT.';
$lang->api->error->disabled = 'For security reasons, this feature is disabled. You can go to the config directory and modify the configuration item %s to open this function.';
$lang->api->error->notInput = 'Debugging is not supported temporarily due to field parameter type restrictions';
+
+$lang->api->filterTypes[] = array('all', 'All');
+$lang->api->filterTypes[] = array('createdByMe', 'Created by me');
+$lang->api->filterTypes[] = array('editedByMe', 'Edited by me');
+
+$lang->api->homeFilterTypes['nolink'] = $lang->api->libTypeList['nolink'];
+$lang->api->homeFilterTypes['product'] = $lang->api->libTypeList['product'];
+$lang->api->homeFilterTypes['project'] = $lang->api->libTypeList['project'];
diff --git a/module/api/lang/zh-cn.php b/module/api/lang/zh-cn.php
index 6af790d6f5..9aa2649488 100755
--- a/module/api/lang/zh-cn.php
+++ b/module/api/lang/zh-cn.php
@@ -15,6 +15,7 @@ $lang->api->sql = 'SQL查询接口';
$lang->api->manage = '接口管理';
$lang->api->index = '接口空间';
+$lang->api->view = '接口详情';
$lang->api->editLib = '编辑库';
$lang->api->releases = '版本管理';
$lang->api->deleteRelease = '删除版本';
@@ -59,10 +60,12 @@ $lang->api->confirmDeleteLib = "您确定删除该库吗？";
$lang->api->confirmDeleteStruct = "您确定删除该数据结构吗？";
$lang->api->filterStruct = "使用数据结构填充";
$lang->api->defaultVersion = "当前版本";
+$lang->api->latestVersion = '最新版本';
$lang->api->zentaoAPI = "禅道API文档v1";
$lang->api->search = "搜索";
$lang->api->allLibs = "全部库";
-$lang->api->noLinked = "未关联{$lang->productCommon}和{$lang->projectCommon}";
+$lang->api->noLinked = "独立接口";
+$lang->api->apiCatalog = '接口目录';
$lang->api->addCatalog = '添加目录';
$lang->api->editCatalog = '编辑目录';
$lang->api->sortCatalog = '目录排序';
@@ -160,6 +163,9 @@ $lang->api->format = '格式化';
$lang->api->libType = '接口库类型';
$lang->api->product = '所属' . $lang->productCommon;
$lang->api->project = '所属' . $lang->projectCommon;
+$lang->api->apiTotalInfo = '共 %d 个 API';
+$lang->api->showNotEmpty = '仅显示有接口的';
+$lang->api->showClosed = '显示包含已关闭的';
$lang->api->methodOptions = array(
'GET' => 'GET',
@@ -183,9 +189,9 @@ $lang->api->requestTypeOptions['application/x-www-form-urlencoded'] = 'applicati
$lang->api->requestTypeOptions['multipart/form-data'] = 'multipart/form-data';
$lang->api->libTypeList = array();
-$lang->api->libTypeList['product'] = $lang->productCommon . '接口库';
-$lang->api->libTypeList['project'] = $lang->projectCommon . '接口库';
-$lang->api->libTypeList['nolink'] = '独立接口库';
+$lang->api->libTypeList['product'] = $lang->productCommon . '接口';
+$lang->api->libTypeList['project'] = $lang->projectCommon . '接口';
+$lang->api->libTypeList['nolink'] = '独立接口';
$lang->api->statusOptions = array(
'done' => '开发完成',
@@ -229,8 +235,17 @@ $lang->apistruct->name = '结构名';
$lang->api_lib_release = new stdClass();
$lang->api_lib_release->version = '版本号';
+$lang->api_lib_release->desc = '描述';
$lang->api->error = new stdclass();
$lang->api->error->onlySelect = 'SQL查询接口只允许SELECT查询';
$lang->api->error->disabled = '因为安全原因，该功能被禁用。可以到config目录，修改配置项 %s，打开此功能。';
$lang->api->error->notInput = '因字段参数类型限制，暂不支持调试';
+
+$lang->api->filterTypes[] = array('all', '全部');
+$lang->api->filterTypes[] = array('createdByMe', '我创建的');
+$lang->api->filterTypes[] = array('editedByMe', '我编辑的');
+
+$lang->api->homeFilterTypes['nolink'] = $lang->api->libTypeList['nolink'];
+$lang->api->homeFilterTypes['product'] = $lang->api->libTypeList['product'];
+$lang->api->homeFilterTypes['project'] = $lang->api->libTypeList['project'];
diff --git a/module/api/model.php b/module/api/model.php
index 35263b8851..cd7521b492 100644
--- a/module/api/model.php
+++ b/module/api/model.php
@@ -903,6 +903,50 @@ class apiModel extends model
return array($normalObjects, $closedObjects);
}
+ /**
+ * 获取分组后的对象列表。
+ *
+ * @access public
+ * @return array
+ */
+ public function getGroupedObjects(): array
+ {
+ $libs = $this->loadModel('doc')->getApiLibs();
+ $libIDs = array_keys($libs);
+
+ /* 获取接口库所属产品的产品列表。 */
+ $products = $this->dao->select('t1.id, t1.order, t1.name, t1.status, t1.program')->from(TABLE_PRODUCT)->alias('t1')
+ ->leftJoin(TABLE_DOCLIB)->alias('t2')->on('t2.product=t1.id')
+ ->where('t2.id')->gt(0)
+ ->andWhere('t1.vision')->eq($this->config->vision)
+ ->andWhere('t1.deleted')->eq(0)
+ ->andWhere('t2.id')->in($libIDs)
+ ->orderBy('order_asc')
+ ->fetchAll('id');
+
+ /* 获取接口库所属项目的项目列表。 */
+ $projects = $this->dao->select('t1.id, t1.order, t1.name, t1.status, t1.parent')->from(TABLE_PROJECT)->alias('t1')
+ ->leftJoin(TABLE_DOCLIB)->alias('t2')->on('t2.project=t1.id')
+ ->where('t2.id')->gt(0)
+ ->andWhere('t1.vision')->eq($this->config->vision)
+ ->andWhere('t1.deleted')->eq(0)
+ ->beginIF(!$this->app->user->admin)->andWhere('t1.id')->in($this->app->user->view->projects)->fi()
+ ->andWhere('t2.id')->in($libIDs)
+ ->orderBy('t1.hasProduct_asc, order_asc')
+ ->fetchAll('id');
+
+ $nolinks = array();
+ foreach($libs as $lib)
+ {
+ if($lib->product != 0 && isset($products[$lib->product]) && !isset($products[$lib->product]->firstLib)) $products[$lib->product]->firstLib = $lib->id;
+ if($lib->project != 0 && isset($projects[$lib->project]) && !isset($projects[$lib->project]->firstLib)) $projects[$lib->project]->firstLib = $lib->id;
+ if($lib->product != 0 || $lib->project != 0 || $lib->execution != 0) continue;
+ $nolinks[$lib->id] = $lib;
+ }
+
+ return array('product' => $products, 'project' => $projects, 'nolink' => $nolinks);
+ }
+
/**
* 获取有权限的接口文档列表。
* Get priv Apis.
diff --git a/module/api/ui/ajaxgetdropmenu.html.php b/module/api/ui/ajaxgetdropmenu.html.php
index 877893b75c..979b6e305a 100644
--- a/module/api/ui/ajaxgetdropmenu.html.php
+++ b/module/api/ui/ajaxgetdropmenu.html.php
@@ -10,46 +10,46 @@ declare(strict_types=1);
*/
namespace zin;
-$data = array('normal' => array(), 'closed' => array());
-$data['normal'][] = array('id' => 0, 'text' => $lang->api->noLinked, 'active' => $objectID == 0, 'type' => 'nolink');
+$data = array('nolink' => array(), 'product' => array(), 'project' => array());
-/* 处理分组数据。Process grouped data. */
-foreach(array('product', 'project') as $moduleType)
+/* 处理独立接口库。Process independent libs. */
+foreach($nolinkLibs as $lib) $data['nolink'][] = array('id' => "lib.$lib->id", 'text' => $lib->name, 'active' => $lib->id == $libID, 'type' => 'item', 'url' => createLink('api', 'index', "libID=$lib->id"));
+
+/* 处理产品和项目数据。Process product and project data. */
+foreach($products as $product)
{
- if(isset($normalObjects[$moduleType]))
+ $programID = $product->program;
+ $item = array('type' => 'product', 'id' => "product.$product->id", 'text' => $product->name, 'active' => $objectType == 'product' && $product->id == $objectID, 'url' => createLink('api', 'index', 'libID=' . (isset($product->firstLib) ? $product->firstLib : 0)));
+ if(isset($programs[$programID]))
{
- foreach($normalObjects[$moduleType] as $normalObjectID => $normalObjectName)
- {
- $item = array();
- $item['id'] = $normalObjectID;
- $item['text'] = $normalObjectName;
- $item['active'] = $normalObjectID == $objectID;
- $item['type'] = $moduleType;
- $item['keys'] = zget(common::convert2Pinyin(array($normalObjectName)), $normalObjectName, '');
-
- $data['normal'][] = $item;
- }
+ $programKey = "program.$programID";
+ $program = $programs[$programID];
+ if(!isset($data['product'][$programKey])) $data['product'][$programKey] = array('id' => $programKey, 'text' => $program->name, 'type' => 'program', 'items' => array());
+ $data['product'][$programKey]['items'][] = $item;
}
-
- if(isset($closedObjects[$moduleType]))
+ else
{
- foreach($closedObjects[$moduleType] as $closedObjectID => $closedObjectName)
- {
- $item = array();
- $item['id'] = $closedObjectID;
- $item['text'] = $closedObjectName;
- $item['active'] = $closedObjectID == $objectID;
- $item['type'] = $moduleType;
- $item['keys'] = zget(common::convert2Pinyin(array($closedObjectName)), $closedObjectName, '');
-
- $data['closed'][] = $item;
- }
+ $data['product'][$product->id] = $item;
}
}
-
-$tabs = array();
-$tabs[] = array('name' => 'normal', 'text' => '');
-$tabs[] = array('name' => 'closed', 'text' => $lang->doc->closed);
+foreach($projects as $project)
+{
+ $programID = $project->parent;
+ $item = array('type' => 'project', 'id' => "project.$project->id", 'text' => $project->name, 'active' => $objectType == 'project' && $project->id == $objectID, 'url' => createLink('api', 'index', 'libID=' . (isset($project->firstLib) ? $project->firstLib : 0)));
+ if(isset($programs[$programID]))
+ {
+ $programKey = "program.$programID";
+ $program = $programs[$programID];
+ if(!isset($data['project'][$programKey])) $data['project'][$programKey] = array('id' => $programKey, 'text' => $program->name, 'type' => 'program', 'items' => array());
+ $data['project'][$programKey]['items'][] = $item;
+ }
+ else
+ {
+ $data['project'][$project->id] = $item;
+ }
+}
+$data['product'] = array_values($data['product']);
+$data['project'] = array_values($data['project']);
/**
* 定义最终的 JSON 数据。
@@ -57,13 +57,20 @@ $tabs[] = array('name' => 'closed', 'text' => $lang->doc->closed);
*/
$link = $this->createLink('api', 'ajaxGetList', "objectID={id}&objectType={type}");
+$tabs = array();
+$tabs[] = array('name' => 'nolink', 'active' => $libID, 'text' => $lang->api->libTypeList['nolink']);
+$tabs[] = array('name' => 'product', 'active' => $objectType == 'product', 'text' => $lang->api->libTypeList['product']);
+$tabs[] = array('name' => 'project', 'active' => $objectType == 'project', 'text' => $lang->api->libTypeList['project']);
+
$json = array();
-$json['data'] = $data;
-$json['tabs'] = $tabs;
-$json['searchHint'] = $lang->searchAB;
$json['link'] = $link;
-$json['itemType'] = 'api';
-$json['expandName'] = 'closed';
+$json['data'] = $data;
+$json['tabs'] = $tabs;
+$json['searchHint'] = $lang->searchAB;
+$json['labelMap'] = array('program' => $lang->program->common);
+$json['itemType'] = 'lib';
+$json['typeIconMap'] = array('lib' => 'interface-lib');
+$json['debug'] = array('libID' => $libID, 'objectType' => $objectType, 'objectID' => $objectID);
/**
* 渲染 JSON 字符串并发送到客户端。
diff --git a/module/api/ui/ajaxgethome.html.php b/module/api/ui/ajaxgethome.html.php
new file mode 100644
index 0000000000..e8d7873e2e
--- /dev/null
+++ b/module/api/ui/ajaxgethome.html.php
@@ -0,0 +1,191 @@
+
+ * @package api
+ * @link https://www.zentao.net
+ */
+namespace zin;
+
+$libColors = array('var(--color-secondary-500)', 'var(--color-primary-500)', 'var(--color-warning-500)', 'var(--color-success-500)', 'var(--color-special-500)');
+$isNolink = $type == 'nolink';
+$isEmpty = $isNolink ? empty($libs) : empty($programs);
+$canCreateLib = hasPriv('api', 'createLib');
+$canEditLib = hasPriv('api', 'editLib');
+$canDeleteLib = hasPriv('api', 'deleteLib');
+$showLibAction = $isNolink ? ($canEditLib || $canDeleteLib) : $canCreateLib;
+
+/* Create load home command statement. */
+$createCommand = function(array $args) use($pager, $type, $unclosed, $notempty)
+{
+ $args = array_merge(array('type' => $type, 'unclosed' => $unclosed, 'notempty' => $notempty, 'recPerPage' => $pager->recPerPage, 'pageID' => $pager->pageID), $args);
+ $parts = array('loadHome');
+ $parts[] = $args['type'];
+ $params = array();
+ if($args['notempty']) $params[] = 'notempty';
+ if($args['unclosed']) $params[] = 'unclosed';
+ $parts[] = implode('_', $params);
+ $parts[] = $args['recPerPage'];
+ $parts[] = $args['pageID'];
+ return implode('/', $parts);
+};
+
+$buildLibItem = function(int $id, string $name, int $count = 0) use ($libColors, $type, $isNolink, $showLibAction, $lang)
+{
+ return div
+ (
+ setClass('doc-space-card-lib p-1.5 w-1/5 group'),
+ setKey($id),
+ div
+ (
+ setClass('canvas border rounded py-2 px-3 col gap-1 hover:shadow-lg hover:border-primary relative cursor-pointer'),
+ set('zui-command', $isNolink ? "selectSpace/nolink/$id" : "selectSpace/$type.$id/_first"),
+ icon($isNolink ? 'interface-lib' : $type, setClass('text-2xl'), $isNolink ? setStyle('color', $libColors[$id % count($libColors)]) : setClass('text-gray')),
+ div(setClass('font-bold text-clip'), set::title($name), $name),
+ div(setClass('text-gray text-sm'), $count ? sprintf($lang->api->apiTotalInfo, $count) : $lang->api->noApi),
+ $showLibAction ? div
+ (
+ setClass('toolbar absolute top-1 right-1 opacity-0 group-hover:opacity-100'),
+ btn
+ (
+ setClass('doc-space-lib-btn'),
+ set('zui-command', "showHomeItemMenu/$type/$id"),
+ set::icon('ellipsis-v'),
+ set::size('sm'),
+ set::type('ghost')
+ )
+ ) : null
+ )
+ );
+};
+
+$buildProgramItem = function($program) use ($type, $buildLibItem, $lang)
+{
+ $items = array();
+ if($type === 'product' && !empty($program->products))
+ {
+ foreach($program->products as $product) $items[] = $buildLibItem($product->id, $product->name, isset($product->apiCount) ? $product->apiCount : 0);
+ }
+ if($type === 'project' && !empty($program->projects))
+ {
+ foreach($program->projects as $project) $items[] = $buildLibItem($project->id, $project->name, isset($project->apiCount) ? $project->apiCount : 0);
+ }
+ return div
+ (
+ setClass('doc-space-card ring rounded surface-light'),
+ setKey($program->id),
+ div
+ (
+ setClass('row items-center justify-between gap-2 px-2.5 py-1 border-b'),
+ div
+ (
+ setClass('row items-center gap-2 flex-none'),
+ icon('program', setClass('text-gray flex-none')),
+ div(setClass('min-w-0 flex-auto'), strong($program->name)),
+ )
+ ),
+ div
+ (
+ setClass('doc-space-card-libs p-1.5'),
+ empty($items) ? div(setClass('h-24 center text-gray'), $lang->noData) : div(setClass('row flex-wrap'), $items)
+ )
+ );
+};
+
+$filterItems = array();
+foreach($lang->api->homeFilterTypes as $key => $text)
+{
+ $item = array('text' => $text, 'zui-command' => $createCommand(array('type' => $key)));
+ if($key === $type)
+ {
+ $count = $isNolink ? count($libs) : count($programs);
+ $item['active'] = true;
+ $item['badge'] = wg(label(setClass('size-sm canvas ring-0 rounded-md'), $count));
+ }
+ $filterItems[] = $item;
+}
+
+div
+(
+ setKey('header'),
+ setClass('doc-app-header flex-none surface-light row items-center border-b py-1 pl-1 h-10 pr-2 gap-3 flex-none'),
+ nav
+ (
+ setClass('ml-2'),
+ set::compact(),
+ set::items($filterItems)
+ ),
+ checkbox(set::name('notempty'), set::text($lang->api->showNotEmpty), set::checked($notempty)),
+ $type !== 'nolink' ? checkbox(set::name('showclosed'), set::text($lang->api->showClosed), set::checked(!$unclosed)) : null,
+ div(setClass('flex-auto')),
+ (!$isEmpty && $canCreateLib) ? btn
+ (
+ set::icon('plus'),
+ set::type('primary'),
+ set::size('md'),
+ set::text($lang->api->createLib),
+ set('zui-command', "createLib/$type")
+ ) : null,
+ on::change('[type=checkbox]')
+ ->const('notempty', jsRaw('$this.closest(".doc-app-header").find("[name=notempty]:checked").length'))
+ ->const('showclosed', jsRaw('$this.closest(".doc-app-header").find("[name=showclosed]:checked").length'))
+ ->call('loadHome', $type, jsRaw('[notempty ? "notempty" : "", showclosed ? "" : "unclosed"].join("_")'))
+);
+
+$views = array();
+if($isEmpty)
+{
+ $views = div
+ (
+ setKey('empty'),
+ setClass('doc-app-empty h-full center gap-4'),
+ div(setClass('text-gray'), $lang->api->noLib),
+ $canCreateLib ? btn
+ (
+ set::icon('plus'),
+ set::type('primary'),
+ set::text($lang->api->createLib),
+ set('zui-command', "createLib/$type")
+ ) : null
+ );
+}
+elseif($type === 'nolink')
+{
+ foreach($libs as $lib) $views[] = $buildLibItem($lib->id, $lib->name, isset($lib->apiCount) ? $lib->apiCount : 0);
+ $views = div
+ (
+ setClass('doc-space-card-libs'),
+ setStyle('margin', '-8px'),
+ div(setClass('row flex-wrap'), $views)
+ );
+}
+else
+{
+ foreach($programs as $program) $views[] = $buildProgramItem($program);
+}
+
+div
+(
+ setKey('body'),
+ setClass('doc-app-body flex-auto min-h-0 col gap-4 p-4 items-stretch overflow-auto scrollbar-hover no-morph'),
+ $views
+);
+
+if(!$isEmpty)
+{
+ div
+ (
+ setKey('footer'),
+ setClass('doc-app-footer surface-light row items-center border-t py-1.5 px-2'),
+ div(setClass('flex-auto')),
+ pager
+ (
+ set(usePager()),
+ set::useState(),
+ set::onChangePageInfo(jsRaw('(info, event) => {event.preventDefault(); window.loadHome({pager: {recPerPage: info.recPerPage, page: info.page}});}'))
+ )
+ );
+}
diff --git a/module/api/ui/index.html.php b/module/api/ui/index.html.php
index 7aba168b68..238413a773 100644
--- a/module/api/ui/index.html.php
+++ b/module/api/ui/index.html.php
@@ -1,165 +1,52 @@
+ * @author Sun Hao
* @package api
* @link https://www.zentao.net
*/
namespace zin;
-if(empty($libTree))
-{
- featureBar();
- toolbar
- (
- btn
- (
- setClass('btn secondary ml-2'),
- set::icon('plus'),
- set::url(createLink('api', 'createLib', 'type=nolink&objectID=0')),
- setData('toggle', 'modal'),
- $lang->api->createLib
- )
- );
- div
- (
- setClass('canvas text-center py-8'),
- p
- (
- setClass('py-8 my-8'),
- span
- (
- setClass('text-gray'),
- $lang->api->noLib,
- ),
- a
- (
- setClass('btn primary-pale bd-primary ml-0.5'),
- set::href(createLink('api', 'createLib', 'type=nolink&objectID=0')),
- setData('toggle', 'modal'),
- icon('plus'),
- $lang->api->createLib,
- )
- )
- );
- renderPage();
- return;
-}
+$privs = array();
+$privs['collect'] = 'no';
+$privs['createApi'] = hasPriv('api', 'create');
+$privs['exportApi'] = $this->config->edition != 'open' && hasPriv('api', 'export');
+$privs['edit'] = hasPriv('api', 'edit');
+$privs['editApi'] = hasPriv('api', 'edit');
+$privs['view'] = hasPriv('api', 'view');
+$privs['delete'] = hasPriv('api', 'delete');
+$privs['createLib'] = hasPriv('api', 'createLib');
+$privs['editLib'] = hasPriv('api', 'editLib');
+$privs['moveLib'] = hasPriv('api', 'moveLib');
+$privs['sortDoclib'] = hasPriv('doc', 'sortDoclib');
+$privs['deleteLib'] = hasPriv('api', 'deleteLib');
+$privs['createStruct'] = hasPriv('api', 'createStruct');
+$privs['createRelease']= hasPriv('api', 'createRelease');
+$privs['addModule'] = hasPriv('doc', 'addCatalog');
+$privs['deleteModule'] = hasPriv('doc', 'deleteCatalog');
+$privs['editModule'] = hasPriv('doc', 'editCatalog');
+$privs['sortModule'] = hasPriv('doc', 'sortCatalog');
+$privs['releases'] = hasPriv('api', 'releases');
+$privs['struct'] = hasPriv('api', 'struct');
-/* zin: Define the set::module('api') feature bar on main menu. */
-if($app->rawModule == 'api')
-{
- featureBar
- (
- li(searchToggle(set::module('api')))
- );
-
- toolbar
- (
- $libID && common::hasPriv('api', 'struct') ? item(set(array
- (
- 'icon' => 'treemap',
- 'class' => 'ghost',
- 'text' => $lang->api->struct,
- 'url' => createLink('api', 'struct', "libID={$libID}")
- ))) : null,
- $libID && common::hasPriv('api', 'releases') ? item(set(array
- (
- 'icon' => 'version',
- 'class' => 'ghost',
- 'text' => $lang->api->releases,
- 'url' => createLink('api', 'releases', "libID={$libID}"),
- 'data-toggle' => 'modal',
- 'data-class-name' => 'releaseModal'
- ))) : null,
- $libID && common::hasPriv('api', 'createRelease') ? item(set(array
- (
- 'icon' => 'publish',
- 'class' => 'ghost',
- 'text' => $lang->api->createRelease,
- 'url' => createLink('api', 'createRelease', "libID={$libID}"),
- 'data-toggle' => 'modal'
- ))) : null,
- $libID && common::hasPriv('api', 'export') && $config->edition != 'open' ? item(set(array
- (
- 'icon' => 'export',
- 'class' => 'ghost export',
- 'text' => $lang->export,
- 'url' => createLink('api', 'export', "libID={$libID}&version={$version}&release={$release}&moduleID={$moduleID}"),
- 'data-size' => 'sm',
- 'data-toggle' => 'modal'
- ))) : null,
- common::hasPriv('api', 'createLib') ? item(set(array
- (
- 'icon' => 'plus',
- 'class' => 'btn secondary',
- 'text' => $lang->api->createLib,
- 'url' => createLink('api', 'createLib', "type=" . ($objectType ? $objectType : 'nolink') . "&objectID=$objectID"),
- 'data-toggle' => 'modal'
- ))) : null,
- $libID && common::hasPriv('api', 'create') ? item(set(array
- (
- 'icon' => 'plus',
- 'class' => 'btn primary',
- 'text' => $lang->api->createApi,
- 'url' => createLink('api', 'create', "libID={$libID}&moduleID={$moduleID}")
- ))) : null,
- );
-
- include '../../doc/ui/lefttree.html.php';
-}
-
-$list = array();
-foreach($apiList as $api)
-{
- $list[] = h::li
- (
- setClass('list-group-item'),
- div
- (
- setClass("heading {$api->method}"),
- a
- (
- set::href(createLink('api', 'index', "libID={$api->lib}&moduleID=0&apiID={$api->id}&version={$api->version}")),
- span
- (
- setClass('method'),
- $api->method
- ),
- span
- (
- setClass('path'),
- $api->path
- ),
- span
- (
- setClass('desc'),
- $api->title
- )
- )
- )
- );
-}
-
-$delimiter = strpos($app->clientLang, 'zh') === 0 ? '：' : ': ';
-$docContent = panel
+docApp
(
- $lib ? div
- (
- setClass('detail base-url'),
- $lang->api->baseUrl . $delimiter . $lib->baseUrl
- ) : null,
- $lib ? h::hr(setClass('mb-4')) : null,
- div
- (
- setClass('detail'),
- h::ul
- (
- setClass('list-group'),
- $list
- )
- )
+ set::spaceType('api'),
+ set::spaceID($objectType == 'nolink' ? 'nolink' : "$objectType.$objectID"),
+ set::mode($mode),
+ set::pager(array('recTotal' => $recTotal, 'recPerPage' => $recPerPage, 'page' => $pageID)),
+ set::privs($privs),
+ set::docID($apiID),
+ set::libIcon('interface-lib'),
+ set::fetcher(createLink('api', 'ajaxGetData', 'spaceID={spaceID}&picks={picks}')),
+ set::docFetcher(null),
+ set::libSummariesFetcher(null),
+ set::maxHomeLibsOfSpace(0),
+ set::params($params),
+ set::autoSelectLib(),
+ set::fetchOnChangeSpace(),
+ set('$options', jsRaw('window.setDocAppOptions'))
);
diff --git a/module/api/ui/releases.html.php b/module/api/ui/releases.html.php
index 55d422ba1c..70cc354b02 100644
--- a/module/api/ui/releases.html.php
+++ b/module/api/ui/releases.html.php
@@ -12,17 +12,21 @@ namespace zin;
set::title($lang->api->releases);
-$releases = initTableData($releases, $config->api->dtable->release->fieldList, $this->api);
+$releases = initTableData($releases, $config->api->dtable->release->fieldList, $this->api);
+$footerInfo = empty($releases) ? $lang->pager->noRecord : str_replace('{recTotal}', '' . count($releases), $lang->pager->totalCountAB);
-dtable
+div
(
- setStyle('overflow-y', 'hidden'),
- set::extraHeight('+144'),
- set::cols(array_values($config->api->dtable->release->fieldList)),
- set::data(array_values($releases)),
- set::userMap($users),
- set::orderBy($orderBy),
- set::sortLink(inlink('releases', "libID={$libID}&orderBy={name}_{sortType}"))
+ dtable
+ (
+ set::_className(''),
+ set::cols(array_values($config->api->dtable->release->fieldList)),
+ set::data(array_values($releases)),
+ set::userMap($users),
+ set::orderBy($orderBy),
+ set::footer($footerInfo),
+ set::loadPartial(),
+ set::sortLink(inlink('releases', "libID={$libID}&orderBy={name}_{sortType}")),
+ set::loadOptions(array('zui-command' => 'updateLazyContent'))
+ ),
);
-
-render();
diff --git a/module/api/ui/struct.html.php b/module/api/ui/struct.html.php
index 0dc8237846..96cac66d64 100644
--- a/module/api/ui/struct.html.php
+++ b/module/api/ui/struct.html.php
@@ -10,35 +10,20 @@ declare(strict_types=1);
*/
namespace zin;
-featureBar
-(
- li(backBtn(setClass('ghost'), set::icon('back'), $lang->goback)),
- div(setClass('divider')),
- li
- (
- set::className('nav-item'),
- $lang->struct->list
- )
-);
-
-toolbar
-(
- hasPriv('api', 'createStruct') ? item(set(array
- (
- 'icon' => 'plus',
- 'text' => $lang->api->createStruct,
- 'class' => 'primary',
- 'url' => createLink('api', 'createStruct', "libID=$libID"),
- ))) : null
-);
-
$structs = initTableData($structs, $config->api->dtable->struct->fieldList, $this->api);
$cols = array_values($config->api->dtable->struct->fieldList);
$data = array_values($structs);
-dtable
+
+div
(
- set::cols($cols),
- set::data($data),
- set::userMap($users),
- set::footPager(usePager())
+ dtable
+ (
+ set::_className(''),
+ set::cols($cols),
+ set::data($data),
+ set::userMap($users),
+ set::footPager(usePager()),
+ set::loadPartial(),
+ set::loadOptions(array('zui-command' => 'updateLazyContent', 'data-lazy-target' => '#table-api-struct'))
+ ),
);
diff --git a/module/api/ui/view.html.php b/module/api/ui/view.html.php
index 03e5858a2b..ddb0e6f361 100644
--- a/module/api/ui/view.html.php
+++ b/module/api/ui/view.html.php
@@ -10,18 +10,6 @@ declare(strict_types=1);
*/
namespace zin;
-include '../../doc/ui/lefttree.html.php';
-
-$versionList = array();
-for($itemVersion = $api->version; $itemVersion > 0; $itemVersion--)
-{
- $link = createLink('api', 'index', "libID={$libID}&moduleID=$moduleID&apiID={$apiID}&version={$itemVersion}");
- $versionList[] = array(
- 'text' => "V$itemVersion",
- 'onClick' => jsRaw("() => {loadPage('$link', '#docContent')}")
- );
-}
-
$apiHeader = $apiQuery = $apiParams = $apiResponse = array();
$parseTree = function($data, $typeList, $level = 0) use(&$parseTree)
{
@@ -146,157 +134,25 @@ if($api->response)
);
}
-featureBar
-(
- li(backBtn(setClass('ghost'), set::icon('back'), $lang->goback))
-);
-
-toolbar
-(
- $libID && common::hasPriv('api', 'struct') ? item(set(array
- (
- 'icon' => 'treemap',
- 'class' => 'ghost',
- 'text' => $lang->api->struct,
- 'url' => createLink('api', 'struct', "libID={$libID}")
- ))) : null,
- $libID && common::hasPriv('api', 'releases') ? item(set(array
- (
- 'icon' => 'version',
- 'class' => 'ghost',
- 'text' => $lang->api->releases,
- 'url' => createLink('api', 'releases', "libID={$libID}"),
- 'data-toggle' => 'modal'
- ))) : null,
- $libID && common::hasPriv('api', 'createRelease') ? item(set(array
- (
- 'icon' => 'publish',
- 'class' => 'ghost',
- 'text' => $lang->api->createRelease,
- 'url' => createLink('api', 'createRelease', "libID={$libID}"),
- 'data-toggle' => 'modal'
- ))) : null,
- $libID && common::hasPriv('api', 'export') && $config->edition != 'open' ? item(set(array
- (
- 'icon' => 'export',
- 'class' => 'ghost export',
- 'text' => $lang->export,
- 'url' => createLink('api', 'export', "libID={$libID}&version={$version}&release={$release}&moduleID={$moduleID}"),
- 'data-size' => 'sm',
- 'data-toggle' => 'modal'
- ))) : null,
- common::hasPriv('api', 'createLib') ? item(set(array
- (
- 'icon' => 'plus',
- 'class' => 'btn secondary',
- 'text' => $lang->api->createLib,
- 'url' => createLink('api', 'createLib', "type=" . ($objectType ? $objectType : 'nolink') . "&objectID=$objectID"),
- 'data-toggle' => 'modal'
- ))) : null,
- $libID && common::hasPriv('api', 'create') ? item(set(array
- (
- 'icon' => 'plus',
- 'class' => 'btn primary ml-2',
- 'text' => $lang->api->createApi,
- 'url' => createLink('api', 'create', "libID={$libID}&moduleID={$moduleID}"),
- 'data-size' => 'lg',
- 'data-toggle' => $spaceType != 'api' ? 'modal' : ''
- ))) : null
-);
div
(
- setID('docContent'),
- setClass('flex flex-wrap content-start'),
+ setID('api-content'),
+ setClass('article'),
div
(
- setClass('doc-content flex-initial w-full flex'),
- panel
- (
- setClass('flex-auto'),
- div
- (
- setClass('panel-heading'),
- div
- (
- setClass('http-method label'),
- $api->method
- ),
- div
- (
- setClass('path'),
- $api->path
- ),
- dropdown
- (
- btn
- (
- setClass('ghost btn square btn-default'),
- 'V' . ($version ? $version : $api->version)
- ),
- set::items($versionList)
- ),
- div
- (
- setClass('panel-actions'),
- div
- (
- setClass('toolbar'),
- btn
- (
- set::url('javascript:fullScreen()'),
- setClass('btn ghost'),
- icon('fullscreen')
- ),
- (!$isRelease && common::hasPriv('api', 'edit')) ? btn
- (
- set::url(createLink('api', 'edit', "apiID=$api->id")),
- setClass('btn ghost'),
- icon('edit')
- ) : null,
- (!$isRelease && common::hasPriv('api', 'delete')) ? btn
- (
- set::url(createLink('api', 'delete', "apiID=$api->id")),
- setClass('btn ghost ajax-submit'),
- setData(array('confirm' => $lang->api->confirmDelete)),
- icon('trash')
- ) : null,
- btn
- (
- setID('hisTrigger'),
- setClass('btn ghost'),
- icon('clock'),
- set('data-on', 'click'),
- set('data-call', 'showHistory')
- )
- )
- )
- ),
- div
- (
- setClass('panel-body'),
- setID('content'),
- h2($api->title),
- div(setClass('desc'), html($api->desc)),
- $apiHeader,
- $apiQuery,
- $apiParams,
- $api->paramsExample ? h3($lang->api->paramsExample) : null,
- $api->paramsExample ? html("" . $api->paramsExample . "
") : null,
- $apiResponse,
- $api->responseExample ? h3($lang->api->responseExample) : null,
- $api->responseExample ? html("" . $api->responseExample . "
") : null
- )
- ),
- panel
- (
- setID('history'),
- setClass('hidden'),
- history
- (
- set::objectID($api->id),
- set::objectType('api')
- )
- )
- )
+ setClass("api-list-item row items-center mb-1 gap-2 flex-auto is-$api->method rounded"),
+ div(setClass('font-mono w-14 text-center api-method py-1 rounded rounded-r-none'), $api->method),
+ div(setClass('font-mono font-bold text-md api-path'), $api->path)
+ ),
+ h2($api->title),
+ div(setClass('desc'), html($api->desc)),
+ $apiHeader,
+ $apiQuery,
+ $apiParams,
+ $api->paramsExample ? h3($lang->api->paramsExample) : null,
+ $api->paramsExample ? html("" . $api->paramsExample . "
") : null,
+ $apiResponse,
+ $api->responseExample ? h3($lang->api->responseExample) : null,
+ $api->responseExample ? html("" . $api->responseExample . "
") : null
);
diff --git a/module/backup/config.php b/module/backup/config.php
index 4cec28e064..f0026cc970 100644
--- a/module/backup/config.php
+++ b/module/backup/config.php
@@ -1,4 +1,3 @@
backup = new stdclass();
$config->backup->holdDays = 14;
$config->backup->setting = '';
diff --git a/module/bi/config/metrics.php b/module/bi/config/metrics.php
index cad5a594bc..f55f0fdbc1 100644
--- a/module/bi/config/metrics.php
+++ b/module/bi/config/metrics.php
@@ -2705,7 +2705,7 @@ $config->bi->builtin->metrics[] = array
$config->bi->builtin->metrics[] = array
(
- 'name' => '按产品统计的月度解决Bug数',
+ 'name' => '按产品统计的月度修复Bug数',
'alias' => '解决Bug数',
'code' => 'count_of_monthly_fixed_bug_in_product',
'purpose' => 'scale',
@@ -2713,8 +2713,8 @@ $config->bi->builtin->metrics[] = array
'object' => 'bug',
'unit' => 'count',
'dateType' => 'month',
- 'desc' => '按产品统计的月度解决Bug数是指每天在产品开发过程中被解决并关闭的Bug的数量。该度量项可以帮助我们了解开发团队解决Bug的速度和效率。',
- 'definition' => "产品中Bug个数求和\n解决日期为某年某月\n过滤已删除的Bug\n过滤已删除的产品"
+ 'desc' => '按产品统计的月度修复Bug数是指每天在产品开发过程中被解决并关闭的Bug的数量。该度量项可以帮助我们了解开发团队解决Bug的速度和效率。',
+ 'definition' => "产品中Bug的个数求和\n关闭时间为某年某月\n解决方案为已解决\n过滤已删除的Bug\n过滤已删除的产品\n",
);
$config->bi->builtin->metrics[] = array
@@ -4665,14 +4665,42 @@ $config->bi->builtin->metrics[] = array
$config->bi->builtin->metrics[] = array
(
- 'name' => '按项目统计的月度解决Bug数',
- 'alias' => '解决Bug数',
+ 'name' => '按项目统计的月度修复Bug数',
+ 'alias' => '修复Bug数',
'code' => 'count_of_monthly_fixed_bug_in_project',
'purpose' => 'scale',
'scope' => 'project',
'object' => 'bug',
'unit' => 'count',
'dateType' => 'month',
- 'desc' => '按项目统计的月度解决Bug数是指每天在项目开发过程中被解决并关闭的Bug的数量。该度量项可以帮助我们了解开发团队解决Bug的速度和效率。',
- 'definition' => "项目中创建时间在某年某月的Bug个数求和\n过滤已删除的Bug\n过滤已删除的项目\n",
+ 'desc' => '按项目统计的月度修复Bug数是指每月在项目开发过程中被解决并关闭的Bug的数量。该度量项可以帮助我们了解开发团队解决Bug的速度和效率。',
+ 'definition' => "项目中Bug的个数求和\n关闭时间为某年某月\n解决方案为已解决\n过滤已删除的Bug\n过滤已删除的项目\n",
+);
+
+$config->bi->builtin->metrics[] = array
+(
+ 'name' => '按项目统计的年度修复Bug数',
+ 'alias' => '修复Bug数',
+ 'code' => 'count_of_annual_fixed_bug_in_project',
+ 'purpose' => 'scale',
+ 'scope' => 'project',
+ 'object' => 'bug',
+ 'unit' => 'count',
+ 'dateType' => 'year',
+ 'desc' => '按项目统计的年度修复Bug数是指在某年度解决并关闭的Bug数量。这个度量项反映了项目在某年度解决的问题数量。年度修复Bug数越多可能说明开发团队在Bug解决方面的工作效率较高。',
+ 'definition' => "项目中Bug的个数求和\n关闭时间为某年\n解决方案为已解决\n过滤已删除的Bug\n过滤已删除的项目\n",
+);
+
+$config->bi->builtin->metrics[] = array
+(
+ 'name' => '按项目统计的年度新增有效Bug数',
+ 'alias' => '新增有效Bug数',
+ 'code' => 'count_of_annual_created_effective_bug_in_project',
+ 'purpose' => 'scale',
+ 'scope' => 'project',
+ 'object' => 'bug',
+ 'unit' => 'count',
+ 'dateType' => 'year',
+ 'desc' => '按项目统计的年度新增有效Bug数是指项目在某年度新发现的真正具有影响和价值的Bug数量。有效Bug通常是指导致项目不正常运行或影响用户体验的Bug。统计有效Bug数可以帮助评估项目的稳定性和质量也可以评估测试人员之前的协作或对项目的了解程度。',
+ 'definition' => "项目中Bug个数求和\n创建时间为某年\n解决方案为已解决和延期处理或者状态为激活\n过滤已删除的Bug\n过滤已删除的项目\n",
);
diff --git a/module/bi/lang/de.php b/module/bi/lang/de.php
index dcaa519f42..7dbbfffa00 100644
--- a/module/bi/lang/de.php
+++ b/module/bi/lang/de.php
@@ -8,6 +8,7 @@ $lang->bi->driver = 'Driver';
$lang->bi->driverList = array();
$lang->bi->driverList['mysql'] = 'MySQL';
+$lang->bi->query = 'Query';
$lang->bi->sqlQuery = 'SQL statements query';
$lang->bi->sqlBuilder = 'SQL builder';
$lang->bi->dictionary = 'Data Dictionary';
diff --git a/module/bi/lang/en.php b/module/bi/lang/en.php
index 1b1b588aa7..9e0664ca4f 100644
--- a/module/bi/lang/en.php
+++ b/module/bi/lang/en.php
@@ -8,6 +8,7 @@ $lang->bi->driver = 'Driver';
$lang->bi->driverList = array();
$lang->bi->driverList['mysql'] = 'MySQL';
+$lang->bi->query = 'Query';
$lang->bi->sqlQuery = 'SQL statements query';
$lang->bi->sqlBuilder = 'SQL builder';
$lang->bi->dictionary = 'Data Dictionary';
diff --git a/module/bi/lang/fr.php b/module/bi/lang/fr.php
index 299e60c614..e15fce62c1 100644
--- a/module/bi/lang/fr.php
+++ b/module/bi/lang/fr.php
@@ -8,6 +8,7 @@ $lang->bi->driver = 'Driver';
$lang->bi->driverList = array();
$lang->bi->driverList['mysql'] = 'MySQL';
+$lang->bi->query = 'Query';
$lang->bi->sqlQuery = 'SQL statements query';
$lang->bi->sqlBuilder = 'SQL builder';
$lang->bi->dictionary = 'Data Dictionary';
diff --git a/module/bi/lang/zh-cn.php b/module/bi/lang/zh-cn.php
index f1bb85a85e..ee27df30e0 100644
--- a/module/bi/lang/zh-cn.php
+++ b/module/bi/lang/zh-cn.php
@@ -8,6 +8,7 @@ $lang->bi->driver = '数据库类型';
$lang->bi->driverList = array();
$lang->bi->driverList['mysql'] = 'MySQL';
+$lang->bi->query = '查询';
$lang->bi->sqlQuery = 'SQL语句查询';
$lang->bi->sqlBuilder = 'SQL构建器';
$lang->bi->dictionary = '数据字典';
diff --git a/module/block/js/assigntomeblock.ui.js b/module/block/js/assigntomeblock.ui.js
index 84577319d0..41da6c628a 100644
--- a/module/block/js/assigntomeblock.ui.js
+++ b/module/block/js/assigntomeblock.ui.js
@@ -59,6 +59,8 @@ window.renderCell = function(result, info)
result[0] = {html: '' + info.row.data.title + ''};
}
+ if(info.col.name == 'title' && info.row.data.module == 'attend') result[0] = {html: '' + result[0].props.children + ''};
+
return result;
}
diff --git a/module/block/zen.php b/module/block/zen.php
index 244ae20593..96659465ce 100644
--- a/module/block/zen.php
+++ b/module/block/zen.php
@@ -1587,8 +1587,17 @@ class blockZen extends block
$count = isset($block->params->count) ? (int)$block->params->count : 0;
/* 测试统计是按产品分组统计的。 */
- $products = $this->loadModel('product')->getOrderedProducts($status, $count, 0, 'all');
+ $products = $this->loadModel('product')->getOrderedProducts($status, $count, 0, 'all');
+ $shadowProductList = array();
+ foreach($products as $productID => $product) if($product->shadow) $shadowProductList[] = $productID;
+ $productProject = $this->dao->select('t1.product, t1.project')->from(TABLE_PROJECTPRODUCT)->alias('t1')
+ ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
+ ->where('t1.product')->in(array_values($shadowProductList))
+ ->andWhere('t2.type')->eq('project')
+ ->fetchPairs();
+
$productIdList = array_keys($products);
+ $projectIdList = array_values($productProject);
/* 计算昨日和今日可能包含的日期情况。 */
$years = array();
@@ -1600,18 +1609,35 @@ class blockZen extends block
}
$this->loadModel('metric');
- $createdBugGroup = $this->metric->getResultByCodeWithArray('count_of_daily_created_bug_in_product', array('product' => join(',', $productIdList), 'year' => join(',', $years), 'month' => join(',', $months)), 'cron'); // 获取昨日和今日新增的Bug数。
- $resolvedBugGroup = $this->metric->getResultByCodeWithArray('count_of_daily_resolved_bug_in_product', array('product' => join(',', $productIdList), 'year' => join(',', $years), 'month' => join(',', $months)), 'cron'); // 获取昨日和今日解决的Bug数。
- $closedBugGroup = $this->metric->getResultByCodeWithArray('count_of_daily_closed_bug_in_product', array('product' => join(',', $productIdList), 'year' => join(',', $years), 'month' => join(',', $months)), 'cron'); // 获取昨日和今日关闭的Bug数。
- $bugFixRate = $this->metric->getResultByCodeWithArray('rate_of_fixed_bug_in_product', array('product' => join(',', $productIdList)), 'cron'); // 获取Bug修复率。
- $effectiveBug = $this->metric->getResultByCodeWithArray('count_of_effective_bug_in_product', array('product' => join(',', $productIdList)), 'cron'); // 获取有效Bug总数。
- $fixedBug = $this->metric->getResultByCodeWithArray('count_of_fixed_bug_in_product', array('product' => join(',', $productIdList)), 'cron'); // 获取Bug修复数。
- $activatedBug = $this->metric->getResultByCodeWithArray('count_of_activated_bug_in_product', array('product' => join(',', $productIdList)), 'cron'); // 获取Bug激活数。
+ $createdBugGroup = $this->metric->getResultByCodeWithArray('count_of_daily_created_bug_in_product', array('product' => join(',', $productIdList), 'year' => join(',', $years), 'month' => join(',', $months)), 'cron'); // 获取昨日和今日新增的Bug数。
+ $shadowCreatedBugGroup = $this->metric->getResultByCodeWithArray('count_of_daily_created_bug_in_project', array('project' => join(',', $projectIdList), 'year' => join(',', $years), 'month' => join(',', $months)), 'cron'); // 获取昨日和今日新增的Bug数。
- if(!empty($bugFixRate)) $bugFixRate = array_column($bugFixRate, null, 'product');
- if(!empty($effectiveBug)) $effectiveBug = array_column($effectiveBug, null, 'product');
- if(!empty($fixedBug)) $fixedBug = array_column($fixedBug, null, 'product');
- if(!empty($activatedBug)) $activatedBug = array_column($activatedBug, null, 'product');
+ $resolvedBugGroup = $this->metric->getResultByCodeWithArray('count_of_daily_resolved_bug_in_product', array('product' => join(',', $productIdList), 'year' => join(',', $years), 'month' => join(',', $months)), 'cron'); // 获取昨日和今日解决的Bug数。
+ $shadowResolvedBugGroup = $this->metric->getResultByCodeWithArray('count_of_daily_resolved_bug_in_project', array('project' => join(',', $projectIdList), 'year' => join(',', $years), 'month' => join(',', $months)), 'cron'); // 获取影子产品昨日和今日解决的Bug数。
+
+ $closedBugGroup = $this->metric->getResultByCodeWithArray('count_of_daily_closed_bug_in_product', array('product' => join(',', $productIdList), 'year' => join(',', $years), 'month' => join(',', $months)), 'cron'); // 获取昨日和今日关闭的Bug数。
+ $shadowClosedBugGroup = $this->metric->getResultByCodeWithArray('count_of_daily_closed_bug_in_project', array('project' => join(',', $projectIdList), 'year' => join(',', $years), 'month' => join(',', $months)), 'cron'); // 获取影子产品昨日和今日关闭的Bug数。
+
+ $bugFixRate = $this->metric->getResultByCodeWithArray('rate_of_fixed_bug_in_product', array('product' => join(',', $productIdList)), 'cron'); // 获取Bug修复率。
+ $shadowBugFixRate = $this->metric->getResultByCodeWithArray('rate_of_fixed_bug_in_project', array('project' => join(',', $projectIdList)), 'cron'); // 获取影子产品Bug修复率。
+
+ $effectiveBug = $this->metric->getResultByCodeWithArray('count_of_effective_bug_in_product', array('product' => join(',', $productIdList)), 'cron'); // 获取有效Bug总数。
+ $shadowEffectiveBug = $this->metric->getResultByCodeWithArray('count_of_effective_bug_in_project', array('project' => join(',', $projectIdList)), 'cron'); // 获取影子产品有效Bug总数。
+
+ $fixedBug = $this->metric->getResultByCodeWithArray('count_of_fixed_bug_in_product', array('product' => join(',', $productIdList)), 'cron'); // 获取Bug修复数。
+ $shadowFixedBug = $this->metric->getResultByCodeWithArray('count_of_fixed_bug_in_project', array('project' => join(',', $projectIdList)), 'cron'); // 获取影子产品Bug修复数。
+
+ $activatedBug = $this->metric->getResultByCodeWithArray('count_of_activated_bug_in_product', array('product' => join(',', $productIdList)), 'cron'); // 获取Bug激活数。
+ $shadowActivatedBug = $this->metric->getResultByCodeWithArray('count_of_activated_bug_in_project', array('project' => join(',', $projectIdList)), 'cron'); // 获取影子产品Bug激活数。
+
+ if(!empty($bugFixRate)) $bugFixRate = array_column($bugFixRate, null, 'product');
+ if(!empty($shadowBugFixRate)) $shadowBugFixRate = array_column($shadowBugFixRate, null, 'project');
+ if(!empty($effectiveBug)) $effectiveBug = array_column($effectiveBug, null, 'product');
+ if(!empty($shadowEffectiveBug)) $shadowEffectiveBug = array_column($shadowEffectiveBug, null, 'project');
+ if(!empty($fixedBug)) $fixedBug = array_column($fixedBug, null, 'product');
+ if(!empty($shadowFixedBug)) $shadowFixedBug = array_column($shadowFixedBug, null, 'project');
+ if(!empty($activatedBug)) $activatedBug = array_column($activatedBug, null, 'product');
+ if(!empty($shadowActivatedBug)) $shadowActivatedBug = array_column($shadowActivatedBug, null, 'project');
$productIdList = array_keys($products);
$unclosedTesttasks = $this->dao->select('product,id,name')->from(TABLE_TESTTASK)
@@ -1625,47 +1651,65 @@ class blockZen extends block
/* 将获取出的度量项数据塞入产品列表数据中。 */
foreach($products as $productID => $product)
{
+ $isShadow = $product->shadow;
+ $useObjectID = !$isShadow ? $productID : (isset($productProject[$productID]) ? $productProject[$productID] : $productID); // 如果是影子产品，用项目查询
+ $useDataKey = !$isShadow ? 'product' : 'project';
+
$product->addToday = 0;
$product->addYesterday = 0;
$product->resolvedToday = 0;
$product->resolvedYesterday = 0;
$product->closedToday = 0;
$product->closedYesterday = 0;
- if(!empty($createdBugGroup))
+
+ $useCreatedBug = !$isShadow ? 'createdBugGroup' : 'shadowCreatedBugGroup';
+ if(!empty($$useCreatedBug))
{
- foreach($createdBugGroup as $data)
+ foreach($$useCreatedBug as $data)
{
+ $objectEQ = $useObjectID == $data[$useDataKey];
$currentDay = "{$data['year']}-{$data['month']}-{$data['day']}";
- if($currentDay == date('Y-m-d') && $productID == $data['product']) $product->addToday = $data['value'];
- if($currentDay == date('Y-m-d', strtotime("-1 day")) && $productID == $data['product']) $product->addYesterday = $data['value'];
+ if($currentDay == date('Y-m-d') && $objectEQ) $product->addToday = $data['value'];
+ if($currentDay == date('Y-m-d', strtotime("-1 day")) && $objectEQ) $product->addYesterday = $data['value'];
}
}
- if(!empty($resolvedBugGroup))
+ $useResolvedBug = !$isShadow ? 'resolvedBugGroup' : 'shadowResolvedBugGroup';
+ if(!empty($$useResolvedBug))
{
- foreach($resolvedBugGroup as $data)
+ foreach($$useResolvedBug as $data)
{
+ $objectEQ = $useObjectID == $data[$useDataKey];
+
$currentDay = "{$data['year']}-{$data['month']}-{$data['day']}";
- if($currentDay == date('Y-m-d') && $productID == $data['product']) $product->resolvedToday = $data['value'];
- if($currentDay == date('Y-m-d', strtotime("-1 day")) && $productID == $data['product']) $product->resolvedYesterday = $data['value'];
+ if($currentDay == date('Y-m-d') && $objectEQ) $product->resolvedToday = $data['value'];
+ if($currentDay == date('Y-m-d', strtotime("-1 day")) && $objectEQ) $product->resolvedYesterday = $data['value'];
}
}
- if(!empty($closedBugGroup))
+ $useClosedBug = !$isShadow ? 'closedBugGroup' : 'shadowClosedBugGroup';
+ if(!empty($$useClosedBug))
{
- foreach($closedBugGroup as $data)
+ foreach($$useClosedBug as $data)
{
+ $objectEQ = $useObjectID == $data[$useDataKey];
+
$currentDay = "{$data['year']}-{$data['month']}-{$data['day']}";
- if($currentDay == date('Y-m-d') && $productID == $data['product']) $product->closedToday = $data['value'];
- if($currentDay == date('Y-m-d', strtotime("-1 day")) && $productID == $data['product']) $product->closedYesterday = $data['value'];
+ if($currentDay == date('Y-m-d') && $objectEQ) $product->closedToday = $data['value'];
+ if($currentDay == date('Y-m-d', strtotime("-1 day")) && $objectEQ) $product->closedYesterday = $data['value'];
}
}
- $product->fixedBugRate = isset($bugFixRate[$productID]['value']) ? $bugFixRate[$productID]['value'] * 100 : 0;
- $product->totalBug = isset($effectiveBug[$productID]['value']) ? $effectiveBug[$productID]['value'] : 0;
- $product->fixedBug = isset($fixedBug[$productID]['value']) ? $fixedBug[$productID]['value'] : 0;
- $product->activatedBug = isset($activatedBug[$productID]['value']) ? $activatedBug[$productID]['value'] : 0;
- $product->unclosedTesttasks = isset($unclosedTesttasks[$productID]) ? $unclosedTesttasks[$productID] : '';
+ $useBugFixRate = !$isShadow ? 'bugFixRate' : 'shadowBugFixRate';
+ $useEffectiveBug = !$isShadow ? 'effectiveBug' : 'shadowEffectiveBug';
+ $useFixedBug = !$isShadow ? 'fixedBug' : 'shadowFixedBug';
+ $useActivatedBug = !$isShadow ? 'activatedBug' : 'shadowActivatedBug';
+
+ $product->fixedBugRate = isset($$useBugFixRate[$useObjectID]['value']) ? $$useBugFixRate[$useObjectID]['value'] * 100 : 0;
+ $product->totalBug = isset($$useEffectiveBug[$useObjectID]['value']) ? $$useEffectiveBug[$useObjectID]['value'] : 0;
+ $product->fixedBug = isset($$useFixedBug[$useObjectID]['value']) ? $$useFixedBug[$useObjectID]['value'] : 0;
+ $product->activatedBug = isset($$useActivatedBug[$useObjectID]['value']) ? $$useActivatedBug[$useObjectID]['value'] : 0;
+ $product->unclosedTesttasks = isset($unclosedTesttasks[$productID]) ? $unclosedTesttasks[$productID] : '';
}
$this->view->products = $products;
@@ -2696,16 +2740,32 @@ class blockZen extends block
$productID = !empty($params['active']) ? $params['active'] : key($products);
if(empty($productID)) $productID = 0;
+ $isShadow = $productID ? (bool)$products[$productID]->shadow : false;
+ $projectID = $isShadow ? $this->dao->select('project')->from(TABLE_PROJECTPRODUCT)->where('product')->eq($productID)->fetch('project') : 0;
+ $useObjectID = $isShadow ? $projectID : $productID;
+ $useDataKey = $isShadow ? 'project' : 'product';
+
$this->loadModel('metric');
$bugFixedRate = $this->metric->getResultByCodeWithArray('rate_of_fixed_bug_in_product', array('product' => $productID), 'cron'); // 从度量项获取各个产品的Bug修复率。
- $effectiveBugGroup = $this->metric->getResultByCodeWithArray('count_of_effective_bug_in_product', array('product' => $productID), 'cron'); // 从度量项获取各个产品的有效Bug数。
- $fixedBugGroup = $this->metric->getResultByCodeWithArray('count_of_fixed_bug_in_product', array('product' => $productID), 'cron'); // 从度量项获取各个产品的Bug修复数。
- $activatedBugGroup = $this->metric->getResultByCodeWithArray('count_of_activated_bug_in_product', array('product' => $productID), 'cron'); // 从度量项获取各个产品的Bug激活数。
+ $shadowBugFixRate = $this->metric->getResultByCodeWithArray('rate_of_fixed_bug_in_project', array('project' => $projectID), 'cron'); // 获取影子产品Bug修复率。
- if(!empty($bugFixedRate)) $bugFixedRate = array_column($bugFixedRate, null, 'product');
- if(!empty($effectiveBugGroup)) $effectiveBugGroup = array_column($effectiveBugGroup, null, 'product');
- if(!empty($fixedBugGroup)) $fixedBugGroup = array_column($fixedBugGroup, null, 'product');
- if(!empty($activatedBugGroup)) $activatedBugGroup = array_column($activatedBugGroup, null, 'product');
+ $effectiveBugGroup = $this->metric->getResultByCodeWithArray('count_of_effective_bug_in_product', array('product' => $productID), 'cron'); // 从度量项获取各个产品的有效Bug数。
+ $shadowEffectiveBug = $this->metric->getResultByCodeWithArray('count_of_effective_bug_in_project', array('project' => $projectID), 'cron'); // 获取影子产品有效Bug总数。
+
+ $fixedBugGroup = $this->metric->getResultByCodeWithArray('count_of_fixed_bug_in_product', array('product' => $productID), 'cron'); // 从度量项获取各个产品的Bug修复数。
+ $shadowFixedBugGroup = $this->metric->getResultByCodeWithArray('count_of_fixed_bug_in_project', array('project' => $projectID), 'cron'); // 获取影子产品Bug修复数。
+
+ $activatedBugGroup = $this->metric->getResultByCodeWithArray('count_of_activated_bug_in_product', array('product' => $productID), 'cron'); // 从度量项获取各个产品的Bug激活数。
+ $shadowActivatedBugGroup = $this->metric->getResultByCodeWithArray('count_of_activated_bug_in_project', array('project' => $projectID), 'cron'); // 获取影子产品Bug激活数。
+
+ if(!empty($bugFixedRate)) $bugFixedRate = array_column($bugFixedRate, null, 'product');
+ if(!empty($shadowBugFixRate)) $shadowBugFixRate = array_column($shadowBugFixRate, null, 'project');
+ if(!empty($effectiveBugGroup)) $effectiveBugGroup = array_column($effectiveBugGroup, null, 'product');
+ if(!empty($shadowEffectiveBug)) $shadowEffectiveBug = array_column($shadowEffectiveBug, null, 'project');
+ if(!empty($fixedBugGroup)) $fixedBugGroup = array_column($fixedBugGroup, null, 'product');
+ if(!empty($shadowFixedBugGroup)) $shadowFixedBugGroup = array_column($shadowFixedBugGroup, null, 'project');
+ if(!empty($activatedBugGroup)) $activatedBugGroup = array_column($activatedBugGroup, null, 'product');
+ if(!empty($shadowActivatedBugGroup)) $shadowActivatedBugGroup = array_column($shadowActivatedBugGroup, null, 'project');
/* 按照产品和日期分组获取产品每月新增和完成的需求数度量项。 */
$years = array();
@@ -2718,33 +2778,43 @@ class blockZen extends block
$dates[] = date('Y-m', strtotime("first day of -{$i} month"));
}
- $monthCreatedBugGroup = $this->metric->getResultByCodeWithArray('count_of_monthly_created_bug_in_product', array('product' => $productID, 'year' => join(',', $years), 'month' => join(',', $months)), 'cron'); // 从度量项获取每月的激活Bug数。
- $monthClosedBugGroup = $this->metric->getResultByCodeWithArray('count_of_monthly_closed_bug_in_product', array('product' => $productID, 'year' => join(',', $years), 'month' => join(',', $months)), 'cron'); // 从度量项获取每月的关闭Bug数。
+ $monthCreatedBugGroup = $this->metric->getResultByCodeWithArray('count_of_monthly_created_bug_in_product', array('product' => $productID, 'year' => join(',', $years), 'month' => join(',', $months)), 'cron'); // 从度量项获取每月的激活Bug数。
+ $shadowMonthCreatedBugGroup = $this->metric->getResultByCodeWithArray('count_of_monthly_created_bug_in_project', array('project' => $projectID, 'year' => join(',', $years), 'month' => join(',', $months)), 'cron'); // 从度量项获取每月的激活Bug数。
+ $monthClosedBugGroup = $this->metric->getResultByCodeWithArray('count_of_monthly_closed_bug_in_product', array('product' => $productID, 'year' => join(',', $years), 'month' => join(',', $months)), 'cron'); // 从度量项获取每月的关闭Bug数。
+ $shadowMonthClosedBugGroup = $this->metric->getResultByCodeWithArray('count_of_monthly_closed_bug_in_project', array('project' => $projectID, 'year' => join(',', $years), 'month' => join(',', $months)), 'cron'); // 从度量项获取每月的关闭Bug数。
/* 组装页面所需的度量项数组。 */
- $closedBugs = isset($fixedBugGroup[$productID]['value']) ? $fixedBugGroup[$productID]['value'] : 0;
- $unresovledBugs = isset($activatedBugGroup[$productID]['value']) ? $activatedBugGroup[$productID]['value'] : 0;
- $totalBugs = isset($effectiveBugGroup[$productID]['value']) ? $effectiveBugGroup[$productID]['value'] : 0;
- $resolvedRate = isset($bugFixedRate[$productID]['value']) ? $bugFixedRate[$productID]['value'] * 100 : 0;
+ $useClosedBug = $isShadow ? 'shadowFixedBugGroup' : 'fixedBugGroup';
+ $useUnresovledBugs = $isShadow ? 'shadowActivatedBugGroup' : 'activatedBugGroup';
+ $useTotalBugs = $isShadow ? 'shadowEffectiveBug' : 'effectiveBugGroup';
+ $useResolvedRate = $isShadow ? 'shadowBugFixRate' : 'bugFixedRate';
+
+ $closedBugs = isset($$useClosedBug[$useObjectID]['value']) ? $$useClosedBug[$useObjectID]['value'] : 0;
+ $unresovledBugs = isset($$useUnresovledBugs[$useObjectID]['value']) ? $$useUnresovledBugs[$useObjectID]['value'] : 0;
+ $totalBugs = isset($$useTotalBugs[$useObjectID]['value']) ? $$useTotalBugs[$useObjectID]['value'] : 0;
+ $resolvedRate = isset($$useResolvedRate[$useObjectID]['value']) ? $$useResolvedRate[$useObjectID]['value'] * 100 : 0;
+
+ $useMonthCreate = $isShadow ? 'shadowMonthCreatedBugGroup' : 'monthCreatedBugGroup';
+ $useMonthClose = $isShadow ? 'shadowMonthClosedBugGroup' : 'monthClosedBugGroup';
foreach($dates as $date)
{
$activateBugs[$date] = 0;
$resolveBugs[$date] = 0;
$closeBugs[$date] = 0;
- if(!empty($monthCreatedBugGroup))
+ if(!empty($$useMonthCreate))
{
- foreach($monthCreatedBugGroup as $data)
+ foreach($$useMonthCreate as $data)
{
- if($date == "{$data['year']}-{$data['month']}" && $productID == $data['product']) $activateBugs[$date] = $data['value'];
+ if($date == "{$data['year']}-{$data['month']}" && $useObjectID == $data[$useDataKey]) $activateBugs[$date] = $data['value'];
}
}
- if(!empty($monthClosedBugGroup))
+ if(!empty($$useMonthClose))
{
- foreach($monthClosedBugGroup as $data)
+ foreach($$useMonthClose as $data)
{
- if($date == "{$data['year']}-{$data['month']}" && $productID == $data['product']) $closeBugs[$date] = $data['value'];
+ if($date == "{$data['year']}-{$data['month']}" && $useObjectID == $data[$useDataKey]) $closeBugs[$date] = $data['value'];
}
}
}
diff --git a/module/bug/config/table.php b/module/bug/config/table.php
index db7ef0c695..7c4fa75800 100644
--- a/module/bug/config/table.php
+++ b/module/bug/config/table.php
@@ -10,6 +10,7 @@ $config->bug->dtable->fieldList['id']['sortType'] = true;
$config->bug->dtable->fieldList['id']['required'] = true;
$config->bug->dtable->fieldList['id']['group'] = 1;
+$config->bug->dtable->fieldList['product']['title'] = $lang->bug->product;
$config->bug->dtable->fieldList['product']['display'] = false;
$config->bug->dtable->fieldList['product']['dataSource'] = array('module' => 'product', 'method' => 'getPairs', 'params' => ['mode' => '', 'programID' => 0, 'append' => '', 'shadow' => 'all']);
@@ -181,6 +182,22 @@ $config->bug->dtable->fieldList['activatedCount']['type'] = 'count';
$config->bug->dtable->fieldList['activatedCount']['group'] = 8;
$config->bug->dtable->fieldList['activatedCount']['sortType'] = true;
+if($config->edition != 'open')
+{
+ $config->bug->dtable->fieldList['relatedObject']['name'] = 'relatedObject';
+ $config->bug->dtable->fieldList['relatedObject']['title'] = $lang->custom->relateObject;
+ $config->bug->dtable->fieldList['relatedObject']['sortType'] = false;
+ $config->bug->dtable->fieldList['relatedObject']['width'] = '70';
+ $config->bug->dtable->fieldList['relatedObject']['type'] = 'text';
+ $config->bug->dtable->fieldList['relatedObject']['link'] = common::hasPriv('custom', 'showRelationGraph') ? "RAWJSRAWJS" : null;
+ $config->bug->dtable->fieldList['relatedObject']['data-toggle'] = 'modal';
+ $config->bug->dtable->fieldList['relatedObject']['data-size'] = 'lg';
+ $config->bug->dtable->fieldList['relatedObject']['show'] = true;
+ $config->bug->dtable->fieldList['relatedObject']['group'] = 8;
+ $config->bug->dtable->fieldList['relatedObject']['flex'] = false;
+ $config->bug->dtable->fieldList['relatedObject']['align'] = 'center';
+}
+
$config->bug->dtable->fieldList['activatedDate']['title'] = $lang->bug->activatedDate;
$config->bug->dtable->fieldList['activatedDate']['type'] = 'date';
$config->bug->dtable->fieldList['activatedDate']['group'] = 8;
diff --git a/module/bug/js/browse.ui.js b/module/bug/js/browse.ui.js
index e7ea66142d..3e314bf5cd 100644
--- a/module/bug/js/browse.ui.js
+++ b/module/bug/js/browse.ui.js
@@ -50,10 +50,13 @@ window.onRenderCell = function(result, {row, col})
}
}
- if(result && col.name == 'deadline')
+ if(result[0] && col.name == 'deadline')
{
- if(row.data.deadline === '0000-00-00') return result;
- if(row.data.deadline < today) result[0] = {html: '' + row.data.deadline + ''};
+ const bug = row.data;
+ if(['resolved', 'closed'].includes(bug.status)) return result;
+
+ const yesterday = zui.formatDate(zui.createDate() - 24 * 60 * 60 * 1000, 'yyyy-MM-dd');
+ if(result[0] <= yesterday) result[0] = {html: '' + result[0] + ''};
}
return result;
diff --git a/module/bug/js/common.ui.js b/module/bug/js/common.ui.js
index 14124e74c4..a979d17ad2 100644
--- a/module/bug/js/common.ui.js
+++ b/module/bug/js/common.ui.js
@@ -7,9 +7,8 @@ function changeProduct(event)
{
const productID = $(event.target).val();
if(productID == undefined) return false;
- if(productID == bug.product) return false;
- if(typeof(changeProductConfirmed) != 'undefined' && !changeProductConfirmed)
+ if(typeof(changeProductConfirmed) != 'undefined' && !changeProductConfirmed && productID != bug.productID)
{
zui.Modal.confirm({message: confirmChangeProduct, onResult: function(result)
{
diff --git a/module/bug/model.php b/module/bug/model.php
index bc055b2196..7bf7725dd0 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -338,6 +338,49 @@ class bugModel extends model
if($changes) $this->action->logHistory($actionID, $changes);
}
+ if($this->config->edition != 'open')
+ {
+ if($oldBug->story > 0 || $oldBug->task > 0 || $oldBug->case > 0)
+ {
+ $AID = $oldBug->story > 0 ? ($oldBug->task > 0 ? "{$oldBug->story},{$oldBug->task}" : $oldBug->story) : $oldBug->task;
+ $AID .= $oldBug->case > 0 ? ",{$oldBug->case}" : '';
+ $AType = $oldBug->story > 0 ? ($oldBug->task > 0 ? 'story,task' : 'story') : 'task';
+ $AType .= $oldBug->case > 0 ? ",testcase" : '';
+ $this->dao->delete()->from(TABLE_RELATION)
+ ->where('relation')->eq('generated')
+ ->andWhere('AID')->in($AID)
+ ->andWhere('AType')->in($AType)
+ ->andWhere('BID')->eq($oldBug->id)
+ ->andWhere('BType')->eq('bug')
+ ->exec();
+ }
+ if($bug->story > 0 || $bug->task > 0 || $bug->case > 0)
+ {
+ $relation = new stdClass();
+ $relation->relation = 'generated';
+ $relation->BID = $bug->id;
+ $relation->BType = 'bug';
+ if($bug->story > 0)
+ {
+ $relation->AID = $bug->story;
+ $relation->AType = 'story';
+ $this->dao->replace(TABLE_RELATION)->data($relation)->exec();
+ }
+ if($bug->task > 0)
+ {
+ $relation->AID = $bug->task;
+ $relation->AType = 'task';
+ $this->dao->replace(TABLE_RELATION)->data($relation)->exec();
+ }
+ if($bug->case > 0)
+ {
+ $relation->AID = $bug->case;
+ $relation->AType = 'testcase';
+ $this->dao->replace(TABLE_RELATION)->data($relation)->exec();
+ }
+ }
+ }
+
if(dao::isError()) return false;
return $changes;
@@ -456,7 +499,7 @@ class bugModel extends model
$files = $this->loadModel('file')->saveUpload('bug', $bug->id);
$fileAction = !empty($files) ? $this->lang->addFiles . implode(',', $files) . "\n" : '';
$changes = common::createChanges($oldBug, $bug);
- $actionID = $this->loadModel('action')->create('bug', $bug->id, 'Resolved', $fileAction . (!empty($bug->comment) ? $bug->comment : ''), $bug->resolution . (isset($bug->duplicateBug) ? ':' . $bug->duplicateBug : ''));
+ $actionID = $this->loadModel('action')->create('bug', $bug->id, 'Resolved', $fileAction . (!empty($bug->comment) ? $this->post->comment : ''), $bug->resolution . (isset($bug->duplicateBug) ? ':' . $bug->duplicateBug : ''));
if($changes) $this->action->logHistory($actionID, $changes);
/* If the edition is not pms, update feedback. */
@@ -537,6 +580,7 @@ class bugModel extends model
public function activate(object $bug, array $kanbanParams = array()): bool
{
$oldBug = parent::fetchByID($bug->id);
+ $bug = $this->loadModel('file')->processImgURL($bug, $this->config->bug->editor->activate['id'], $this->post->uid);
$this->dao->update(TABLE_BUG)->data($bug, 'comment')->check('openedBuild', 'notempty')->autoCheck()->checkFlow()->where('id')->eq($bug->id)->exec();
if(dao::isError()) return false;
@@ -562,7 +606,7 @@ class bugModel extends model
if($changes || $files)
{
$fileAction = !empty($files) ? $this->lang->addFiles . implode(',', $files) . "\n" : '';
- $actionID = $this->loadModel('action')->create('bug', $bug->id, 'Activated', $fileAction . $bug->comment);
+ $actionID = $this->loadModel('action')->create('bug', $bug->id, 'Activated', $fileAction . $this->post->comment);
$this->action->logHistory($actionID, $changes);
}
@@ -581,6 +625,7 @@ class bugModel extends model
public function close(object $bug, array $output = array()): bool
{
$oldBug = $this->getById($bug->id);
+ $bug = $this->loadModel('file')->processImgURL($bug, $this->config->bug->editor->close['id'], $this->post->uid);
$this->dao->update(TABLE_BUG)->data($bug, 'comment')->autoCheck()->checkFlow()->where('id')->eq($bug->id)->exec();
if(dao::isError()) return false;
@@ -588,7 +633,7 @@ class bugModel extends model
if($this->config->edition != 'open' && $oldBug->feedback) $this->loadModel('feedback')->updateStatus('bug', $oldBug->feedback, $bug->status, $oldBug->status);
$changes = common::createChanges($oldBug, $bug);
- $actionID = $this->loadModel('action')->create('bug', $bug->id, 'Closed', $bug->comment);
+ $actionID = $this->loadModel('action')->create('bug', $bug->id, 'Closed', $this->post->comment);
if($changes) $this->action->logHistory($actionID, $changes);
if($oldBug->execution)
@@ -692,6 +737,9 @@ class bugModel extends model
public function buildSearchForm(int $productID, array $products, int $queryID, string $actionURL, string $branch = '0'): void
{
if(commonModel::isTutorialMode()) return;
+
+ if(empty($productID) && empty($products)) $products = $this->loadModel('product')->getPairs('', 0, '', 'all');
+
$projectID = $this->lang->navGroup->bug == 'qa' ? 0 : $this->session->project;
/* Get product params. */
@@ -722,7 +770,7 @@ class bugModel extends model
$this->config->bug->search['params']['openedBuild']['values'] = $this->loadModel('build')->getBuildPairs(array($productID), 'all', 'withbranch|releasetag');
$this->config->bug->search['params']['resolvedBuild']['values'] = $this->config->bug->search['params']['openedBuild']['values'];
- $product = $this->loadModel('product')->fetchByID($productID);
+ $product = $this->loadModel('product')->fetchByID(empty($productID) ? key($products) : $productID);
if($product->type == 'normal')
{
unset($this->config->bug->search['fields']['branch']);
diff --git a/module/bug/ui/view.html.php b/module/bug/ui/view.html.php
index f84ae8a476..c596de316d 100644
--- a/module/bug/ui/view.html.php
+++ b/module/bug/ui/view.html.php
@@ -136,7 +136,7 @@ $tabs[] = setting()
->title(!empty($project->multiple) ? $lang->bug->legendPRJExecStoryTask : $lang->bug->legendExecStoryTask)
->control('bugRelatedInfo');
-$tabs[] = setting()
+$tabs['bugRelatedList'] = setting()
->group('related')
->title($lang->bug->legendMisc)
->control('bugRelatedList');
diff --git a/module/bug/zen.php b/module/bug/zen.php
index a2068a06ca..0e4c90f90a 100644
--- a/module/bug/zen.php
+++ b/module/bug/zen.php
@@ -759,6 +759,7 @@ class bugZen extends bug
protected function buildBrowseView(array $bugs, object $product, string $branch, string $browseType, int $moduleID, array $executions, int $param, string $orderBy, object $pager): void
{
$this->loadModel('datatable');
+ $this->loadModel('custom');
/* 获取分支列表。*/
/* Get branch options. */
@@ -780,6 +781,8 @@ class bugZen extends bug
$bug->injection = zget($identifyList, $bug->injection, '');
$bug->identify = zget($identifyList, $bug->identify, '');
}
+
+ if($this->config->edition != 'open') $bug->relatedObject = $this->custom->getRelatedObjectList($bug->id, 'bug', 'byRelation', true);
}
$showModule = !empty($this->config->bug->browse->showModule) ? $this->config->bug->browse->showModule : '';
@@ -1299,7 +1302,7 @@ class bugZen extends bug
if($testtaskID and empty($oldBug->testtask)) $bug->testtask = $testtaskID;
}
- return $bug;
+ return $this->loadModel('file')->processImgURL($bug, $this->config->bug->editor->resolve['id'], $this->post->uid);
}
/**
diff --git a/module/caselib/ui/browse.html.php b/module/caselib/ui/browse.html.php
index 76e6c2935d..6f6ad57507 100644
--- a/module/caselib/ui/browse.html.php
+++ b/module/caselib/ui/browse.html.php
@@ -137,7 +137,7 @@ if($canBatchReview)
$moduleItems = array();
if($canBatchChangeModule)
{
- foreach($modules as $moduleID => $module) $moduleItems[] = array('text' => $module, 'innerClass' => 'batch-btn ajax-btn not-open-url', 'data-url' => helper::createLink('testcase', 'batchChangeModule', "moduleID=$moduleID"));
+ foreach($modules as $moduleIdKey => $moduleName) $moduleItems[] = array('text' => $moduleName, 'innerClass' => 'batch-btn ajax-btn not-open-url', 'data-url' => helper::createLink('testcase', 'batchChangeModule', "moduleID=$moduleIdKey"));
}
$navActions = array();
diff --git a/module/common/lang/common.php b/module/common/lang/common.php
index 3f7f8eb8a2..a379dec1b9 100644
--- a/module/common/lang/common.php
+++ b/module/common/lang/common.php
@@ -103,7 +103,7 @@ $lang->account = new stdclass();
$lang->ops = new stdclass();
$lang->domain = new stdclass();
$lang->service = new stdclass();
-$lang->deploy = new stdclass();
+$lang->deployment = new stdclass();
$lang->metric = new stdclass();
$lang->ai = new stdclass();
diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index 05d7474394..291163b9da 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -341,6 +341,7 @@ $lang->systemdynamic->common = 'System dynamic';
$lang->systemcompany->common = 'System company';
$lang->pipeline->common = 'Pipeline';
$lang->devopssetting->common = 'Setting';
+$lang->deployment->common = 'Host';
$lang->dashboard = 'Dashboard';
$lang->contribute = 'Contribute';
@@ -425,11 +426,9 @@ $lang->devops->dblist = 'Database';
$lang->devops->domain = 'Domain';
$lang->devops->oss = 'Oss';
$lang->devops->host = 'Host';
-$lang->devops->account = 'Account';
$lang->devops->serverroom = 'IDC';
$lang->devops->deploy = 'Deploy';
$lang->devops->provider = 'IDC Provider';
-$lang->devops->cpuBrand = 'CPU Brand';
$lang->devops->city = 'IDC Location';
$lang->devops->os = 'OS Version';
$lang->devops->stage = 'Stage';
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 3517e836ab..7af88afd62 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -341,6 +341,7 @@ $lang->systemdynamic->common = 'System dynamic';
$lang->systemcompany->common = 'System company';
$lang->pipeline->common = 'Pipeline';
$lang->devopssetting->common = 'Setting';
+$lang->deployment->common = 'Host';
$lang->dashboard = 'Dashboard';
$lang->contribute = 'Contribute';
@@ -425,11 +426,9 @@ $lang->devops->dblist = 'Database';
$lang->devops->domain = 'Domain';
$lang->devops->oss = 'Oss';
$lang->devops->host = 'Host';
-$lang->devops->account = 'Account';
$lang->devops->serverroom = 'IDC';
$lang->devops->deploy = 'Deploy';
$lang->devops->provider = 'IDC Provider';
-$lang->devops->cpuBrand = 'CPU Brand';
$lang->devops->city = 'IDC Location';
$lang->devops->os = 'OS Version';
$lang->devops->stage = 'Stage';
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index 3394f2601b..faf56d2a5d 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -341,6 +341,7 @@ $lang->systemdynamic->common = 'System dynamic';
$lang->systemcompany->common = 'System company';
$lang->pipeline->common = 'Pipeline';
$lang->devopssetting->common = 'Setting';
+$lang->deployment->common = 'Host';
$lang->dashboard = 'Dashboard';
$lang->contribute = 'Contribute';
@@ -425,11 +426,9 @@ $lang->devops->dblist = 'Database';
$lang->devops->domain = 'Domain';
$lang->devops->oss = 'Oss';
$lang->devops->host = 'Host';
-$lang->devops->account = 'Account';
$lang->devops->serverroom = 'IDC';
$lang->devops->deploy = 'Deploy';
$lang->devops->provider = 'IDC Provider';
-$lang->devops->cpuBrand = 'CPU Brand';
$lang->devops->city = 'IDC Location';
$lang->devops->os = 'OS Version';
$lang->devops->stage = 'Stage';
diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index c209c37f39..cbf51f8f59 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -521,7 +521,7 @@ $lang->qa->menu->automation['subMenu']->zanode = array('link' => "{$lang->z
$lang->devops->homeMenu = new stdclass();
$lang->devops->homeMenu->repos = array('link' => "{$lang->devops->repo}|repo|maintain", 'alias' => 'create,edit,import,createrepo');
$lang->devops->homeMenu->compile = array('link' => "{$lang->devops->compile}|job|browse", 'subModule' => 'compile,job');
-if($config->edition != 'open') $lang->devops->homeMenu->deploy = array('link' => "{$lang->devops->deploy}|deploy|browse", 'alias' => 'steps,managestep,create,edit,browse,view,scope,cases', 'subModule' => 'ops,deploy');
+$lang->devops->homeMenu->deploy = array('link' => "{$lang->devops->host}|host|browse", 'alias' => 'create,edit,view,treemap,changestatus,group', 'subModule' => 'tree');
$lang->devops->homeMenu->apps = array('link' => "{$lang->app->common}|space|browse", 'subModule' => 'instance,gitlab,gitea,gogs,jenkins,sonarqube', 'alias' => 'createapplication,binduser,edit');
if($config->inQuickon) $lang->devops->homeMenu->store = array('link' => "{$lang->app->store}|store|browse", 'subModule' => 'store');
@@ -733,6 +733,7 @@ $lang->navGroup->space = 'devops';
$lang->navGroup->store = 'devops';
$lang->navGroup->instance = 'devops';
$lang->navGroup->deploy = 'devops';
+$lang->navGroup->host = 'devops';
$lang->navGroup->company = 'system';
$lang->navGroup->systemteam = 'system';
@@ -780,7 +781,6 @@ $lang->navGroup->system = 'admin';
$lang->navGroup->holiday = 'admin';
$lang->navGroup->serverroom = 'admin';
$lang->navGroup->account = 'admin';
-$lang->navGroup->host = 'admin';
$lang->navGroup->ops = 'admin';
$lang->navGroup->service = 'admin';
$lang->navGroup->domain = 'admin';
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 21c55dd2e5..e98017e682 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -341,6 +341,7 @@ $lang->systemdynamic->common = '组织动态';
$lang->systemcompany->common = '组织公司';
$lang->pipeline->common = '流水线';
$lang->devopssetting->common = '设置';
+$lang->deployment->common = '主机';
$lang->dashboard = '仪表盘';
$lang->contribute = '贡献';
@@ -425,11 +426,9 @@ $lang->devops->dblist = '数据库';
$lang->devops->domain = '域名';
$lang->devops->oss = '对象存储';
$lang->devops->host = '主机';
-$lang->devops->account = '账号';
$lang->devops->serverroom = '机房';
$lang->devops->deploy = '上线';
$lang->devops->provider = '服务商';
-$lang->devops->cpuBrand = 'CPU品牌';
$lang->devops->city = '城市';
$lang->devops->os = '系统版本';
$lang->devops->stage = '阶段';
diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php
index b31cadf9f5..d4b6c9ad77 100644
--- a/module/common/lang/zh-tw.php
+++ b/module/common/lang/zh-tw.php
@@ -293,10 +293,8 @@ $lang->devops->dblist = '数据库';
$lang->devops->domain = '域名';
$lang->devops->oss = '对象存储';
$lang->devops->host = '主机';
-$lang->devops->account = '账号';
$lang->devops->serverroom = '机房';
$lang->devops->provider = '服务商';
-$lang->devops->cpuBrand = 'CPU品牌';
$lang->devops->city = '城市';
$lang->devops->os = '系统版本';
diff --git a/module/common/model.php b/module/common/model.php
index 6c2611be73..697d703180 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -907,10 +907,10 @@ class commonModel extends model
if($value != stripslashes((string)$old->$key))
{
- $diff = '';
- if(substr_count((string)$value, "\n") > 1 or
- substr_count((string)$old->$key, "\n") > 1 or
- strpos(',name,title,desc,spec,steps,content,digest,verify,report,definition,analysis,summary,prevention,resolution,outline,schedule,minutes,sql,interface,ui,langs,performance,privileges,search,actions,deploy,bi,safe,other,', ',' . strtolower($key) . ',') !== false)
+ $diff = '';
+ $showDiff = (substr_count((string)$value, "\n") > 1 || substr_count((string)$old->$key, "\n") > 1 || strpos(',name,title,desc,spec,steps,content,digest,verify,report,definition,analysis,summary,prevention,resolution,outline,schedule,minutes,sql,interface,ui,langs,performance,privileges,search,actions,deploy,bi,safe,other,', ',' . strtolower($key) . ',') !== false);
+ $hiddenDiff = array('bug' => 'resolution');
+ if($showDiff && (!isset($hiddenDiff[$moduleName]) || (isset($hiddenDiff[$moduleName]) && strpos(",$hiddenDiff[$moduleName],", ",$key,") === false)))
{
$diff = commonModel::diff((string)$old->$key, (string)$value);
}
@@ -1947,11 +1947,16 @@ eof;
if($executionsStatus[$object->execution] == 'closed' || !empty($config->CRProject)) return false;
/* Check the execution's project is closed. */
- if(isset($object->project) && !isset($projectsStatus[$object->project]))
+ if(isset($object->project))
{
- $project = $commonModel->loadModel('project')->getByID((int)$object->project);
- $projectsStatus[$object->project] = $project ? $project->status : '';
+ if(!isset($projectsStatus[$object->project]))
+ {
+ $project = $commonModel->loadModel('project')->getByID((int)$object->project);
+ $projectsStatus[$object->project] = $project ? $project->status : '';
+ }
+ if($projectsStatus[$object->project] == 'closed') return false;
}
+
if(isset($object->project) && $projectsStatus[$object->project] == 'closed') return false;
}
@@ -2623,7 +2628,7 @@ eof;
{
if(!empty($actionData['url']) && is_array($actionData['url']))
{
- $moduleName = ($actionData['url']['module'] == 'story' && $moduleName == 'story') ? $data->type : $actionData['url']['module'];
+ $moduleName = ($actionData['url']['module'] == 'story' && in_array($moduleName, array('epic', 'requirement', 'story'))) ? $data->type : $actionData['url']['module'];
$methodName = $actionData['url']['method'];
$params = $actionData['url']['params'];
if(!common::hasPriv($moduleName, $methodName, $data)) return false;
@@ -2631,7 +2636,7 @@ eof;
}
else if(!empty($actionData['data-url']) && is_array($actionData['data-url']))
{
- $moduleName = ($actionData['data-url']['module'] == 'story' && $moduleName == 'story') ? $data->type : $actionData['data-url']['module'];
+ $moduleName = ($actionData['data-url']['module'] == 'story' && in_array($moduleName, array('epic', 'requirement', 'story'))) ? $data->type : $actionData['data-url']['module'];
$methodName = $actionData['data-url']['method'];
$params = $actionData['data-url']['params'];
if(!common::hasPriv($moduleName, $methodName, $data)) return false;
diff --git a/module/compile/model.php b/module/compile/model.php
index 182ca40c15..5b6c9351b8 100644
--- a/module/compile/model.php
+++ b/module/compile/model.php
@@ -61,6 +61,7 @@ class compileModel extends model
$this->session->set('compileOnlyCondition', true, $this->app->tab);
}
+ if(strpos($orderBy, 'id') === false) $orderBy .= ', id_desc';
return $this->dao->select('t1.id, t1.name, t1.job, t1.status, t1.createdDate, t1.testtask, t2.pipeline, t2.triggerType, t2.svnDir, t2.comment, t2.atDay, t2.atTime, t2.engine, t2.triggerActions, t3.name as repoName, t4.name as jenkinsName')->from(TABLE_COMPILE)->alias('t1')
->leftJoin(TABLE_JOB)->alias('t2')->on('t1.job=t2.id')
->leftJoin(TABLE_REPO)->alias('t3')->on('t2.repo=t3.id')
diff --git a/module/compile/tao.php b/module/compile/tao.php
index 68cb0bcdf2..a7b3308367 100644
--- a/module/compile/tao.php
+++ b/module/compile/tao.php
@@ -70,14 +70,16 @@ class compileTao extends compileModel
if($buildType == 'jenkins')
{
- $data->queue = $build->queueId;
- $data->status = $build->result == 'SUCCESS' ? 'success' : 'failure';
+ $data->queue = $build->queueId;
+ $data->status = $build->result == 'SUCCESS' ? 'success' : 'running';
+ if($build->result == 'FAILURE') $data->status = 'failure';
+
$data->createdDate = date('Y-m-d H:i:s', (int)($build->timestamp / 1000));
}
else
{
$data->queue = !empty($build->number) ? $build->number : $build->id;
- $data->status = $build->status == 'success' ? 'success' : 'failure';
+ $data->status = isset($this->lang->compile->statusList[$build->status]) ? $build->status : 'failure';
$date = isset($build->created_at) ? strtotime($build->created_at) : time();
if(isset($build->created)) $date = $build->created;
diff --git a/module/compile/ui/browse.html.php b/module/compile/ui/browse.html.php
index 9c142e5ce6..26b3910969 100644
--- a/module/compile/ui/browse.html.php
+++ b/module/compile/ui/browse.html.php
@@ -12,11 +12,7 @@ declare(strict_types=1);
namespace zin;
-if($repoID)
-{
- $repoName = $this->dao->select('name')->from(TABLE_REPO)->where('id')->eq($repoID)->fetch('name');
- dropmenu(set::objectID($repoID), set::text($repoName), set::tab('repo'));
-}
+if(!empty($repoID)) dropmenu(set::objectID($repoID), set::tab('repo'));
/* zin: Define the set::module('compile') feature bar on main menu. */
$queryMenuLink = createLink('compile', 'browse', "repoID={$repoID}&jobID={$jobID}&browseType=bySearch¶m={queryID}");
diff --git a/module/compile/ui/logs.html.php b/module/compile/ui/logs.html.php
index 5c7329cc07..354a14e28f 100644
--- a/module/compile/ui/logs.html.php
+++ b/module/compile/ui/logs.html.php
@@ -11,6 +11,8 @@ declare(strict_types=1);
namespace zin;
global $lang;
+if(!empty($repoID)) dropmenu(set::objectID($repoID), set::tab('repo'));
+
detailHeader(
to::prefix(''),
to::title(span(setClass('font-semibold'), $lang->compile->logs)),
diff --git a/module/cron/control.php b/module/cron/control.php
index eeb3bdc730..9276e33cb2 100755
--- a/module/cron/control.php
+++ b/module/cron/control.php
@@ -398,10 +398,12 @@ class cron extends control
if(isset($params['moduleName']) and isset($params['methodName']))
{
$this->viewType = 'html';
-
- $this->app->loadLang($params['moduleName']);
- $this->app->loadConfig($params['moduleName']);
- $output = $this->fetch($params['moduleName'], $params['methodName']);
+ $moduleName = $params['moduleName'];
+ $methodName = $params['methodName'];
+ $this->app->loadLang($moduleName);
+ $this->app->loadConfig($moduleName);
+ unset($params['moduleName'], $params['methodName']);
+ $output = $this->fetch($moduleName, $methodName, $params);
}
}
elseif($task->type == 'system')
diff --git a/module/datatable/model.php b/module/datatable/model.php
index 7054c9788e..4c3cb51588 100644
--- a/module/datatable/model.php
+++ b/module/datatable/model.php
@@ -491,7 +491,7 @@ class datatableModel extends model
foreach(array_unique($groupIdList) as $groupID)
{
$flow = $this->workflow->getByModule($module, false, $groupID);
- if(empty($flow)) countinue;
+ if(empty($flow)) continue;
if($flow->buildin)
{
@@ -516,6 +516,6 @@ class datatableModel extends model
$fields = $this->workflowaction->getPageFields($module, $method, true, array(), 0, $groupID);
}
- return $this->loadModel('flow')->buildDtableCols($fields, [], [], !$flow->buildin);
+ return $this->loadModel('flow')->buildDtableCols($fields, [], [], isset($flow) && !$flow->buildin);
}
}
diff --git a/module/dataview/table/effort.php b/module/dataview/table/effort.php
index bedeebbbcc..2a3e6dd526 100644
--- a/module/dataview/table/effort.php
+++ b/module/dataview/table/effort.php
@@ -1,5 +1,5 @@
app->loadLang('account');
+$this->app->loadLang('user');
$schema = new stdclass();
@@ -9,7 +9,7 @@ $schema->tables = array();
$schema->tables['effort'] = 'zt_effort';
$schema->fields = array();
-$schema->fields['id'] = array('type' => 'number', 'name' => $this->lang->account->id);
-$schema->fields['account'] = array('type' => 'user', 'name' => $this->lang->account->name);
+$schema->fields['id'] = array('type' => 'number', 'name' => $this->lang->user->id);
+$schema->fields['account'] = array('type' => 'user', 'name' => $this->lang->user->realname);
$schema->fields['consumed'] = array('type' => 'number', 'name' => $this->lang->dataview->consumed);
diff --git a/module/design/config/dtable.php b/module/design/config/dtable.php
index b07e1cab1f..4c203e6e6f 100644
--- a/module/design/config/dtable.php
+++ b/module/design/config/dtable.php
@@ -15,8 +15,9 @@ $config->design->viewcommit->actionList['unlinkCommit']['data-confirm'] = $lang-
$config->design->dtable->fieldList['id']['title'] = $lang->idAB;
$config->design->dtable->fieldList['id']['type'] = 'id';
-$config->design->dtable->fieldList['name']['type'] = 'title';
-$config->design->dtable->fieldList['name']['link'] = array('module' => 'design', 'method' => 'view', 'params' => 'designID={id}');
+$config->design->dtable->fieldList['name']['title'] = $lang->design->name;
+$config->design->dtable->fieldList['name']['type'] = 'title';
+$config->design->dtable->fieldList['name']['link'] = array('module' => 'design', 'method' => 'view', 'params' => 'designID={id}');
$config->design->dtable->fieldList['product']['title'] = $lang->design->product;
$config->design->dtable->fieldList['product']['type'] = 'desc';
@@ -26,16 +27,34 @@ $config->design->dtable->fieldList['type']['type'] = 'status';
$config->design->dtable->fieldList['type']['statusMap'] = $lang->design->typeList;
$config->design->dtable->fieldList['type']['sortType'] = true;
+$config->design->dtable->fieldList['assignedTo']['title'] = $lang->design->assignedTo;
$config->design->dtable->fieldList['assignedTo']['type'] = 'assign';
$config->design->dtable->fieldList['assignedTo']['assignLink'] = array('module' => 'design', 'method' => 'assignTo', 'params' => 'designID={id}');
$config->design->dtable->fieldList['assignedTo']['data-toggle'] = 'modal';
$config->design->dtable->fieldList['assignedTo']['sortType'] = false;
+$config->design->dtable->fieldList['createdBy']['title'] = $lang->design->createdBy;
$config->design->dtable->fieldList['createdBy']['type'] = 'user';
$config->design->dtable->fieldList['createdBy']['sortType'] = true;
$config->design->dtable->fieldList['createdDate']['type'] = 'date';
+if($config->edition != 'open')
+{
+ $config->design->dtable->fieldList['relatedObject']['name'] = 'relatedObject';
+ $config->design->dtable->fieldList['relatedObject']['title'] = $lang->custom->relateObject;
+ $config->design->dtable->fieldList['relatedObject']['sortType'] = false;
+ $config->design->dtable->fieldList['relatedObject']['width'] = '70';
+ $config->design->dtable->fieldList['relatedObject']['type'] = 'text';
+ $config->design->dtable->fieldList['relatedObject']['link'] = common::hasPriv('custom', 'showRelationGraph') ? "RAWJSRAWJS" : null;
+ $config->design->dtable->fieldList['relatedObject']['data-toggle'] = 'modal';
+ $config->design->dtable->fieldList['relatedObject']['data-size'] = 'lg';
+ $config->design->dtable->fieldList['relatedObject']['show'] = true;
+ $config->design->dtable->fieldList['relatedObject']['group'] = 2;
+ $config->design->dtable->fieldList['relatedObject']['flex'] = false;
+ $config->design->dtable->fieldList['relatedObject']['align'] = 'center';
+}
+
$config->design->dtable->fieldList['actions']['type'] = 'actions';
$config->design->dtable->fieldList['actions']['menu'] = array('edit', 'viewCommit', 'delete');
$config->design->dtable->fieldList['actions']['list'] = $config->design->actionList;
diff --git a/module/design/control.php b/module/design/control.php
index 8606aff457..3635458a39 100755
--- a/module/design/control.php
+++ b/module/design/control.php
@@ -112,8 +112,15 @@ class design extends control
if(isset($project->hasProduct) && $project->hasProduct) $this->config->design->dtable->fieldList['product']['map'] = $this->view->products;
if(!helper::hasFeature('devops')) $this->config->design->dtable->fieldList['actions']['menu'] = array('edit', 'delete');
+ $designs = $this->design->getList($projectID, $productID, $type, $queryID, $orderBy, $pager);
+ if($this->config->edition != 'open')
+ {
+ $this->loadModel('custom');
+ foreach($designs as $design) $design->relatedObject = $this->custom->getRelatedObjectList($design->id, 'design', 'byRelation', true);
+ }
+
$this->view->title = $this->lang->design->common . $this->lang->hyphen . $this->lang->design->browse;
- $this->view->designs = $this->design->getList($projectID, $productID, $type, $queryID, $orderBy, $pager);
+ $this->view->designs = $designs;
$this->view->projectID = $projectID;
$this->view->productID = $productID;
$this->view->type = $type;
diff --git a/module/design/lang/de.php b/module/design/lang/de.php
index 2ceba403fa..46bcd9e983 100644
--- a/module/design/lang/de.php
+++ b/module/design/lang/de.php
@@ -39,6 +39,7 @@ $lang->design->basicInfo = 'Basic Information';
$lang->design->noAssigned = 'Unassigned';
$lang->design->comment = 'Comment';
$lang->design->more = 'Mehr';
+$lang->design->project = 'Project';
/* 动作列表. */
$lang->design->common = 'Design';
diff --git a/module/design/lang/en.php b/module/design/lang/en.php
index 827be3cb8a..b8a97f9291 100644
--- a/module/design/lang/en.php
+++ b/module/design/lang/en.php
@@ -39,6 +39,7 @@ $lang->design->basicInfo = 'Basic Information';
$lang->design->noAssigned = 'Unassigned';
$lang->design->comment = 'Comment';
$lang->design->more = 'More';
+$lang->design->project = 'Project';
/* 动作列表. */
$lang->design->common = 'Design';
diff --git a/module/design/lang/fr.php b/module/design/lang/fr.php
index a6d0b883b0..e466dea0b9 100644
--- a/module/design/lang/fr.php
+++ b/module/design/lang/fr.php
@@ -39,6 +39,7 @@ $lang->design->basicInfo = 'Basic Information';
$lang->design->noAssigned = 'Unassigned';
$lang->design->comment = 'Comment';
$lang->design->more = 'Suite';
+$lang->design->project = 'Project';
/* 动作列表. */
$lang->design->common = 'Design';
diff --git a/module/design/lang/zh-cn.php b/module/design/lang/zh-cn.php
index 0e0b2dfcaa..a08647c09f 100644
--- a/module/design/lang/zh-cn.php
+++ b/module/design/lang/zh-cn.php
@@ -39,6 +39,7 @@ $lang->design->basicInfo = '基本信息';
$lang->design->noAssigned = '未指派';
$lang->design->comment = '注释';
$lang->design->more = '更多';
+$lang->design->project = '所属项目';
/* 动作列表. */
$lang->design->common = '设计';
diff --git a/module/design/lang/zh-tw.php b/module/design/lang/zh-tw.php
index 6b864fc931..67af0027da 100644
--- a/module/design/lang/zh-tw.php
+++ b/module/design/lang/zh-tw.php
@@ -37,6 +37,7 @@ $lang->design->createdDate = '創建時間';
$lang->design->basicInfo = '基本信息';
$lang->design->noAssigned = '未指派';
$lang->design->comment = '註釋';
+$lang->design->project = '所属项目';
/* 動作列表. */
$lang->design->common = '設計';
diff --git a/module/design/ui/view.html.php b/module/design/ui/view.html.php
index 6e21f42e92..c608bc5160 100644
--- a/module/design/ui/view.html.php
+++ b/module/design/ui/view.html.php
@@ -82,51 +82,49 @@ detailBody
),
detailSide
(
- panel
+ tabs
(
- set::title
+ set::id('detailTabs'),
+ tabPane
(
- setClass('font-bold text-md'),
- $lang->design->basicInfo
- ),
- setClass('mt-2'),
- set::shadow(false),
- tableData
- (
- item
+ set::title($lang->design->basicInfo),
+ tableData
(
- set::name($lang->design->type),
- zget($lang->design->typeList, $design->type)
- ),
- item
- (
- set::name($lang->design->product),
- $design->productName
- ),
- item
- (
- set::name($lang->design->story),
- $storyItem
- ),
- item
- (
- set::name($lang->design->submission),
- html($design->commit)
- ),
- item
- (
- set::name($lang->design->assignedTo),
- zget($users, $design->assignedTo)
- ),
- item
- (
- set::name($lang->design->createdBy),
- zget($users, $design->createdBy)
- ),
- item
- (
- set::name($lang->design->createdDate),
- substr($design->createdDate, 0, 11)
+ item
+ (
+ set::name($lang->design->type),
+ zget($lang->design->typeList, $design->type)
+ ),
+ item
+ (
+ set::name($lang->design->product),
+ $design->productName
+ ),
+ item
+ (
+ set::name($lang->design->story),
+ $storyItem
+ ),
+ item
+ (
+ set::name($lang->design->submission),
+ html($design->commit)
+ ),
+ item
+ (
+ set::name($lang->design->assignedTo),
+ zget($users, $design->assignedTo)
+ ),
+ item
+ (
+ set::name($lang->design->createdBy),
+ zget($users, $design->createdBy)
+ ),
+ item
+ (
+ set::name($lang->design->createdDate),
+ substr($design->createdDate, 0, 11)
+ )
)
)
)
diff --git a/module/dev/model.php b/module/dev/model.php
index ecf5664f77..caa8f4ef27 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -688,6 +688,7 @@ class devModel extends model
$menuList->menuOrder = $this->lang->$module->menuOrder;
$menuList = $this->sortMenus($menuList);
}
+ if(!is_array($menuList)) $menuList = (array)$menuList;
/* Construct menu tree. */
foreach($menuList as $menuKey => $menuValue)
@@ -743,7 +744,7 @@ class devModel extends model
foreach($moduleList as $moduleKey)
{
if(empty($moduleKey)) continue;
- if(isset($menuList[$subMenuKey]) and isset($menuList[$subMenuKey]['subMenu']->$moduleKey))
+ if(isset($menuList[$subMenuKey]) and isset($menuList[$subMenuKey]['subMenu']) and isset($menuList[$subMenuKey]['subMenu']->$moduleKey))
{
$labelList = $this->getLinkTitle(array($moduleKey => $menuList[$subMenuKey]['subMenu']->$moduleKey));
$label = zget($labelList, $moduleKey, $label);
@@ -806,7 +807,7 @@ class devModel extends model
}
$titlePinYin = common::convert2Pinyin($titleList);
- foreach($menus as &$menu) $menu->key = zget($titlePinYin, $menu->title, '');
+ foreach($menus as &$menu) $menu->key = !empty($titlePinYin) ? zget($titlePinYin, $menu->title, '') : '';
return $menus;
}
@@ -1073,7 +1074,7 @@ class devModel extends model
{
$menu = new stdclass();
$menu->title = isset($this->lang->dev->replaceLable["$module-$method"]) ? $this->lang->dev->replaceLable["$module-$method"] : $label;
- $menu->key = zget($titlePinYin, $menu->title, '');
+ $menu->key = !empty($titlePinYin) ? zget($titlePinYin, $menu->title, '') : '';
$menu->module = $module;
$menu->method = $method;
$menu->active = (int)$active;
diff --git a/module/doc/control.php b/module/doc/control.php
index c5da286f8c..533c3efad6 100755
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -162,13 +162,13 @@ class doc extends control
* 编辑一个文档空间。
* Edit a doc space.
*
- * @param int $libID
+ * @param int $spaceID
* @access public
* @return void
*/
- public function editSpace(int $libID)
+ public function editSpace(int $spaceID)
{
- $this->commonEditAction($libID);
+ $this->commonEditAction($spaceID);
$this->display();
}
@@ -327,7 +327,10 @@ class doc extends control
{
if(!empty($_POST))
{
- $libID = (int)$this->post->lib;
+ $libID = (int)$this->post->lib;
+
+ if(!$libID) return $this->send(array('result' => 'fail', 'message' => array('lib' => sprintf($this->lang->error->notempty, $this->lang->doc->lib))));
+
$doclib = $this->loadModel('doc')->getLibByID($libID);
$canVisit = $this->docZen->checkPrivForCreate($doclib, $objectType);
if(!$canVisit) return $this->send(array('result' => 'fail', 'message' => $this->lang->doc->accessDenied));
@@ -408,7 +411,7 @@ class doc extends control
$docResult = $this->doc->create($docData, $this->post->labels);
if(!$docResult || dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
- return $this->docZen->responseAfterCreate($docData->lib, $docResult);
+ return $this->docZen->responseAfterCreate($docResult);
}
$this->docZen->assignVarsForCreate($objectType, $objectID, $libID, $moduleID, $docType);
@@ -654,7 +657,6 @@ class doc extends control
public function ajaxGetWhitelist(int $doclibID, string $acl = '', string $control = '', int $docID = 0)
{
$doclib = $this->doc->getLibByID($doclibID);
- $doc = $docID ? $this->doc->getByID($docID) : null;
$users = $this->user->getPairs('noletter|noempty|noclosed');
if($control == 'group')
{
@@ -759,34 +761,41 @@ class doc extends control
* 文档详情页面。
* Document details page.
*
- * @param int $docID
- * @param int $version
- * @param int $appendLib
+ * @param string|int $docID
+ * @param int $version
* @access public
* @return void
*/
- public function view(int $docID = 0, int $version = 0, int $appendLib = 0)
+ public function view(string|int $docID = 0, int $version = 0)
{
- $doc = $this->doc->getByID($docID, $version, true);
+ $isApi = is_string($docID) && strpos($docID, 'api.') === 0;
+ $docID = $isApi ? (int)str_replace('api.', '', $docID) : (int)$docID;
+ $doc = $isApi ? $this->loadModel('api')->getByID($docID, $version) : $this->doc->getByID($docID, $version, true);
if(!$doc || !isset($doc->id))
{
if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'fail', 'code' => 404, 'message' => '404 Not found'));
return $this->sendError($this->lang->notFound, $this->inlink('index'));
}
- if(!$this->doc->checkPrivDoc($doc)) return $this->sendError($this->lang->doc->accessDenied, inlink('index'));
-
- $lib = $this->doc->getLibByID((int)$doc->lib);
- if(!empty($lib) && $lib->deleted == '1') $appendLib = $doc->lib;
- if($this->app->tab == 'doc' && !empty($lib) && $lib->type == 'execution') $appendLib = $doc->lib;
+ if(!$isApi && !$this->doc->checkPrivDoc($doc)) return $this->sendError($this->lang->doc->accessDenied, inlink('index'));
+ $lib = $this->doc->getLibByID((int)$doc->lib);
$objectType = $lib->type;
- $objectID = $this->doc->getObjectIDByLib($lib, $objectType);
+ if($objectType == 'api')
+ {
+ if(isset($lib->product) && $lib->product) list($objectType, $objectID) = array('product', $lib->product);
+ if(isset($lib->project) && $lib->project) list($objectType, $objectID) = array('project', $lib->project);
+ }
+ else
+ {
+ $objectID = $this->doc->getObjectIDByLib($lib, $objectType);
+ }
/* Get doc. */
if($docID) $this->doc->createAction($docID, 'view');
$this->view->title = $doc->title;
$docParam = $version ? ($docID . '_' . $version) : $docID;
+ if($isApi) $docParam = 'api.' . $docParam;
echo $this->fetch('doc', 'app', "type=$objectType&spaceID=$objectID&libID=$lib->id&moduleID=$doc->module&docID=$docParam&mode=view");
}
@@ -841,6 +850,10 @@ class doc extends control
$this->view->$objectKey = $objectID;
}
+ $isOrderByOrder = $orderBy == 'order_asc';
+ $isNotCustomLib = $lib && !($lib->type == 'custom' && $lib->parent == 0);
+ $canUpdateOrder = $isOrderByOrder && $isNotCustomLib && common::hasPriv('doc', 'sortDoc');
+
$this->view->title = $type == 'custom' ? $this->lang->doc->tableContents : $object->name . $this->lang->hyphen . $this->lang->doc->tableContents;
$this->view->type = $type;
$this->view->objectType = $type;
@@ -860,7 +873,7 @@ class doc extends control
$this->view->release = $browseType == 'byrelease' ? $param : 0;
$this->view->exportMethod = $libType == 'api' ? 'export' : $type . '2export';
$this->view->linkParams = "objectID={$objectID}&%s&browseType=&orderBy={$orderBy}¶m=0";
- $this->view->canUpdateOrder = $lib && !($lib->type == 'custom' && $lib->parent == 0) && common::hasPriv('doc', 'sortDoc') && $orderBy == 'order_asc';
+ $this->view->canUpdateOrder = $canUpdateOrder;
$this->display();
}
@@ -1237,8 +1250,8 @@ class doc extends control
$this->doc->moveLib($libID, $data);
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
-
- return $this->docZen->responseAfterMove($this->post->space, $spaceType, $libID);
+ $spaceTypeChanged = $spaceType != $lib->type;
+ return $this->docZen->responseAfterMove($this->post->space, $libID, 0, $spaceTypeChanged);
}
$this->docZen->setAclForCreateLib($spaceType);
@@ -1294,7 +1307,8 @@ class doc extends control
$this->action->logHistory($actionID, $changes);
}
- return $this->docZen->responseAfterMove($this->post->space, $spaceType, $data->lib, $locate, $docID);
+ $spaceTypeChanged = $spaceType != $lib->type;
+ return $this->docZen->responseAfterMove($this->post->space, $data->lib, $docID, $spaceTypeChanged);
}
$projects = $this->loadModel('project')->getPairsByProgram(0, 'all', false, 'order_asc');
@@ -1475,7 +1489,11 @@ class doc extends control
public function app(string $type = 'mine', int $spaceID = 0, int $libID = 0, int $moduleID = 0, mixed $docID = 0, string $mode = '', string $orderBy = '', int $recTotal = 0, int $recPerPage = 20, int $pageID = 1, string $filterType = '', string $search = '', bool $noSpace = false)
{
$isNotDocTab = $this->app->tab != 'doc';
- if(empty($mode)) $mode = ($isNotDocTab || $type == 'execution' || $noSpace || !empty($spaceID)) ? 'list' : 'home';
+ if(empty($mode))
+ {
+ $showList = $noSpace || !empty($spaceID);
+ $mode = ($isNotDocTab || $type == 'execution' || $showList) ? 'list' : 'home';
+ }
$this->app->loadLang('file');
@@ -1492,13 +1510,15 @@ class doc extends control
if(isset($this->lang->doc->menu->{$menuType})) $this->lang->doc->menu->{$menuType}['alias'] .= ',' . $this->app->rawMethod;
$docVersion = 0;
+ $isApi = is_string($docID) && strpos($docID, 'api.') === 0;
+ if($isApi) $docID = str_replace('api.', '', $docID);
if(is_string($docID) && strpos($docID, '_') !== false) list($docID, $docVersion) = explode('_', $docID);
$this->view->type = $type;
$this->view->spaceID = $spaceID;
$this->view->libID = $libID;
$this->view->moduleID = $moduleID;
- $this->view->docID = (int)$docID;
+ $this->view->docID = $isApi ? "api.$docID" : (int)$docID;
$this->view->docVersion = (int)$docVersion;
$this->view->mode = $mode;
$this->view->filterType = $filterType;
@@ -1585,13 +1605,21 @@ class doc extends control
* Ajax: Get doc data.
* Ajax: 获取文档数据。
*
- * @param int $docID
+ * @param string|int $docID
* @param int $version
* @access public
* @return void
*/
- public function ajaxGetDoc(int $docID, int $version = 0, $details = 'no')
+ public function ajaxGetDoc(string|int $docID, int $version = 0, $details = 'no')
{
+ if(is_string($docID) && strpos($docID, 'api.') === 0)
+ {
+ $apiID = (int)str_replace('api.', '', $docID);
+ echo $this->fetch('api', 'ajaxGetApi', "apiID=$apiID&version=$version");
+ return;
+ }
+
+ $docID = (int)$docID;
$doc = $this->doc->getByID($docID, $version);
$doc->lib = (int)$doc->lib;
$doc->module = (int)$doc->module;
@@ -1600,16 +1628,25 @@ class doc extends control
if($details == 'yes')
{
- $lib = $this->doc->getLibByID((int)$doc->lib);
- $objectType = empty($lib->type) ? ($lib->execution ? 'execution' : ($lib->project ? 'project' : 'product')) : $lib->type;
+ $lib = $this->doc->getLibByID((int)$doc->lib);
+ if(empty($lib->type))
+ {
+ if($lib->execution) $lib->type = 'execution';
+ elseif($lib->project) $lib->type = 'project';
+ elseif($lib->product) $lib->type = 'product';
+ }
+
$objectID = $this->doc->getObjectIDByLib($lib, $objectType);
- $object = in_array($objectType, array('product', 'project', 'execution')) ? $this->doc->getObjectByID($objectType, $objectID) : $this->doc->getLibByID((int)$objectID);;
+ $object = in_array($objectType, array('product', 'project', 'execution')) ? $this->doc->getObjectByID($objectType, $objectID) : $this->doc->getLibByID((int)$objectID);
$doc->libInfo = $lib;
$doc->objectType = $objectType;
$doc->object = $object;
}
+ if($doc->contentType === 'doc' && is_string($doc->content)) $doc->content = htmlspecialchars_decode($doc->content);
+ if(is_string($doc->title)) $doc->title = htmlspecialchars_decode($doc->title);
+
if($docID) $this->doc->createAction($docID, 'view');
$this->send($doc);
@@ -1706,6 +1743,10 @@ class doc extends control
$this->view->optionMenu = $this->loadModel('tree')->getOptionMenu($libID, 'doc', 0);
}
+ $title = $this->lang->settings;
+ if($isDraft == 'yes') $title = $this->lang->doc->saveDraft;
+ elseif(empty($docID)) $title = $this->lang->doc->release;
+
$this->view->mode = empty($docID) ? 'create' : 'edit';
$this->view->users = $this->user->getPairs('nocode|noclosed|nodeleted');
$this->view->groups = $this->loadModel('group')->getPairs();
@@ -1717,7 +1758,7 @@ class doc extends control
$this->view->libs = $libPairs;
$this->view->docID = $docID;
$this->view->isDraft = $isDraft == 'yes';
- $this->view->title = $isDraft == 'yes' ? ($this->lang->doc->saveDraft) : (empty($docID) ? $this->lang->doc->release : $this->lang->settings);
+ $this->view->title = $title;
$this->display();
}
}
diff --git a/module/doc/js/createlib.ui.js b/module/doc/js/createlib.ui.js
index b8c658a445..6bcd148a84 100644
--- a/module/doc/js/createlib.ui.js
+++ b/module/doc/js/createlib.ui.js
@@ -19,6 +19,7 @@ window.changeDoclibAcl = function(e)
if(libType == 'api')
{
$('.apilib').removeClass('hidden');
+ $('#orderBox').addClass('hidden');
$('#aclBox .check-list').html($('#aclAPIBox .check-list').html());
$("#aclBox input[id='aclopen']").prop('checked', true);
diff --git a/module/doc/js/quick.ui.js b/module/doc/js/quick.ui.js
index ce3a3430c9..f8ba237969 100644
--- a/module/doc/js/quick.ui.js
+++ b/module/doc/js/quick.ui.js
@@ -52,19 +52,24 @@ window.docAppActions.doc = function(info)
const actions = buildDocActions(info);
if(info.ui === 'toolbar')
{
- const doc = info.data;
- const object = doc.object;
- const lib = doc.libInfo;
- const objectUrl = object ? getObjectBrowseUrl(object, doc.objectType) : null;
+ const doc = info.data;
+ const object = doc.object;
+ const lib = doc.libInfo;
+ const docUrl = $.createLink('doc', 'view', `docID=${doc.id}`);
actions.unshift(
{
type: 'custom',
component: 'div',
className: 'order-first mr-2',
- html: `${getDocAppLang('position')}${getDocAppLang('colon')} ` + [
- objectUrl ? `${object.name || object.title}` : null,
- lib ? `${lib.name} ` : null,
- ].filter(Boolean).join(' / '),
+ html: [
+ `${getDocAppLang('position')}${getDocAppLang('colon')} `,
+ ``,
+ [
+ object ? (object.name || object.title) : '',
+ lib ? lib.name : '',
+ ].filter(Boolean).join(' / '),
+ '',
+ ].join(''),
});
}
return actions;
diff --git a/module/doc/js/setdocbasic.ui.js b/module/doc/js/setdocbasic.ui.js
index ce962e778e..2719bc1913 100644
--- a/module/doc/js/setdocbasic.ui.js
+++ b/module/doc/js/setdocbasic.ui.js
@@ -20,9 +20,13 @@ window.loadExecutions = function(e)
const link = $.createLink('doc', 'ajaxGetModules', 'objectType=project&objectID=' + projectID + '&type=doc');
$.getJSON(link, function(data)
{
- const moduleElement = officeTypes.includes(docType) ? '.moduleBox input[name="module"]': '#setDocBasicForm input[name="module"]';
- const $picker = $(moduleElement).zui('picker');
- $picker.render({items: data});
- $picker.$.setValue('');
+ const isOfficeType = officeTypes.includes(docType);
+ const $libPicker = $(`${isOfficeType ? '' : '#setDocBasicForm'} [name='lib']`).zui('picker');
+ $libPicker.render({items: data.libs});
+ $libPicker.$.setValue('');
+
+ const $modulePicker = $(`${isOfficeType ? '' : '#setDocBasicForm'} [name='module']`).zui('picker');
+ $modulePicker.render({items: data.modules});
+ $modulePicker.$.setValue('');
});
}
diff --git a/module/doc/lang/de.php b/module/doc/lang/de.php
index 7f8791aca4..2720d48438 100644
--- a/module/doc/lang/de.php
+++ b/module/doc/lang/de.php
@@ -31,7 +31,7 @@ $lang->doclib->defaultOrder = 'Doc order';
$lang->doclib->tip = new stdclass();
$lang->doclib->tip->selectExecution = "When execution is empty, the library created is the {$lang->projectCommon} library";
-$lang->doclib->type['wiki'] = 'Wiki';
+$lang->doclib->type['wiki'] = 'Doc';
$lang->doclib->type['api'] = 'API';
$lang->doclib->aclListA = array();
@@ -450,6 +450,7 @@ $lang->doc->docLang = new stdClass();
$lang->doc->docLang->cancel = $lang->cancel;
$lang->doc->docLang->export = $lang->export;
$lang->doc->docLang->settings = $lang->settings;
+$lang->doc->docLang->save = $lang->save;
$lang->doc->docLang->createSpace = $lang->doc->createSpace;
$lang->doc->docLang->createLib = $lang->doc->createLib;
$lang->doc->docLang->actions = $lang->doc->libDropdown;
@@ -559,3 +560,14 @@ $lang->doc->docLang->docTitleRequired = 'Please enter the document ti
$lang->doc->docLang->docTitlePlaceholder = 'Enter the document title';
$lang->doc->docLang->noDataYet = 'No data yet';
$lang->doc->docLang->position = $lang->doc->position;
+$lang->doc->docLang->relateObject = 'Related Objects';
+$lang->doc->docLang->showNoDocProduct = 'Show products without doc';
+$lang->doc->docLang->showNoDocProject = 'Show projects without doc';
+$lang->doc->docLang->showClosedProduct = 'Show closed products';
+$lang->doc->docLang->showClosedProject = 'Show closed projects';
+$lang->doc->docLang->noProducts = 'No products';
+$lang->doc->docLang->noProjects = 'No projects';
+$lang->doc->docLang->productMine = 'My responsibility';
+$lang->doc->docLang->projectMine = 'My participation';
+$lang->doc->docLang->productOther = 'Other';
+$lang->doc->docLang->projectOther = 'Other';
diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php
index 74ee4a9bb6..da003d8289 100644
--- a/module/doc/lang/en.php
+++ b/module/doc/lang/en.php
@@ -31,7 +31,7 @@ $lang->doclib->defaultOrder = 'Doc order';
$lang->doclib->tip = new stdclass();
$lang->doclib->tip->selectExecution = "When execution is empty, the library created is the {$lang->projectCommon} library";
-$lang->doclib->type['wiki'] = 'Wiki';
+$lang->doclib->type['wiki'] = 'Doc';
$lang->doclib->type['api'] = 'API';
$lang->doclib->aclListA = array();
@@ -450,6 +450,7 @@ $lang->doc->docLang = new stdClass();
$lang->doc->docLang->cancel = $lang->cancel;
$lang->doc->docLang->export = $lang->export;
$lang->doc->docLang->settings = $lang->settings;
+$lang->doc->docLang->save = $lang->save;
$lang->doc->docLang->createSpace = $lang->doc->createSpace;
$lang->doc->docLang->createLib = $lang->doc->createLib;
$lang->doc->docLang->actions = $lang->doc->libDropdown;
@@ -559,3 +560,15 @@ $lang->doc->docLang->docTitleRequired = 'Please enter the document ti
$lang->doc->docLang->docTitlePlaceholder = 'Enter the document title';
$lang->doc->docLang->noDataYet = 'No data yet';
$lang->doc->docLang->position = $lang->doc->position;
+$lang->doc->docLang->relateObject = 'Related Objects';
+$lang->doc->docLang->showNoDocProduct = 'Show products without doc';
+$lang->doc->docLang->showNoDocProject = 'Show projects without doc';
+$lang->doc->docLang->showClosedProduct = 'Show closed products';
+$lang->doc->docLang->showClosedProject = 'Show closed projects';
+$lang->doc->docLang->noProducts = 'No products';
+$lang->doc->docLang->noProjects = 'No projects';
+$lang->doc->docLang->productMine = 'My responsibility';
+$lang->doc->docLang->projectMine = 'My participation';
+$lang->doc->docLang->productOther = 'Other';
+$lang->doc->docLang->projectOther = 'Other';
+$lang->doc->docLang->accessDenied = $lang->doc->accessDenied;
diff --git a/module/doc/lang/fr.php b/module/doc/lang/fr.php
index 7cc9dc6b45..9edf96c79d 100644
--- a/module/doc/lang/fr.php
+++ b/module/doc/lang/fr.php
@@ -31,7 +31,7 @@ $lang->doclib->defaultOrder = 'Doc order';
$lang->doclib->tip = new stdclass();
$lang->doclib->tip->selectExecution = "When execution is empty, the library created is the {$lang->projectCommon} library";
-$lang->doclib->type['wiki'] = 'Wiki';
+$lang->doclib->type['wiki'] = 'Doc';
$lang->doclib->type['api'] = 'API';
$lang->doclib->aclListA = array();
@@ -450,6 +450,7 @@ $lang->doc->docLang = new stdClass();
$lang->doc->docLang->cancel = $lang->cancel;
$lang->doc->docLang->export = $lang->export;
$lang->doc->docLang->settings = $lang->settings;
+$lang->doc->docLang->save = $lang->save;
$lang->doc->docLang->createSpace = $lang->doc->createSpace;
$lang->doc->docLang->createLib = $lang->doc->createLib;
$lang->doc->docLang->actions = $lang->doc->libDropdown;
@@ -559,3 +560,14 @@ $lang->doc->docLang->docTitleRequired = 'Please enter the document ti
$lang->doc->docLang->docTitlePlaceholder = 'Enter the document title';
$lang->doc->docLang->noDataYet = 'No data yet';
$lang->doc->docLang->position = $lang->doc->position;
+$lang->doc->docLang->relateObject = 'Related Objects';
+$lang->doc->docLang->showNoDocProduct = 'Show products without doc';
+$lang->doc->docLang->showNoDocProject = 'Show projects without doc';
+$lang->doc->docLang->showClosedProduct = 'Show closed products';
+$lang->doc->docLang->showClosedProject = 'Show closed projects';
+$lang->doc->docLang->noProducts = 'No products';
+$lang->doc->docLang->noProjects = 'No projects';
+$lang->doc->docLang->productMine = 'My responsibility';
+$lang->doc->docLang->projectMine = 'My participation';
+$lang->doc->docLang->productOther = 'Other';
+$lang->doc->docLang->projectOther = 'Other';
diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php
index 778fa09391..8d386b03f6 100644
--- a/module/doc/lang/zh-cn.php
+++ b/module/doc/lang/zh-cn.php
@@ -31,7 +31,7 @@ $lang->doclib->defaultOrder = '文档默认排序';
$lang->doclib->tip = new stdclass();
$lang->doclib->tip->selectExecution = "执行为空时，创建的库为{$lang->projectCommon}库";
-$lang->doclib->type['wiki'] = 'Wiki文档库';
+$lang->doclib->type['wiki'] = '文档库';
$lang->doclib->type['api'] = '接口库';
$lang->doclib->aclListA = array();
@@ -450,6 +450,7 @@ $lang->doc->docLang = new stdClass();
$lang->doc->docLang->cancel = $lang->cancel;
$lang->doc->docLang->export = $lang->export;
$lang->doc->docLang->settings = $lang->settings;
+$lang->doc->docLang->save = $lang->save;
$lang->doc->docLang->createSpace = $lang->doc->createSpace;
$lang->doc->docLang->createLib = $lang->doc->createLib;
$lang->doc->docLang->actions = $lang->doc->libDropdown;
@@ -559,3 +560,15 @@ $lang->doc->docLang->docTitleRequired = '文档标题不能为空。'
$lang->doc->docLang->docTitlePlaceholder = '请输入文档标题';
$lang->doc->docLang->noDataYet = '暂无数据';
$lang->doc->docLang->position = $lang->doc->position;
+$lang->doc->docLang->relateObject = '关联对象';
+$lang->doc->docLang->showNoDocProduct = '显示无文档的产品';
+$lang->doc->docLang->showNoDocProject = '显示无文档的项目';
+$lang->doc->docLang->showClosedProduct = '显示已关闭的产品';
+$lang->doc->docLang->showClosedProject = '显示已关闭的项目';
+$lang->doc->docLang->noProducts = '没有产品';
+$lang->doc->docLang->noProjects = '没有项目';
+$lang->doc->docLang->productMine = '我负责的';
+$lang->doc->docLang->projectMine = '我参与的';
+$lang->doc->docLang->productOther = '其他';
+$lang->doc->docLang->projectOther = '其他';
+$lang->doc->docLang->accessDenied = $lang->doc->accessDenied;
diff --git a/module/doc/model.php b/module/doc/model.php
index 7fbfd89099..db722c4e13 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -736,6 +736,7 @@ class docModel extends model
$docs = $this->dao->select('t1.*')->from(TABLE_DOC)->alias('t1')
->leftJoin(TABLE_MODULE)->alias('t2')->on('t1.module=t2.id')
->where('t1.lib')->in($libs)
+ ->andWhere('t1.deleted')->eq('0')
->andWhere('t1.vision')->eq($this->config->vision)
->andWhere('t1.templateType')->eq('')
->andWhere("(t1.status = 'normal' or (t1.status = 'draft' and t1.addedBy='{$this->app->user->account}'))")
@@ -750,6 +751,7 @@ class docModel extends model
->andWhere('templateType')->eq('')
->andWhere("(status = 'normal' or (status = 'draft' and addedBy='{$this->app->user->account}'))")
->andWhere('module')->eq(0)
+ ->andWhere('deleted')->eq('0')
->orderBy('`order` asc, id_asc')
->fetchAll('id');
@@ -763,10 +765,25 @@ class docModel extends model
$doc->module = (int)$doc->module;
$doc->deleted = boolval($doc->deleted);
$doc->isCollector = strpos($doc->collector, ',' . $this->app->user->account . ',') !== false;
+ $doc->title = htmlspecialchars_decode($doc->title);
unset($doc->content);
unset($doc->draft);
}
+ $apis = $this->loadModel('api')->getApiListBySearch(0, 0, '', $libs);
+ foreach($apis as &$api)
+ {
+ $api->id = "api.$api->id";
+ $api->lib = (int)$api->lib;
+ $api->module = (int)$api->module;
+ $api->deleted = boolval($api->deleted);
+ $api->originTitle = $api->title;
+ $api->icon = "api is-$api->method";
+ $api->title = "$api->method $api->path $api->title";
+
+ $docs[$api->id] = $api;
+ }
+
return $docs;
}
@@ -1298,7 +1315,6 @@ class docModel extends model
}
if($type == 'project')
{
- $account = $this->app->user->account;
$projects = $this->loadModel('project')->getListByCurrentUser();
$involvedProjects = $this->project->getInvolvedListByCurrentUser();
$spaceID = $this->project->checkAccess($spaceID, $projects);
@@ -1426,7 +1442,7 @@ class docModel extends model
if(empty($doc->lib)) return dao::$errors['lib'] = sprintf($this->lang->error->notempty, $this->lang->doc->lib);
$lib = $this->getLibByID($doc->lib);
- $doc = $this->loadModel('file')->processImgURL($doc, $this->config->doc->editor->create['id'], (string)$this->post->uid);
+ if($doc->contentType != 'doc') $doc = $this->loadModel('file')->processImgURL($doc, $this->config->doc->editor->create['id'], (string)$this->post->uid);
$doc->product = $lib->product;
$doc->project = $lib->project;
$doc->execution = $lib->execution;
@@ -1566,7 +1582,7 @@ class docModel extends model
}
$lib = !empty($doc->lib) ? $this->getLibByID($doc->lib) : '';
- $doc = $this->loadModel('file')->processImgURL($doc, $this->config->doc->editor->edit['id'], (string)$this->post->uid);
+ if(!isset($doc->contentType) || $doc->contentType !== 'doc') $doc = $this->loadModel('file')->processImgURL($doc, $this->config->doc->editor->edit['id'], (string)$this->post->uid);
if(!empty($lib))
{
@@ -1873,17 +1889,18 @@ class docModel extends model
{
$libs = $this->getLibsByObject($type, $spaceID);
- if($type == 'project')
+ $executionIDList = array();
+ $apiLibs = array();
+ foreach($libs as $lib)
{
- $executionIDList = array();
- foreach($libs as $lib)
- {
- if($lib->type != 'execution') continue;
- $executionIDList[] = $lib->execution;
- }
+ if($lib->type == 'api') $apiLibs[$lib->id] = $lib;
+ if($lib->type != 'execution') continue;
+ $executionIDList[] = $lib->execution;
+ }
+ if($type == 'project' && !empty($executionIDList))
+ {
$executionPairs = $this->dao->select('id,name')->from(TABLE_EXECUTION)->where('id')->in($executionIDList)->fetchPairs();
-
foreach($libs as &$lib)
{
if($lib->type != 'execution') continue;
@@ -1893,6 +1910,14 @@ class docModel extends model
}
}
+ if(!empty($apiLibs))
+ {
+ $releases = $this->loadModel('api')->getReleaseByQuery(array_keys($apiLibs));
+ $releaseMap = array();
+ foreach($releases as $release) $releaseMap[$release->lib][] = $release;
+ foreach($apiLibs as $lib) $lib->versions = isset($releaseMap[$lib->id]) ? $releaseMap[$lib->id] : array();
+ }
+
return $libs;
}
@@ -2157,7 +2182,7 @@ class docModel extends model
{
if(!$this->checkPrivDoc($doc)) unset($docs[$id]);
}
- $docIdList = empty($docs) ? 0 : $this->dao->select('id')->from(TABLE_DOC)->where($type)->eq($objectID)->andWhere('id')->in(array_keys($docs))->get();
+ $docIdList = empty($docs) ? 0 : $this->dao->select('id')->from(TABLE_DOC)->where($type)->eq($objectID)->andWhere('vision')->eq($this->config->vision)->andWhere('id')->in(array_keys($docs))->get();
if($type == 'product')
{
@@ -2729,14 +2754,17 @@ class docModel extends model
* Get modules from libs.
*
* @param array $libs Lib id list.
+ * @param string $type doc|api
* @access public
* @return array
*/
- public function getModulesOfLibs(array $libs)
+ public function getModulesOfLibs(array $libs, $type = 'doc,api')
{
+ $types = explode(',', $type);
return $this->dao->select('*')->from(TABLE_MODULE)
->where('root')->in($libs)
- ->andWhere('type')->eq('doc')
+ ->beginIF(count($types) > 1)->andWhere('type')->in($types)->fi()
+ ->beginIF(count($types) == 1)->andWhere('type')->eq($type)->fi()
->andWhere('deleted')->eq(0)
->orderBy('grade desc, `order`')
->fetchAll('id');
@@ -3243,6 +3271,7 @@ class docModel extends model
$allLibs = $this->getLibs('hasApi');
$hasPrivDocIdList = $this->getPrivDocs(array(), 0, 'all');
$apiList = $this->loadModel('api')->getPrivApis();
+ $actionCondition = $this->loadModel('action')->getActionCondition('doc');
$actions = $this->dao->select('*')->from(TABLE_ACTION)
->where('vision')->eq($this->config->vision)
@@ -3255,6 +3284,7 @@ class docModel extends model
->orWhere('(objectType')->eq('api')
->andWhere('objectID')->in(array_keys($apiList))
->markRight(2)
+ ->beginIF($actionCondition)->andWhere("($actionCondition)")->fi()
->orderBy('date_desc,id_asc')
->page($pager)
->fetchAll();
diff --git a/module/doc/ui/app.html.php b/module/doc/ui/app.html.php
index 0599d5763e..54b2bcbea7 100644
--- a/module/doc/ui/app.html.php
+++ b/module/doc/ui/app.html.php
@@ -30,8 +30,10 @@ $privs = array();
$privs['create'] = hasPriv('doc', 'create');
$privs['edit'] = hasPriv('doc', 'edit');
$privs['delete'] = hasPriv('doc', 'delete');
+$privs['view'] = hasPriv('doc', 'view');
$privs['effort'] = $this->config->edition != 'open' && hasPriv('effort', 'createForObject');
$privs['exportDoc'] = $this->config->edition != 'open' && hasPriv('doc', $type . '2export');
+$privs['exportApi'] = $this->config->edition != 'open' && hasPriv('api', 'export');
$privs['moveDoc'] = hasPriv('doc', 'moveDoc');
$privs['collect'] = hasPriv('doc', 'collect');
$privs['createLib'] = hasPriv('doc', 'createLib');
@@ -51,6 +53,13 @@ $privs['sortModule'] = hasPriv('doc', 'sortCatalog');
$privs['sortDoclib'] = hasPriv('doc', 'sortDoclib');
$privs['sortDoc'] = hasPriv('doc', 'sortDoc');
$privs['batchMoveDoc'] = hasPriv('doc', 'batchMoveDoc');
+$privs['createApi'] = hasPriv('api', 'create');
+$privs['editApi'] = hasPriv('api', 'edit');
+$privs['viewApi'] = hasPriv('api', 'view');
+$privs['createStruct'] = hasPriv('api', 'createStruct');
+$privs['createRelease']= hasPriv('api', 'createRelease');
+$privs['releases'] = hasPriv('api', 'releases');
+$privs['struct'] = hasPriv('api', 'struct');
$privs['createOffice'] = true;
$homeName = false;
diff --git a/module/doc/ui/createlib.html.php b/module/doc/ui/createlib.html.php
index c1df926c95..a48101642d 100644
--- a/module/doc/ui/createlib.html.php
+++ b/module/doc/ui/createlib.html.php
@@ -124,6 +124,22 @@ formPanel
)
),
formRow
+ (
+ setID('orderBox'),
+ formGroup
+ (
+ set::label($lang->doclib->defaultOrder),
+ set::width('5/6'),
+ radioList
+ (
+ set::name('orderBy'),
+ set::items($lang->doclib->idOrder),
+ set::value('id_asc'),
+ set::inline(true)
+ )
+ )
+ ),
+ formRow
(
setClass('apilib hidden'),
formGroup
@@ -151,22 +167,6 @@ formPanel
)
),
formRow
- (
- setID('orderBox'),
- formGroup
- (
- set::label($lang->doclib->defaultOrder),
- set::width('5/6'),
- radioList
- (
- set::name('orderBy'),
- set::items($lang->doclib->idOrder),
- set::value('id_asc'),
- set::inline(true)
- )
- )
- ),
- formRow
(
setID('whiteListBox'),
setClass('hidden'),
diff --git a/module/doc/ui/setdocbasic.html.php b/module/doc/ui/setdocbasic.html.php
index fb0dd59c7d..de3199cf69 100644
--- a/module/doc/ui/setdocbasic.html.php
+++ b/module/doc/ui/setdocbasic.html.php
@@ -73,14 +73,15 @@ formPanel
set::label($lang->doc->module),
picker(set::name('module'), set::items($optionMenu), set::value($moduleID), set::required(true))
),
- $isDraft ? null : formGroup
- (
- set::label($lang->doc->mailto),
- mailto(
- set::items($users),
- set::value(isset($doc) ? $doc->mailto : null)
+ (!$isDraft && $objectType !== 'mine')
+ ? formGroup(
+ set::label($lang->doc->mailto),
+ mailto(
+ set::items($users),
+ set::value(isset($doc) ? $doc->mailto : null)
+ )
)
- ),
+ : null,
$isDraft ? null : formGroup
(
set::label($lang->doclib->control),
diff --git a/module/doc/zen.php b/module/doc/zen.php
index 68a81f4843..595c952482 100644
--- a/module/doc/zen.php
+++ b/module/doc/zen.php
@@ -284,9 +284,7 @@ class docZen extends doc
$docAppActions = array();
$docAppActions[] = array('update', 'lib', $lib);
- $docAppActions[] = array('list:selectLib', $libID);
- $docAppActions[] = array('home:selectSpace', $objectID, $libID);
- $docAppActions[] = array('load', null, null, null, array('picks' => 'lib'));
+ $docAppActions[] = array('selectSpace', $objectID, $libID);
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => array('name' => 'locateNewLib', 'params' => array($type, $objectID, $libID, $libName)), 'docApp' => $docAppActions));
}
@@ -365,16 +363,14 @@ class docZen extends doc
* 在创建文档后的返回。
* Return after create a document.
*
- * @param int $libID
* @param array $docResult
* @access protected
- * @return bool|int
+ * @return void
*/
- protected function responseAfterCreate(int $libID, array $docResult): bool|int
+ protected function responseAfterCreate(array $docResult)
{
$docID = $docResult['id'];
$files = zget($docResult, 'files', '');
- $lib = $this->doc->getLibByID($libID);
$fileAction = '';
if(!empty($files)) $fileAction = $this->lang->addFiles . join(',', $files) . "\n";
@@ -383,9 +379,14 @@ class docZen extends doc
$this->action->create('doc', $docID, $actionType, $fileAction);
if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $docID));
- $params = "docID=" . $docResult['id'];
- $response = array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => $this->createLink('doc', 'view', $params), 'id' => $docID, 'doc' => $docResult);
+ $response = array(
+ 'result' => 'success',
+ 'message' => $this->lang->saveSuccess,
+ 'load' => $this->createLink('doc', 'view', "docID={$docResult['id']}"),
+ 'id' => $docID,
+ 'doc' => $docResult
+ );
return $this->send($response);
}
@@ -394,24 +395,35 @@ class docZen extends doc
* Return after move lib or doc.
*
* @param string $space
- * @param string $spaceType
* @param int $libID
- * @param string $locateLink
* @param int $docID
+ * @param bool $spaceTypeChanged
*
* @access protected
- * @return bool|int
+ * @return void
*/
- protected function responseAfterMove(string $space, string $spaceType = 'mine', int $libID = 0, string $locateLink = '', int $docID = 0): bool|int
+ protected function responseAfterMove(string $space, int $libID = 0, int $docID = 0, bool $spaceTypeChanged = false)
{
- if(empty($locateLink))
+ list($spaceType, $spaceID) = explode('.', $space);
+ if($docID)
{
- if($spaceType == 'mine') $locateLink = $this->createLink('doc', 'mySpace', "type=mine&libID={$libID}");
- elseif($spaceType == 'custom') $locateLink = $this->createLink('doc', 'teamSpace', "objectID={$space}&libID={$libID}");
- else $locateLink = true;
+ $docAppAction = array('executeCommand', 'handleMovedDoc', array($docID, $spaceID, $libID));
+ return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'docApp' => $docAppAction));
+ }
+
+ if($spaceTypeChanged)
+ {
+ if($spaceType == 'mine') $locateLink = $this->createLink('doc', 'mySpace', "objectID={$spaceID}&libID={$libID}");
+ elseif($spaceType == 'custom') $locateLink = $this->createLink('doc', 'teamSpace', "objectID={$spaceID}&libID={$libID}");
+ elseif($spaceType == 'product') $locateLink = $this->createLink('doc', 'productSpace', "objectID={$spaceID}&libID={$libID}");
+ elseif($spaceType == 'project') $locateLink = $this->createLink('doc', 'projectSpace', "objectID={$spaceID}&libID={$libID}");
+ return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'load' => $locateLink));
+ }
+ else
+ {
+ $docAppAction = array('selectSpace', $spaceID, $libID);
+ return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'docApp' => $docAppAction));
}
- if($locateLink === 'true') $locateLink = true;
- return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'docApp' => $docID ? array('executeCommand', 'handleMovedDoc', array($docID, $space, $libID)) : array('load', null, null, null, array('noLoading' => true, 'picks' => 'lib'))));
}
/**
diff --git a/module/execution/control.php b/module/execution/control.php
index 0fd0804af0..24c8672300 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -163,6 +163,7 @@ class execution extends control
/* Append branches to task. */
$this->loadModel('task');
+ $this->loadModel('custom');
$branchGroups = $this->loadModel('branch')->getByProducts(array_keys($this->view->products));
foreach($tasks as $task)
{
@@ -182,6 +183,7 @@ class execution extends control
}
if(isset($branchGroups[$task->product][$task->branch])) $task->branch = $branchGroups[$task->product][$task->branch];
if($task->needConfirm) $task->status = 'changed';
+ if($this->config->edition != 'open') $task->relatedObject = $this->custom->getRelatedObjectList($task->id, 'task', 'byRelation', true);
}
$showAllModule = empty($this->config->execution->task->allModule) ? '' : 'allModule';
@@ -192,7 +194,7 @@ class execution extends control
$actionURL = $this->createLink('execution', 'task', "executionID=$executionID&status=bySearch¶m=myQueryID");
$this->config->execution->search['onMenuBar'] = 'yes';
if(!$execution->multiple) unset($this->config->execution->search['fields']['execution']);
- $this->execution->buildTaskSearchForm($executionID, $this->executions, $queryID, $actionURL, $modules);
+ $this->execution->buildTaskSearchForm($executionID, $this->executions, $queryID, $actionURL);
$this->view->title = $execution->name . $this->lang->hyphen . $this->lang->execution->task;
$this->view->tasks = $tasks;
diff --git a/module/execution/js/bug.ui.js b/module/execution/js/bug.ui.js
index bb544daf13..f97bd897ed 100644
--- a/module/execution/js/bug.ui.js
+++ b/module/execution/js/bug.ui.js
@@ -66,6 +66,14 @@ window.onRenderCell = function(result, {row, col})
result.push({html: '[' + caseCommonLang + '#' + row.data.case + ']'});
}
}
+ if(col.name == 'deadline' && result[0])
+ {
+ const bug = row.data;
+ if(['resolved', 'closed'].includes(bug.status)) return result;
+
+ const yesterday = zui.formatDate(zui.createDate() - 24 * 60 * 60 * 1000, 'yyyy-MM-dd');
+ if(result[0] <= yesterday) result[0] = {html: '' + result[0] + ''};
+ }
return result;
}
diff --git a/module/execution/js/common.ui.js b/module/execution/js/common.ui.js
index 3c76a64a47..adab8f53ff 100644
--- a/module/execution/js/common.ui.js
+++ b/module/execution/js/common.ui.js
@@ -7,7 +7,7 @@
window.computeWorkDays = function(currentID)
{
isBatchEdit = false;
- if(currentID)
+ if(currentID && typeof currentID != 'object')
{
index = currentID.replace(/[a-zA-Z]*\[|\]/g, '');
if(!isNaN(index)) isBatchEdit = true;
diff --git a/module/execution/js/task.ui.js b/module/execution/js/task.ui.js
index bdf08cff9c..691d3f08fe 100644
--- a/module/execution/js/task.ui.js
+++ b/module/execution/js/task.ui.js
@@ -130,8 +130,14 @@ window.renderCell = function(result, info)
result.push({html: bugTitle});
}
}
+ if(info.col.name == 'status' && result)
+ {
+ result[0] = {html: `` + info.row.data.status + ""};
+ }
if(info.col.name == 'deadline' && result[0])
{
+ if(['done', 'cancel', 'close'].includes(task.rawStatus)) return result;
+
const today = zui.formatDate(zui.createDate(), 'yyyy-MM-dd');
const yesterday = zui.formatDate(convertStringToDate(today) - 24 * 60 * 60 * 1000, 'yyyy-MM-dd');
if(result[0] == today)
diff --git a/module/execution/model.php b/module/execution/model.php
index 2419adb07b..d3c5ab442d 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -1074,10 +1074,11 @@ class executionModel extends model
* @param int $projectID
* @param string $type all|sprint|stage|kanban
* @param string $mode all|noclosed|stagefilter|withdelete|multiple|leaf|order_asc|empty|noprefix|withobject|hideMultiple
+ * @param bool $ignoreVision
* @access public
* @return array
*/
- public function getPairs(int $projectID = 0, string $type = 'all', string $mode = ''): array
+ public function getPairs(int $projectID = 0, string $type = 'all', string $mode = '', bool $ignoreVision = false): array
{
if(commonModel::isTutorialMode()) return $this->loadModel('tutorial')->getExecutionPairs();
@@ -1099,7 +1100,8 @@ class executionModel extends model
/* Order by status's content whether or not done. */
$executions = $this->dao->select("*, IF(INSTR('done,closed', status) < 2, 0, 1) AS isDone, INSTR('doing,wait,suspended,closed', status) AS sortStatus")->from(TABLE_EXECUTION)
- ->where('vision')->eq($this->config->vision)
+ ->where('1=1')
+ ->beginIF(!$ignoreVision)->andWhere('vision')->eq($this->config->vision)->fi()
->beginIF((!$this->session->multiple && $this->app->tab == 'execution') || strpos($mode, 'multiple') !== false)->andWhere('multiple')->eq('1')->fi()
->beginIF($type != 'all')->andWhere('type')->in($type)->fi()
->beginIF($type == 'all')->andWhere('type')->in('stage,sprint,kanban')->fi()
@@ -2489,6 +2491,17 @@ class executionModel extends model
$this->afterImportBug($task, $bug);
if(dao::isError()) return false;
+
+ if($this->config->edition != 'open')
+ {
+ $relation = new stdClass();
+ $relation->AType = 'bug';
+ $relation->AID = $bug->id;
+ $relation->relation = 'transferredto';
+ $relation->BType = 'task';
+ $relation->BID = $taskID;
+ $this->dao->replace(TABLE_RELATION)->data($relation)->exec();
+ }
}
return $mails;
@@ -3573,6 +3586,7 @@ class executionModel extends model
}
$orderBy = array_map(function($value){return 't1.' . $value;}, explode(',', $orderBy));
+ $orderBy = str_replace('storyTitle', 'story', $orderBy);
$orderBy = implode(',', $orderBy);
$taskIdList = $sql->where($condition)
@@ -3938,9 +3952,16 @@ class executionModel extends model
*/
public function buildTaskSearchForm(int $executionID, array $executions, int $queryID, string $actionURL)
{
+ $showAll = empty($executionID) && empty($executions) ? true : false;
+ if($showAll)
+ {
+ $executions = $this->getPairs(0, 'all', "nocode,noprefix,multiple");
+ $executionID = empty($executions) ? 0 : current(array_keys($executions));
+ }
+
$this->config->execution->search['actionURL'] = $actionURL;
$this->config->execution->search['queryID'] = $queryID;
- $this->config->execution->search['params']['execution']['values'] = array(''=>'', $executionID => $executions[$executionID], 'all' => $this->lang->execution->allExecutions);
+ $this->config->execution->search['params']['execution']['values'] = $showAll ? $executions : array(''=>'', $executionID => $executions[$executionID], 'all' => $this->lang->execution->allExecutions);
$this->config->execution->search['params']['story']['values'] = $this->loadModel('story')->getExecutionStoryPairs($executionID, 0, 'all', '', 'full', 'unclosed', 'story', false);
$projects = $this->loadModel('project')->getPairsByProgram();
diff --git a/module/execution/tao.php b/module/execution/tao.php
index 4a45d3f48a..3eee948c76 100644
--- a/module/execution/tao.php
+++ b/module/execution/tao.php
@@ -419,10 +419,10 @@ class executionTao extends executionModel
* @param string $sql
* @param string $orderBy
* @param object|null $pager
- * @access protected
+ * @access public
* @return object[]
*/
- protected function getSearchBugs(array $productIdList, int $executionID, string $sql = '1=1', string $orderBy = 'id_desc', object|null $pager = null): array
+ public function getSearchBugs(array $productIdList, int $executionID, string $sql = '1=1', string $orderBy = 'id_desc', object|null $pager = null): array
{
return $this->dao->select('*')->from(TABLE_BUG)
->where($sql)
@@ -592,7 +592,7 @@ class executionTao extends executionModel
$children = array();
foreach($stories as $story)
{
- if($story->parent != $parentID) continue;
+ if($story->parent != $parentID && ($parentID || (!$parentID && isset($stories[$story->parent])))) continue;
$avatarAccount = empty($story->assignedTo) ? zget($story, 'openedBy', '') : $story->assignedTo;
$userAvatar = zget($avatarPairs, $avatarAccount);
@@ -677,6 +677,8 @@ class executionTao extends executionModel
*/
protected function updateTeam(int $executionID, object $oldExecution, object $execution)
{
+ if(defined('RUN_MODE') && RUN_MODE == 'api') return;
+
/* Get team and language item. */
$this->loadModel('user');
$team = $this->user->getTeamMemberPairs($executionID, 'execution');
diff --git a/module/execution/test/lib/dynamic.ui.class.php b/module/execution/test/lib/dynamic.ui.class.php
new file mode 100644
index 0000000000..69e6a4d314
--- /dev/null
+++ b/module/execution/test/lib/dynamic.ui.class.php
@@ -0,0 +1,37 @@
+initForm('execution', 'dynamic', array('execution' => '3'), 'appIframe-execution');
+ if($form->dom->num->getText() != $num) return $this->failed('执行动态数量不正确');
+ return $this->success('执行动态数量正确');
+ }
+
+ /**
+ * 按用户筛选执行动态。
+ * Check the execution dynamic groupby user.
+ *
+ * @param string $user
+ * @param string $num
+ * @access public
+ * @return object
+ */
+ public function checkNumByUser($user, $num)
+ {
+ $form = $this->initForm('execution', 'dynamic', array('execution' => '3', 'user' => $user), 'appIframe-execution');
+ $form->dom->user->picker($user);
+ $form->wait(1);
+ if(count($form->dom->getElementList($form->dom->xpath['detailNum'])->element) != $num) return $this->failed('按用户筛选动态数据错误');
+ return $this->success('按用户筛选动态数据正确');
+ }
+}
diff --git a/module/execution/test/lib/storykanban.ui.class.php b/module/execution/test/lib/storykanban.ui.class.php
new file mode 100644
index 0000000000..c65f7c3710
--- /dev/null
+++ b/module/execution/test/lib/storykanban.ui.class.php
@@ -0,0 +1,23 @@
+initForm('execution', 'storykanban', array('execution' => '2'), 'appIframe-execution');
+ $form->dom->kanbanBtn->click();
+ $form->wait(1);
+ preg_match_all('/\d+(?:\.\d+)?/', $form->dom->$stage->getText(), $matches);
+ if($matches[0][0] != $num) return $this->failed("{$stage}列数据有误");
+ return $this->success("{$stage}列数据正确");
+ }
+}
diff --git a/module/execution/test/lib/tree.ui.class.php b/module/execution/test/lib/tree.ui.class.php
new file mode 100644
index 0000000000..dbda4483d7
--- /dev/null
+++ b/module/execution/test/lib/tree.ui.class.php
@@ -0,0 +1,39 @@
+initForm('execution', 'tree', array('execution' => '2'), 'appIframe-execution');
+ if($click) $form->dom->onlyStoryBtn->click();
+ $form->wait(1);
+ if(count($form->dom->getElementList($form->dom->xpath[$level])->element) != $num) return $this->failed('数据错误');
+ return $this->success('数据正确');
+ }
+
+ /**
+ * 检查树状图中的任务、需求详情显示。
+ * Check detail data.
+ *
+ * @access public
+ * @return object
+ */
+ public function checkDetail()
+ {
+ $form = $this->initForm('execution', 'tree', array('execution' => '2'), 'appIframe-execution');
+ $form->dom->detail->click();
+ $form->wait(1);
+ if($form->dom->detail->getText() == $form->dom->title->getText()) return $this->success('详情数据正确');
+ return $this->failed('详情数据错误');
+ }
+}
diff --git a/module/execution/test/ui/dynamic.php b/module/execution/test/ui/dynamic.php
new file mode 100644
index 0000000000..68ef16d8d5
--- /dev/null
+++ b/module/execution/test/ui/dynamic.php
@@ -0,0 +1,92 @@
+#!/usr/bin/env php
+id->range('1-100');
+$user->account->range('admin, user1, user2, user3, user4, user5');
+$user->realname->range('admin, USER1, USER2, USER3, USER4, USER5');
+$user->password->range($config->uitest->defaultPassword)->format('md5');
+$user->gen(6);
+
+$project = zenData('project');
+$project->id->range('1-100');
+$project->project->range('0, 1{2}');
+$project->model->range('scrum, []');
+$project->type->range('project, sprint{2}');
+$project->auth->range('extend, []{2}');
+$project->storyType->range('story, []{2}');
+$project->parent->range('0, 1{2}');
+$project->path->range('`,1,`, `,1,2,`, `,1,3,`');
+$project->grade->range('1');
+$project->name->range('项目, 执行1, 执行2');
+$project->begin->range('(-2M)-(-M):1D')->type('timestamp')->format('YY/MM/DD');
+$project->end->range('(+2M)-(+3M):1D')->type('timestamp')->format('YY/MM/DD');
+$project->openedBy->range('user1');
+$project->acl->range('open');
+$project->status->range('doing');
+$project->gen(3);
+
+$projectproduct = zenData('projectproduct');
+$projectproduct->project->range('1, 2');
+$projectproduct->product->range('1');
+$projectproduct->gen(2);
+
+$team = zenData('team');
+$team->root->range('1{3}, 2{3}, 3{3}');
+$team->type->range('project{3}, execution{6}');
+$team->account->range('user1, user2, admin');
+$team->gen(9);
+
+$task = zenData('task');
+$task->id->range('1-100');
+$task->project->range('1');
+$task->execution->range('2, 3{100}');
+$task->name->range('1-100');
+$task->status->range('wait');
+$task->gen(3);
+
+$taskSpec = zenData('taskspec');
+$taskSpec->task->range('1-100');
+$taskSpec->version->range('0');
+$taskSpec->name->range('1-100');
+$taskSpec->gen(3);
+
+$actionrecent = zenData('actionrecent');
+$actionrecent->id->range('1-100');
+$actionrecent->objectType->range('task');
+$actionrecent->objectID->range('1, 2, 3{100}');
+$actionrecent->product->range('1');
+$actionrecent->project->range('1');
+$actionrecent->execution->range('2, 3{100}');
+$actionrecent->actor->range('admin{2}, user1, user2{100}');
+$actionrecent->action->range('edited');
+$actionrecent->date->range('-:60')->type('timestamp')->format('YY/MM/DD hh:mm:ss');
+$actionrecent->gen(10);
+
+$action = zenData('action');
+$action->objectType->range('task');
+$action->objectID->range('1, 2, 3{100}');
+$action->product->range('1');
+$action->project->range('1');
+$action->execution->range('2, 3{100}');
+$action->actor->range('admin{2}, user1, user2{100}');
+$action->action->range('edited');
+$action->date->range('-:60')->type('timestamp')->format('YY/MM/DD hh:mm:ss');
+$action->gen(10);
+
+$tester = new dynamicTester();
+$tester->login();
+
+r($tester->checkTotalNum('9')) && p('status,message') && e('SUCCESS,执行动态数量正确');
+r($tester->checkNumByUser('USER2', '7')) && p('status,message') && e('SUCCESS,按用户筛选动态数据正确');
+$tester->closeBrowser();
diff --git a/module/execution/test/ui/page/dynamic.php b/module/execution/test/ui/page/dynamic.php
new file mode 100644
index 0000000000..3c578ee660
--- /dev/null
+++ b/module/execution/test/ui/page/dynamic.php
@@ -0,0 +1,13 @@
+ "//*[@id='featureBar']/menu/li[2]/a/span[2]",
+ 'detailNum' => "//*[@id='mainContent']/div/div/ul/li/div[2]/div/ul/li"
+ );
+ $this->dom->xpath = array_merge($this->dom->xpath, $xpath);
+ }
+}
diff --git a/module/execution/test/ui/page/storykanban.php b/module/execution/test/ui/page/storykanban.php
new file mode 100644
index 0000000000..022e7d4896
--- /dev/null
+++ b/module/execution/test/ui/page/storykanban.php
@@ -0,0 +1,19 @@
+ "//*[@id='actionBar']/div[1]/a[2]/i",
+ 'projected' => "//*[@id='kanban']/div/div[1]/div[2]/div[1]/div/div/span",
+ 'developing' => "//*[@id='kanban']/div/div[1]/div[2]/div[2]/div/div/span",
+ 'developed' => "//*[@id='kanban']/div/div[1]/div[2]/div[3]/div/div/span",
+ 'testing' => "//*[@id='kanban']/div/div[1]/div[2]/div[4]/div/div/span",
+ 'tested' => "//*[@id='kanban']/div/div[1]/div[2]/div[5]/div/div/span",
+ 'accepted' => "//*[@id='kanban']/div/div[1]/div[2]/div[6]/div/div/span",
+ 'released' => "//*[@id='kanban']/div/div[1]/div[2]/div[7]/div/div/span"
+ );
+ $this->dom->xpath = array_merge($this->dom->xpath, $xpath);
+ }
+}
diff --git a/module/execution/test/ui/page/tree.php b/module/execution/test/ui/page/tree.php
new file mode 100644
index 0000000000..fed30a7e2e
--- /dev/null
+++ b/module/execution/test/ui/page/tree.php
@@ -0,0 +1,19 @@
+ "//*[@id='mainContent']/div/div[1]/div/menu/li[@z-type='item']",
+ 'secondLevelA' => "//*[@id='mainContent']/div/div[1]/div/menu/li[1]/menu/li[@z-type='item']",
+ 'secondLevelB' => "//*[@id='mainContent']/div/div[1]/div/menu/li[2]/menu/li[@z-type='item']",
+ 'thirdLevelB' => "//*[@id='mainContent']/div/div[1]/div/menu/li[2]/menu/li[1]/menu/li[@z-type='item']",
+ 'fourthLevelB' => "//*[@id='mainContent']/div/div[1]/div/menu/li[2]/menu/li[1]/menu/li[1]/menu/li[@z-type='item']",
+ 'onlyStoryBtn' => "//*[@id='featureBar']/menu/div/label",
+ 'detail' => "//*[@id='mainContent']/div/div[1]/div/menu/li[2]/menu/li/menu/li[1]/div/div/div/div/span[3]",
+ 'title' => "//*[@id='detailBlock']/div[1]/div[1]/span[2]"
+ );
+ $this->dom->xpath = array_merge($this->dom->xpath, $xpath);
+ }
+}
diff --git a/module/execution/test/ui/storykanban.php b/module/execution/test/ui/storykanban.php
new file mode 100644
index 0000000000..89cf324d96
--- /dev/null
+++ b/module/execution/test/ui/storykanban.php
@@ -0,0 +1,84 @@
+#!/usr/bin/env php
+id->range('1-100');
+$product->name->range('产品1');
+$product->type->range('normal');
+$product->gen(1);
+
+$project = zenData('project');
+$project->id->range('1-100');
+$project->project->range('0, 1');
+$project->model->range('scrum, []');
+$project->type->range('project, sprint');
+$project->auth->range('extend, []');
+$project->storyType->range('story, []');
+$project->parent->range('0, 1');
+$project->path->range('`,1,`, `,1,2,`');
+$project->grade->range('1');
+$project->name->range('项目, 执行');
+$project->begin->range('(-2M)-(-M):1D')->type('timestamp')->format('YY/MM/DD');
+$project->end->range('(+2M)-(+3M):1D')->type('timestamp')->format('YY/MM/DD');
+$project->openedBy->range('user1');
+$project->acl->range('open');
+$project->status->range('doing');
+$project->gen(2);
+
+$projectproduct = zenData('projectproduct');
+$projectproduct->project->range('1, 2');
+$projectproduct->product->range('1');
+$projectproduct->gen(2);
+
+$story = zenData('story');
+$story->id->range('1-100');
+$story->parent->range('0{3}, 3{2}, 0{100}');
+$story->isParent->range('0{2}, 1, 0{100}');
+$story->root->range('1, 2, 3{3}, 6-100');
+$story->path->range('`,1,`, `,2,`, `,3,`, `,3,4,`, `,3,5,`, `,6,`, `,7,`, `,8,`, `,9,`, `,10,`');
+$story->grade->range('1{3}, 2{2}, 1{100}');
+$story->product->range('1');
+$story->title->range('1-100');
+$story->type->range('story');
+$story->estimate->range('0');
+$story->status->range('active');
+$story->stage->range('projected{2}, developing, testing{2}, developed, tested, verified{2}, released');
+$story->assignedTo->range('[]');
+$story->version->range('1');
+$story->gen(10);
+
+$storySpec = zenData('storyspec');
+$storySpec->story->range('1-100');
+$storySpec->version->range('1');
+$storySpec->title->range('1-100');
+$storySpec->gen(10);
+
+$projectStory = zenData('projectstory');
+$projectStory->project->range('1{10}, 2{10}');
+$projectStory->product->range('1');
+$projectStory->branch->range('0');
+$projectStory->story->range('1-10 ');
+$projectStory->version->range('1');
+$projectStory->order->range('1-10');
+$projectStory->gen(20);
+
+$tester = new storykanbanTester();
+$tester->login();
+
+r($tester->check('projected', '2')) && p('status,message') && e('SUCCESS,projected列数据有误');
+r($tester->check('developing', '1')) && p('status,message') && e('SUCCESS,developing列数据有误');
+r($tester->check('developed', '1')) && p('status,message') && e('SUCCESS,developed列数据有误');
+r($tester->check('testing', '2')) && p('status,message') && e('SUCCESS,testing列数据有误');
+r($tester->check('tested', '1')) && p('status,message') && e('SUCCESS,tested列数据有误');
+r($tester->check('accepted', '2')) && p('status,message') && e('SUCCESS,accepted列数据有误');
+r($tester->check('released', '1')) && p('status,message') && e('SUCCESS,released列数据有误');
+$tester->closeBrowser();
diff --git a/module/execution/test/ui/tree.php b/module/execution/test/ui/tree.php
new file mode 100644
index 0000000000..df5c49367e
--- /dev/null
+++ b/module/execution/test/ui/tree.php
@@ -0,0 +1,116 @@
+#!/usr/bin/env php
+id->range('1-100');
+$product->name->range('产品1, 产品2');
+$product->type->range('normal');
+$product->gen(2);
+
+$project = zenData('project');
+$project->id->range('1-100');
+$project->project->range('0, 1');
+$project->model->range('scrum, []');
+$project->type->range('project, sprint');
+$project->auth->range('extend, []');
+$project->storyType->range('story, []');
+$project->parent->range('0, 1');
+$project->path->range('`,1,`, `,1,2,`');
+$project->grade->range('1');
+$project->name->range('项目, 执行');
+$project->begin->range('(-2M)-(-M):1D')->type('timestamp')->format('YY/MM/DD');
+$project->end->range('(+2M)-(+3M):1D')->type('timestamp')->format('YY/MM/DD');
+$project->openedBy->range('user1');
+$project->acl->range('open');
+$project->status->range('doing');
+$project->gen(2);
+
+$projectproduct = zenData('projectproduct');
+$projectproduct->project->range('1{2}, 2{2}');
+$projectproduct->product->range('1, 2');
+$projectproduct->gen(4);
+
+$story = zenData('story');
+$story->id->range('1-100');
+$story->parent->range('0');
+$story->isParent->range('0');
+$story->root->range('1-100');
+$story->path->range('`,1,`, `,2,`, `,3,`');
+$story->grade->range('1');
+$story->product->range('1{2}, 2');
+$story->module->range('1{2}, 2');
+$story->plan->range('0');
+$story->title->range('1-100');
+$story->type->range('story');
+$story->estimate->range('0');
+$story->status->range('active');
+$story->stage->range('projected');
+$story->assignedTo->range('[]');
+$story->version->range('1');
+$story->gen(3);
+
+$storySpec = zenData('storyspec');
+$storySpec->story->range('1-100');
+$storySpec->version->range('1');
+$storySpec->title->range('1-100');
+$storySpec->gen(3);
+
+$projectStory = zenData('projectstory');
+$projectStory->project->range('1{3}, 2{3}');
+$projectStory->product->range('1{2}, 2');
+$projectStory->branch->range('0');
+$projectStory->story->range('1, 2, 3');
+$projectStory->version->range('1');
+$projectStory->order->range('1, 2, 3');
+$projectStory->gen(6);
+
+$module = zenData('module');
+$module->id->range('1-100');
+$module->root->range('1, 2, 2');
+$module->branch->range('0');
+$module->name->range('产品1模块1, 产品2模块1, 执行模块1');
+$module->parent->range('0');
+$module->path->range('`,1,`, `,2,`, `,3,`');
+$module->grade->range('1');
+$module->type->range('story{2}, task');
+$module->short->range('0');
+$module->gen(3);
+
+$task = zenData('task');
+$task->id->range('1-100');
+$task->project->range('1');
+$task->execution->range('2');
+$task->module->range('1{3}, 2, 3, 0{99}');
+$task->story->range('1, 1, 2, 3, 0{99}');
+$task->storyVersion->range('1');
+$task->name->range('1-100');
+$task->gen(12);
+
+$taskSpec = zenData('taskspec');
+$taskSpec->task->range('1-100');
+$taskSpec->version->range('0');
+$taskSpec->name->range('1-100');
+$taskSpec->gen(12);
+
+$tester = new treeTester();
+$tester->login();
+
+r($tester->checkTreeData('firstLevel', '4')) && p('status,message') && e('SUCCESS,数据正确');
+r($tester->checkTreeData('secondLevelA', '7')) && p('status,message') && e('SUCCESS,数据正确');
+r($tester->checkTreeData('secondLevelB', '1')) && p('status,message') && e('SUCCESS,数据正确');
+r($tester->checkTreeData('thirdLevelB', '2')) && p('status,message') && e('SUCCESS,数据正确');
+r($tester->checkTreeData('fourthLevelB', '1')) && p('status,message') && e('SUCCESS,数据正确');
+r($tester->checkTreeData('firstLevel', '2', true)) && p('status,message') && e('SUCCESS,数据正确');
+r($tester->checkTreeData('secondLevelA', '1') ) && p('status,message') && e('SUCCESS,数据正确');
+r($tester->checkTreeData('thirdLevelB', '1')) && p('status,message') && e('SUCCESS,数据正确');
+r($tester->checkDetail()) && p('status,message') && e('SUCCESS,详情数据正确');
+$tester->closeBrowser();
diff --git a/module/execution/ui/create.html.php b/module/execution/ui/create.html.php
index dd5f89fe41..28383812be 100644
--- a/module/execution/ui/create.html.php
+++ b/module/execution/ui/create.html.php
@@ -42,7 +42,7 @@ if(!empty($project->model) && $project->model == 'agileplus')
jsVar('+projectID', $projectID);
jsVar('copyProjectID', $copyProjectID);
-jsVar('weekend', $config->execution->weekend);
+jsVar('window.weekend', $config->execution->weekend);
jsVar('isStage', $isStage);
jsVar('copyExecutionID', $copyExecutionID);
jsVar('executionID', isset($executionID) ? $executionID : 0);
diff --git a/module/execution/ui/task.html.php b/module/execution/ui/task.html.php
index a65126e86f..0852a654ab 100644
--- a/module/execution/ui/task.html.php
+++ b/module/execution/ui/task.html.php
@@ -29,6 +29,7 @@ $canBatchCreate = common::canModify('execution', $execution) && hasPriv('task',
$canImportTask = common::canModify('execution', $execution) && hasPriv('execution', 'importTask');
$canImportBug = common::canModify('execution', $execution) && hasPriv('execution', 'importBug');
+$app->loadLang('my');
$this->loadModel('task');
$importItems = array();
if(common::canModify('execution', $execution))
@@ -56,6 +57,7 @@ $cols = $this->loadModel('datatable')->getSetting('execution');
if($execution->type != 'stage') unset($cols['design']);
$tableData = initTableData($tasks, $cols, $this->task);
+$lang->task->statusList['changed'] = $lang->my->storyChanged;
foreach($tableData as $task)
{
$task->rawStatus = $task->status;
diff --git a/module/group/lang/de.php b/module/group/lang/de.php
index 3afc55d262..eb58846536 100644
--- a/module/group/lang/de.php
+++ b/module/group/lang/de.php
@@ -340,7 +340,7 @@ $lang->group->package->serverRoom = 'Server Room';
$lang->group->package->account = 'Account';
$lang->group->package->domain = 'Domain';
$lang->group->package->service = 'Service';
-$lang->group->package->deployPlan = 'Deploy Plan';
+$lang->group->package->deployPlan = 'Online';
$lang->group->package->deployScope = 'Deploy Scope';
$lang->group->package->deployStep = 'Deploy Step';
$lang->group->package->deployCase = 'Deploy Case';
diff --git a/module/group/lang/en.php b/module/group/lang/en.php
index 942ef29c55..e55e96983b 100644
--- a/module/group/lang/en.php
+++ b/module/group/lang/en.php
@@ -340,7 +340,7 @@ $lang->group->package->serverRoom = 'Server Room';
$lang->group->package->account = 'Account';
$lang->group->package->domain = 'Domain';
$lang->group->package->service = 'Service';
-$lang->group->package->deployPlan = 'Deploy Plan';
+$lang->group->package->deployPlan = 'Online';
$lang->group->package->deployScope = 'Deploy Scope';
$lang->group->package->deployStep = 'Deploy Step';
$lang->group->package->deployCase = 'Deploy Case';
diff --git a/module/group/lang/fr.php b/module/group/lang/fr.php
index 1fba94c3f2..4628b085fc 100644
--- a/module/group/lang/fr.php
+++ b/module/group/lang/fr.php
@@ -340,7 +340,7 @@ $lang->group->package->serverRoom = 'Server Room';
$lang->group->package->account = 'Account';
$lang->group->package->domain = 'Domain';
$lang->group->package->service = 'Service';
-$lang->group->package->deployPlan = 'Deploy Plan';
+$lang->group->package->deployPlan = 'Online';
$lang->group->package->deployScope = 'Deploy Scope';
$lang->group->package->deployStep = 'Deploy Step';
$lang->group->package->deployCase = 'Deploy Case';
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 7af829762c..3c34fcd853 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -1469,19 +1469,6 @@ $lang->job->methodOrder[25] = 'exec';
$lang->job->methodOrder[30] = 'view';
$lang->job->methodOrder[35] = 'trigger';
-$lang->resource->account = new stdclass();
-$lang->resource->account->browse = 'browse';
-$lang->resource->account->create = 'create';
-$lang->resource->account->edit = 'editAction';
-$lang->resource->account->delete = 'deleteAction';
-$lang->resource->account->view = 'view';
-
-$lang->account->methodOrder[0] = 'browse';
-$lang->account->methodOrder[5] = 'create';
-$lang->account->methodOrder[10] = 'edit';
-$lang->account->methodOrder[15] = 'delete';
-$lang->account->methodOrder[20] = 'view';
-
$lang->resource->serverroom = new stdclass();
$lang->resource->serverroom->browse = 'browse';
$lang->resource->serverroom->create = 'create';
@@ -1510,7 +1497,6 @@ $lang->resource->system->ossview = 'ossView';
$lang->resource->ops = new stdclass();
$lang->resource->ops->provider = 'provider';
$lang->resource->ops->city = 'city';
-$lang->resource->ops->cpubrand = 'cpuBrand';
$lang->resource->ops->os = 'os';
/* Doc. */
@@ -1990,6 +1976,7 @@ $lang->resource->aiapp->collectMiniProgram = 'collectMiniProgram';
/* Others. */
$lang->resource->api = new stdclass();
$lang->resource->api->index = 'index';
+$lang->resource->api->view = 'view';
$lang->resource->api->createLib = 'createLib';
$lang->resource->api->editLib = 'editLib';
$lang->resource->api->deleteLib = 'deleteLib';
@@ -2013,6 +2000,7 @@ $lang->resource->api->debug = 'debug';
$lang->resource->api->sql = 'sql';
$lang->api->methodOrder[0] = 'index';
+$lang->api->methodOrder[3] = 'view';
$lang->api->methodOrder[5] = 'createLib';
$lang->api->methodOrder[10] = 'editLib';
$lang->api->methodOrder[15] = 'deleteLib';
diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php
index 4b1b37f489..e8abf51548 100644
--- a/module/group/lang/zh-cn.php
+++ b/module/group/lang/zh-cn.php
@@ -340,7 +340,7 @@ $lang->group->package->serverRoom = '机房管理';
$lang->group->package->account = '账号管理';
$lang->group->package->domain = '域名管理';
$lang->group->package->service = '服务管理';
-$lang->group->package->deployPlan = '运维计划';
+$lang->group->package->deployPlan = '上线申请';
$lang->group->package->deployScope = '上线范围';
$lang->group->package->deployStep = '上线步骤';
$lang->group->package->deployCase = '上线用例';
diff --git a/module/group/model.php b/module/group/model.php
index f48b4f45c2..eb28786fd3 100644
--- a/module/group/model.php
+++ b/module/group/model.php
@@ -621,6 +621,7 @@ class groupModel extends model
$privs = array();
foreach($this->post->actions as $action)
{
+ if(!$action) continue;
list($module, $method) = explode('-', $action);
foreach($this->post->groups as $group)
{
diff --git a/module/group/packagemanager.php b/module/group/packagemanager.php
index 7d7a4863ef..a755577215 100644
--- a/module/group/packagemanager.php
+++ b/module/group/packagemanager.php
@@ -369,6 +369,10 @@ $config->group->subset->repo = new stdclass();
$config->group->subset->repo->order = 2400;
$config->group->subset->repo->nav = 'devops';
+$config->group->subset->deployment = new stdclass();
+$config->group->subset->deployment->order = 2400;
+$config->group->subset->deployment->nav = 'devops';
+
$config->group->subset->search = new stdclass();
$config->group->subset->search->order = 1570;
@@ -453,10 +457,6 @@ $config->group->subset->ops = new stdclass();
$config->group->subset->ops->order = 1920;
$config->group->subset->ops->nav = 'admin';
-$config->group->subset->deploy = new stdclass();
-$config->group->subset->deploy->order = 3020;
-$config->group->subset->deploy->nav = 'devops';
-
$config->group->subset->traincourse = new stdclass();
$config->group->subset->traincourse->order = 2000;
$config->group->subset->traincourse->nav = 'traincourse';
@@ -1739,7 +1739,7 @@ $config->group->package->system->privs['system-ossview'] = array('edition'
$config->group->package->host = new stdclass();
$config->group->package->host->order = 2220;
-$config->group->package->host->subset = 'ops';
+$config->group->package->host->subset = 'deployment';
$config->group->package->host->privs = array();
$config->group->package->host->privs['host-browse'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array('admin-index'), 'recommend' => array('host-create', 'host-edit', 'host-treemap', 'host-view'));
$config->group->package->host->privs['host-create'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 10, 'depend' => array('host-browse'), 'recommend' => array('host-changeStatus', 'host-edit'));
@@ -1759,16 +1759,6 @@ $config->group->package->serverRoom->privs['serverroom-edit'] = array('edition
$config->group->package->serverRoom->privs['serverroom-view'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 1, 'depend' => array('serverroom-browse'), 'recommend' => array('serverroom-create', 'serverroom-edit'));
$config->group->package->serverRoom->privs['serverroom-delete'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 4, 'depend' => array('serverroom-browse'), 'recommend' => array('serverroom-create', 'serverroom-edit'));
-$config->group->package->account = new stdclass();
-$config->group->package->account->order = 2260;
-$config->group->package->account->subset = 'ops';
-$config->group->package->account->privs = array();
-$config->group->package->account->privs['account-browse'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 0, 'depend' => array(), 'recommend' => array('account-create', 'account-edit', 'account-view'));
-$config->group->package->account->privs['account-create'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 2, 'depend' => array('account-browse'), 'recommend' => array('account-edit'));
-$config->group->package->account->privs['account-edit'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 3, 'depend' => array('account-browse'), 'recommend' => array('account-create'));
-$config->group->package->account->privs['account-view'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 1, 'depend' => array('account-browse'), 'recommend' => array('account-create', 'account-edit'));
-$config->group->package->account->privs['account-delete'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 4, 'depend' => array('account-browse'), 'recommend' => array('account-create', 'account-edit'));
-
$config->group->package->domain = new stdclass();
$config->group->package->domain->order = 2270;
$config->group->package->domain->subset = 'ops';
@@ -1790,49 +1780,6 @@ $config->group->package->service->privs['service-delete'] = array('edition' => '
$config->group->package->service->privs['service-view'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 1, 'depend' => array('service-browse'), 'recommend' => array('service-create', 'service-edit', 'service-manage'));
$config->group->package->service->privs['service-manage'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 4, 'depend' => array('service-browse'), 'recommend' => array('service-create', 'service-edit'));
-$config->group->package->deployPlan = new stdclass();
-$config->group->package->deployPlan->order = 5;
-$config->group->package->deployPlan->subset = 'deploy';
-$config->group->package->deployPlan->privs = array();
-$config->group->package->deployPlan->privs['deploy-browse'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 0, 'depend' => array('ops-stage', 'repo-maintain'), 'recommend' => array('deploy-activate', 'deploy-create', 'deploy-edit', 'deploy-finish', 'deploy-view'));
-$config->group->package->deployPlan->privs['deploy-create'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 2, 'depend' => array('deploy-browse'), 'recommend' => array('deploy-activate', 'deploy-edit', 'deploy-finish'));
-$config->group->package->deployPlan->privs['deploy-edit'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 3, 'depend' => array('deploy-browse'), 'recommend' => array('deploy-activate', 'deploy-create', 'deploy-finish'));
-$config->group->package->deployPlan->privs['deploy-delete'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 6, 'depend' => array('deploy-browse'), 'recommend' => array('deploy-create', 'deploy-edit'));
-$config->group->package->deployPlan->privs['deploy-activate'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 4, 'depend' => array('deploy-browse'), 'recommend' => array('deploy-create', 'deploy-edit', 'deploy-finish'));
-$config->group->package->deployPlan->privs['deploy-finish'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array('deploy-browse'), 'recommend' => array('deploy-activate', 'deploy-create', 'deploy-edit'));
-$config->group->package->deployPlan->privs['deploy-view'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 1, 'depend' => array('deploy-browse'), 'recommend' => array('deploy-activate', 'deploy-create', 'deploy-edit', 'deploy-finish'));
-$config->group->package->deployPlan->privs['ops-stage'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 10, 'depend' => array(), 'recommend' => array());
-
-$config->group->package->deployScope = new stdclass();
-$config->group->package->deployScope->order = 10;
-$config->group->package->deployScope->subset = 'deploy';
-$config->group->package->deployScope->privs = array();
-$config->group->package->deployScope->privs['deploy-scope'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 35, 'depend' => array('deploy-browse'), 'recommend' => array('deploy-manageScope'));
-$config->group->package->deployScope->privs['deploy-manageScope'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 40, 'depend' => array('deploy-browse', 'deploy-scope'), 'recommend' => array());
-
-$config->group->package->deployStep = new stdclass();
-$config->group->package->deployStep->order = 15;
-$config->group->package->deployStep->subset = 'deploy';
-$config->group->package->deployStep->privs = array();
-$config->group->package->deployStep->privs['testtask-runDeployCase'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 6, 'depend' => array('deploy-browse', 'deploy-steps'), 'recommend' => array('deploy-assignTo', 'deploy-editStep', 'deploy-finishStep', 'deploy-manageStep', 'testtask-deployCaseResults'));
-$config->group->package->deployStep->privs['testtask-deployCaseResults'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 7, 'depend' => array('deploy-browse', 'deploy-steps'), 'recommend' => array('deploy-assignTo', 'deploy-editStep', 'deploy-finishStep', 'deploy-manageStep', 'testtask-runDeployCase'));
-$config->group->package->deployStep->privs['deploy-steps'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 0, 'depend' => array('deploy-browse'), 'recommend' => array('deploy-assignTo', 'deploy-editStep', 'deploy-finishStep', 'deploy-manageStep', 'deploy-viewStep', 'testtask-deployCaseResults', 'testtask-runDeployCase'));
-$config->group->package->deployStep->privs['deploy-manageStep'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 2, 'depend' => array('deploy-browse', 'deploy-steps'), 'recommend' => array('deploy-assignTo', 'deploy-editStep', 'deploy-finishStep', 'testtask-deployCaseResults', 'testtask-runDeployCase'));
-$config->group->package->deployStep->privs['deploy-finishStep'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array('deploy-browse', 'deploy-steps'), 'recommend' => array('deploy-assignTo', 'deploy-editStep', 'deploy-manageStep', 'testtask-deployCaseResults', 'testtask-runDeployCase'));
-$config->group->package->deployStep->privs['deploy-assignTo'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 4, 'depend' => array('deploy-browse', 'deploy-steps'), 'recommend' => array('deploy-editStep', 'deploy-finishStep', 'deploy-manageStep', 'testtask-deployCaseResults', 'testtask-runDeployCase'));
-$config->group->package->deployStep->privs['deploy-viewStep'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 1, 'depend' => array('deploy-browse', 'deploy-steps'), 'recommend' => array('deploy-assignTo', 'deploy-editStep', 'deploy-finishStep', 'deploy-manageStep', 'testtask-deployCaseResults', 'testtask-runDeployCase'));
-$config->group->package->deployStep->privs['deploy-editStep'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 3, 'depend' => array('deploy-browse', 'deploy-steps'), 'recommend' => array('deploy-assignTo', 'deploy-finishStep', 'deploy-manageStep', 'testtask-deployCaseResults', 'testtask-runDeployCase'));
-$config->group->package->deployStep->privs['deploy-deleteStep'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 8, 'depend' => array('deploy-browse', 'deploy-steps'), 'recommend' => array('deploy-assignTo', 'deploy-editStep', 'deploy-finishStep', 'deploy-manageStep', 'testtask-deployCaseResults', 'testtask-runDeployCase'));
-
-$config->group->package->deployCase = new stdclass();
-$config->group->package->deployCase->order = 20;
-$config->group->package->deployCase->subset = 'deploy';
-$config->group->package->deployCase->privs = array();
-$config->group->package->deployCase->privs['deploy-cases'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 50, 'depend' => array('deploy-browse'), 'recommend' => array('deploy-linkCases', 'deploy-unlinkCase'));
-$config->group->package->deployCase->privs['deploy-linkCases'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 55, 'depend' => array('deploy-browse', 'deploy-cases'), 'recommend' => array('deploy-unlinkCase'));
-$config->group->package->deployCase->privs['deploy-unlinkCase'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 60, 'depend' => array('deploy-browse', 'deploy-cases'), 'recommend' => array('deploy-batchUnlinkCases', 'deploy-linkCases'));
-$config->group->package->deployCase->privs['deploy-batchUnlinkCases'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 65, 'depend' => array('deploy-browse', 'deploy-cases'), 'recommend' => array('deploy-unlinkCase'));
-
$config->group->package->qaIndex = new stdclass();
$config->group->package->qaIndex->order = 5;
$config->group->package->qaIndex->subset = 'qa';
@@ -3661,7 +3608,8 @@ $config->group->package->browseAPI = new stdclass();
$config->group->package->browseAPI->order = 5;
$config->group->package->browseAPI->subset = 'api';
$config->group->package->browseAPI->privs = array();
-$config->group->package->browseAPI->privs['api-index'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array(), 'recommend' => array());
+$config->group->package->browseAPI->privs['api-index'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array(), 'recommend' => array('api-view'));
+$config->group->package->browseAPI->privs['api-view'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array('api-index'), 'recommend' => array());
$config->group->package->manageAPI = new stdclass();
$config->group->package->manageAPI->order = 10;
@@ -3998,12 +3946,6 @@ $config->group->package->manageCity->subset = 'ops';
$config->group->package->manageCity->privs = array();
$config->group->package->manageCity->privs['ops-city'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 25, 'depend' => array(), 'recommend' => array());
-$config->group->package->manageCPU = new stdclass();
-$config->group->package->manageCPU->order = 2340;
-$config->group->package->manageCPU->subset = 'ops';
-$config->group->package->manageCPU->privs = array();
-$config->group->package->manageCPU->privs['ops-cpubrand'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 30, 'depend' => array(), 'recommend' => array());
-
$config->group->package->manageOS = new stdclass();
$config->group->package->manageOS->order = 2360;
$config->group->package->manageOS->subset = 'ops';
@@ -4237,12 +4179,16 @@ $config->group->package->useThinkWizard->privs['thinkwizard-result'] = array('ed
$config->group->package->manageThinkWizard = new stdclass();
$config->group->package->manageThinkWizard->subset = 'thinkwizard';
$config->group->package->manageThinkWizard->privs = array();
-$config->group->package->manageThinkWizard->privs['thinkwizard-create'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 5, 'depend' => array('thinkwizard-browse'));
-$config->group->package->manageThinkWizard->privs['thinkwizard-edit'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 10, 'depend' => array('thinkwizard-browse'));
-$config->group->package->manageThinkWizard->privs['thinkwizard-design'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 15, 'depend' => array('thinkwizard-browse', 'thinkwizard-result', 'thinkstep-create', 'thinkstep-edit', 'thinkstep-view', 'thinkstep-delete', 'thinkstep-link', 'thinkstep-cancelLink'));
-$config->group->package->manageThinkWizard->privs['thinkwizard-publish'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 20, 'depend' => array('thinkwizard-browse'));
-$config->group->package->manageThinkWizard->privs['thinkwizard-offline'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 25, 'depend' => array('thinkwizard-browse'));
-$config->group->package->manageThinkWizard->privs['thinkwizard-admin'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 25, 'depend' => array('thinkwizard-browse'));
+$config->group->package->manageThinkWizard->privs['thinkwizard-create'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 5, 'depend' => array('thinkwizard-browse'));
+$config->group->package->manageThinkWizard->privs['thinkwizard-edit'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 10, 'depend' => array('thinkwizard-browse'));
+$config->group->package->manageThinkWizard->privs['thinkwizard-design'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 15, 'depend' => array('thinkwizard-browse', 'thinkwizard-result', 'thinkstep-create', 'thinkstep-edit', 'thinkstep-view', 'thinkstep-delete', 'thinkstep-link', 'thinkstep-cancelLink', 'thinkwizard-configureobjectsforappeals', 'thinkwizard-configuredimensionforappeals', 'thinkwizard-configurequestionsforappeals', 'thinkwizard-scoringcriteria'));
+$config->group->package->manageThinkWizard->privs['thinkwizard-publish'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 20, 'depend' => array('thinkwizard-browse'));
+$config->group->package->manageThinkWizard->privs['thinkwizard-offline'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 25, 'depend' => array('thinkwizard-browse'));
+$config->group->package->manageThinkWizard->privs['thinkwizard-admin'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 30, 'depend' => array('thinkwizard-browse'));
+$config->group->package->manageThinkWizard->privs['thinkwizard-configureobjectsforappeals'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 35, 'depend' => array('thinkwizard-admin'));
+$config->group->package->manageThinkWizard->privs['thinkwizard-configuredimensionforappeals'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 40, 'depend' => array('thinkwizard-admin'));
+$config->group->package->manageThinkWizard->privs['thinkwizard-configurequestionsforappeals'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 45, 'depend' => array('thinkwizard-admin'));
+$config->group->package->manageThinkWizard->privs['thinkwizard-scoringcriteria'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 50, 'depend' => array('thinkwizard-admin'));
$config->group->package->deleteThinkWizard = new stdclass();
$config->group->package->deleteThinkWizard->subset = 'thinkwizard';
diff --git a/module/host/config.php b/module/host/config.php
index 5d2c83c118..e078754ff6 100644
--- a/module/host/config.php
+++ b/module/host/config.php
@@ -2,10 +2,10 @@
$config->host->create = new stdclass();
$config->host->edit = new stdclass();
$config->host->changestatus = new stdclass();
-$config->host->create->requiredFields = 'name,zap,tags,provider,intranet,extranet';
-$config->host->edit->requiredFields = 'name,zap,tags,provider,intranet,extranet';
-$config->host->create->intFields = 'cpuNumber,cpuCores,zap';
+$config->host->create->requiredFields = 'name,intranet,extranet';
+$config->host->edit->requiredFields = 'name,intranet,extranet';
$config->host->create->ipFields = 'intranet,extranet';
+$config->host->create->intFields = 'diskSize,memory';
$config->host->editor = new stdclass();
$config->host->editor->changestatus = array('id' => 'reason', 'tools' => 'simple');
diff --git a/module/host/config/dtable.php b/module/host/config/dtable.php
index f4028f976a..794f38458c 100644
--- a/module/host/config/dtable.php
+++ b/module/host/config/dtable.php
@@ -12,52 +12,60 @@ $config->host->dtable->fieldList['group']['title'] = $lang->host->group;
$config->host->dtable->fieldList['group']['name'] = 'group';
$config->host->dtable->fieldList['group']['type'] = 'text';
$config->host->dtable->fieldList['group']['sortType'] = true;
-$config->host->dtable->fieldList['group']['width'] = 80;
+$config->host->dtable->fieldList['group']['minWidth'] = '80';
+$config->host->dtable->fieldList['group']['show'] = true;
+$config->host->dtable->fieldList['group']['order'] = 30;
-$config->host->dtable->fieldList['name']['title'] = $lang->host->name;
-$config->host->dtable->fieldList['name']['name'] = 'name';
-$config->host->dtable->fieldList['name']['type'] = 'desc';
-$config->host->dtable->fieldList['name']['sortType'] = true;
-$config->host->dtable->fieldList['name']['flex'] = 4;
-$config->host->dtable->fieldList['name']['hint'] = true;
-$config->host->dtable->fieldList['name']['link'] = array('module' => 'host', 'method' => 'view', 'params' => 'id={id}');
+$config->host->dtable->fieldList['name']['title'] = $lang->host->name;
+$config->host->dtable->fieldList['name']['name'] = 'name';
+$config->host->dtable->fieldList['name']['type'] = 'desc';
+$config->host->dtable->fieldList['name']['sortType'] = true;
+$config->host->dtable->fieldList['name']['flex'] = 4;
+$config->host->dtable->fieldList['name']['hint'] = true;
+$config->host->dtable->fieldList['name']['link'] = array('module' => 'host', 'method' => 'view', 'params' => 'id={id}');
+$config->host->dtable->fieldList['name']['show'] = true;
+$config->host->dtable->fieldList['name']['required'] = true;
$config->host->dtable->fieldList['name']['data-toggle'] = 'modal';
+$config->host->dtable->fieldList['name']['order'] = 40;
-$config->host->dtable->fieldList['admin']['title'] = $lang->host->admin;
-$config->host->dtable->fieldList['admin']['name'] = 'admin';
-$config->host->dtable->fieldList['admin']['type'] = 'text';
-$config->host->dtable->fieldList['admin']['sortType'] = true;
-$config->host->dtable->fieldList['admin']['link'] = array('module' => 'account', 'method' => 'view', 'params' => 'id={admin}');
-$config->host->dtable->fieldList['admin']['data-toggle'] = 'modal';
-
-$config->host->dtable->fieldList['serverRoom']['title'] = $lang->host->serverRoom;
-$config->host->dtable->fieldList['serverRoom']['name'] = 'serverRoom';
-$config->host->dtable->fieldList['serverRoom']['type'] = 'text';
-$config->host->dtable->fieldList['serverRoom']['sortType'] = true;
-$config->host->dtable->fieldList['serverRoom']['link'] = array('module' => 'serverroom', 'method' => 'view', 'params' => 'id={serverRoom}');
+$config->host->dtable->fieldList['serverRoom']['title'] = $lang->host->serverRoom;
+$config->host->dtable->fieldList['serverRoom']['name'] = 'serverRoom';
+$config->host->dtable->fieldList['serverRoom']['type'] = 'text';
+$config->host->dtable->fieldList['serverRoom']['sortType'] = true;
+$config->host->dtable->fieldList['serverRoom']['link'] = array('module' => 'serverroom', 'method' => 'view', 'params' => 'id={serverRoom}');
+$config->host->dtable->fieldList['serverRoom']['show'] = true;
$config->host->dtable->fieldList['serverRoom']['data-toggle'] = 'modal';
+$config->host->dtable->fieldList['serverRoom']['order'] = 50;
$config->host->dtable->fieldList['intranet']['title'] = $lang->host->intranet;
$config->host->dtable->fieldList['intranet']['name'] = 'intranet';
$config->host->dtable->fieldList['intranet']['type'] = 'text';
$config->host->dtable->fieldList['intranet']['sortType'] = true;
+$config->host->dtable->fieldList['intranet']['show'] = true;
+$config->host->dtable->fieldList['intranet']['order'] = 60;
$config->host->dtable->fieldList['extranet']['title'] = $lang->host->extranet;
$config->host->dtable->fieldList['extranet']['name'] = 'extranet';
$config->host->dtable->fieldList['extranet']['type'] = 'text';
$config->host->dtable->fieldList['extranet']['sortType'] = true;
+$config->host->dtable->fieldList['extranet']['show'] = true;
+$config->host->dtable->fieldList['extranet']['order'] = 70;
$config->host->dtable->fieldList['osVersion']['title'] = $lang->host->osVersion;
$config->host->dtable->fieldList['osVersion']['name'] = 'osVersion';
$config->host->dtable->fieldList['osVersion']['type'] = 'text';
$config->host->dtable->fieldList['osVersion']['sortType'] = true;
+$config->host->dtable->fieldList['osVersion']['show'] = true;
+$config->host->dtable->fieldList['osVersion']['order'] = 80;
$config->host->dtable->fieldList['status']['title'] = $lang->host->status;
$config->host->dtable->fieldList['status']['name'] = 'status';
$config->host->dtable->fieldList['status']['type'] = 'text';
$config->host->dtable->fieldList['status']['sortType'] = true;
-$config->host->dtable->fieldList['status']['width'] = 80;
+$config->host->dtable->fieldList['status']['minWidth'] = '80';
$config->host->dtable->fieldList['status']['map'] = $lang->host->statusList;
+$config->host->dtable->fieldList['status']['show'] = true;
+$config->host->dtable->fieldList['status']['order'] = 90;
$config->host->actionList = array();
$config->host->actionList['online']['icon'] = 'arrow-up';
@@ -79,7 +87,7 @@ $config->host->actionList['edit']['text'] = $lang->edit;
$config->host->actionList['edit']['hint'] = $lang->edit;
$config->host->actionList['edit']['showText'] = true;
$config->host->actionList['edit']['url'] = array('module' => 'host', 'method' => 'edit', 'params' => 'id={id}');
-if(isInModal()) $config->host->actionList['edit']['data-load'] = 'modal';
+if(isInModal()) $config->host->actionList['edit']['data-toggle'] = 'modal';
$config->host->actionList['delete']['icon'] = 'trash';
$config->host->actionList['delete']['text'] = $lang->delete;
@@ -96,3 +104,4 @@ $config->host->dtable->fieldList['actions']['sortType'] = false;
$config->host->dtable->fieldList['actions']['fixed'] = 'right';
$config->host->dtable->fieldList['actions']['menu'] = array('online|offline', 'edit', 'delete');
$config->host->dtable->fieldList['actions']['list'] = $config->host->actionList;
+$config->host->dtable->fieldList['actions']['width'] = 100;
diff --git a/module/host/config/form.php b/module/host/config/form.php
index d7f164d4aa..e88bb4e93b 100644
--- a/module/host/config/form.php
+++ b/module/host/config/form.php
@@ -1,51 +1,33 @@
host->form = new stdclass();
$config->host->form->create = array();
-$config->host->form->create['name'] = array('type' => 'string', 'required' => true, 'default' => '');
-$config->host->form->create['admin'] = array('type' => 'int', 'required' => false, 'default' => '');
-$config->host->form->create['cpuBrand'] = array('type' => 'string', 'required' => false, 'default' => '');
-$config->host->form->create['cpuModel'] = array('type' => 'string', 'required' => false, 'default' => '');
-$config->host->form->create['cpuNumber'] = array('type' => 'int', 'required' => false, 'default' => 0);
-$config->host->form->create['cpuCores'] = array('type' => 'int', 'required' => false, 'default' => 0);
-$config->host->form->create['diskSize'] = array('type' => 'float', 'required' => false, 'default' => 0);
-$config->host->form->create['memory'] = array('type' => 'float', 'required' => false, 'default' => 0);
-$config->host->form->create['group'] = array('type' => 'string', 'required' => false, 'default' => '');
-$config->host->form->create['serverRoom'] = array('type' => 'int', 'required' => false, 'default' => '');
-$config->host->form->create['serverModel'] = array('type' => 'string', 'required' => false, 'default' => '');
-$config->host->form->create['hostType'] = array('type' => 'string', 'required' => false, 'default' => '');
-$config->host->form->create['osName'] = array('type' => 'string', 'required' => false, 'default' => '');
-$config->host->form->create['osVersion'] = array('type' => 'string', 'required' => false, 'default' => '');
-$config->host->form->create['zap'] = array('type' => 'string', 'required' => true, 'default' => '');
-$config->host->form->create['vsoft'] = array('type' => 'string', 'required' => false, 'default' => '');
-$config->host->form->create['intranet'] = array('type' => 'string', 'required' => true, 'default' => '');
-$config->host->form->create['extranet'] = array('type' => 'string', 'required' => true, 'default' => '');
-$config->host->form->create['provider'] = array('type' => 'string', 'required' => true, 'default' => '');
-$config->host->form->create['status'] = array('type' => 'string', 'required' => false, 'default' => '');
-$config->host->form->create['type'] = array('type' => 'string', 'required' => false, 'default' => 'normal');
-$config->host->form->create['hardwareType'] = array('type' => 'string', 'required' => false, 'default' => 'server');
+$config->host->form->create['name'] = array('type' => 'string', 'required' => true, 'default' => '');
+$config->host->form->create['cpuNumber'] = array('type' => 'int', 'required' => false, 'default' => 0);
+$config->host->form->create['diskSize'] = array('type' => 'string', 'required' => false, 'default' => '');
+$config->host->form->create['memory'] = array('type' => 'string', 'required' => false, 'default' => '');
+$config->host->form->create['group'] = array('type' => 'string', 'required' => false, 'default' => '');
+$config->host->form->create['serverRoom'] = array('type' => 'int', 'required' => false, 'default' => '');
+$config->host->form->create['osName'] = array('type' => 'string', 'required' => false, 'default' => '');
+$config->host->form->create['osVersion'] = array('type' => 'string', 'required' => false, 'default' => '');
+$config->host->form->create['intranet'] = array('type' => 'string', 'required' => true, 'default' => '');
+$config->host->form->create['extranet'] = array('type' => 'string', 'required' => true, 'default' => '');
+$config->host->form->create['status'] = array('type' => 'string', 'required' => false, 'default' => '');
+$config->host->form->create['type'] = array('type' => 'string', 'required' => false, 'default' => 'normal');
+$config->host->form->create['desc'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->host->form->edit = array();
-$config->host->form->edit['name'] = array('type' => 'string', 'required' => true, 'default' => '');
-$config->host->form->edit['admin'] = array('type' => 'int', 'required' => false, 'default' => '');
-$config->host->form->edit['cpuBrand'] = array('type' => 'string', 'required' => false, 'default' => '');
-$config->host->form->edit['cpuModel'] = array('type' => 'string', 'required' => false, 'default' => '');
-$config->host->form->edit['cpuNumber'] = array('type' => 'int', 'required' => false, 'default' => 0);
-$config->host->form->edit['cpuCores'] = array('type' => 'int', 'required' => false, 'default' => 0);
-$config->host->form->edit['diskSize'] = array('type' => 'float', 'required' => false, 'default' => 0);
-$config->host->form->edit['memory'] = array('type' => 'float', 'required' => false, 'default' => 0);
-$config->host->form->edit['group'] = array('type' => 'string', 'required' => false, 'default' => '');
-$config->host->form->edit['serverRoom'] = array('type' => 'int', 'required' => false, 'default' => '');
-$config->host->form->edit['serverModel'] = array('type' => 'string', 'required' => false, 'default' => '');
-$config->host->form->edit['hostType'] = array('type' => 'string', 'required' => false, 'default' => '');
-$config->host->form->edit['osName'] = array('type' => 'string', 'required' => false, 'default' => '');
-$config->host->form->edit['osVersion'] = array('type' => 'string', 'required' => false, 'default' => '');
-$config->host->form->edit['zap'] = array('type' => 'string', 'required' => true, 'default' => '');
-$config->host->form->edit['vsoft'] = array('type' => 'string', 'required' => false, 'default' => '');
-$config->host->form->edit['intranet'] = array('type' => 'string', 'required' => true, 'default' => '');
-$config->host->form->edit['extranet'] = array('type' => 'string', 'required' => true, 'default' => '');
-$config->host->form->edit['provider'] = array('type' => 'string', 'required' => true, 'default' => '');
-$config->host->form->edit['status'] = array('type' => 'string', 'required' => false, 'default' => '');
-$config->host->form->edit['hardwareType'] = array('type' => 'string', 'required' => false, 'default' => 'server');
+$config->host->form->edit['name'] = array('type' => 'string', 'required' => true, 'default' => '');
+$config->host->form->edit['cpuNumber'] = array('type' => 'int', 'required' => false, 'default' => 0);
+$config->host->form->edit['diskSize'] = array('type' => 'string', 'required' => false, 'default' => '');
+$config->host->form->edit['memory'] = array('type' => 'string', 'required' => false, 'default' => '');
+$config->host->form->edit['group'] = array('type' => 'string', 'required' => false, 'default' => '');
+$config->host->form->edit['serverRoom'] = array('type' => 'int', 'required' => false, 'default' => '');
+$config->host->form->edit['osName'] = array('type' => 'string', 'required' => false, 'default' => '');
+$config->host->form->edit['osVersion'] = array('type' => 'string', 'required' => false, 'default' => '');
+$config->host->form->edit['intranet'] = array('type' => 'string', 'required' => true, 'default' => '');
+$config->host->form->edit['extranet'] = array('type' => 'string', 'required' => true, 'default' => '');
+$config->host->form->edit['status'] = array('type' => 'string', 'required' => false, 'default' => '');
+$config->host->form->edit['desc'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->host->form->changeStatus = array();
$config->host->form->changeStatus['reason'] = array('type' => 'string', 'required' => true, 'default' => '', 'control' => 'editor');
diff --git a/module/host/control.php b/module/host/control.php
index eeaf13da85..52808e0c3f 100644
--- a/module/host/control.php
+++ b/module/host/control.php
@@ -46,7 +46,6 @@ class host extends control
$this->view->title = $this->lang->host->common;
$this->view->hostList = $this->host->getList($browseType, $param, $orderBy, $pager);
$this->view->rooms = $rooms;
- $this->view->accounts = $this->loadModel('account')->getPairs();
$this->view->param = $param;
$this->view->browseType = $browseType;
$this->view->orderBy = $orderBy;
@@ -64,11 +63,11 @@ class host extends control
* @access public
* @return void
*/
- public function create(string $osName = 'linux')
+ public function create()
{
if($_POST)
{
- $formData = form::data($this->config->host->form->create)->add('createdBy', $this->app->user->account)->add('createdDate', helper::now())->get();
+ $formData = form::data($this->config->host->form->create)->add('createdBy', $this->app->user->account)->add('createdDate', helper::now())->skipSpecial('name,desc')->get();
$this->hostZen->checkFormData($formData);
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
@@ -79,9 +78,7 @@ class host extends control
}
$this->view->title = $this->lang->host->create;
- $this->view->osName = $osName;
$this->view->rooms = $this->loadModel('serverroom')->getPairs();
- $this->view->accounts = $this->loadModel('account')->getPairs();
$this->view->optionMenu = $this->loadModel('tree')->getOptionMenu(0, 'host');
$this->display();
}
@@ -95,25 +92,23 @@ class host extends control
* @access public
* @return void
*/
- public function edit(int $id, string $osName = '')
+ public function edit(int $id)
{
if($_POST)
{
- $formData = form::data($this->config->host->form->edit)->add('id', $id)->add('editedBy', $this->app->user->account)->add('editedDate', helper::now())->get();
+ $formData = form::data($this->config->host->form->edit)->add('id', $id)->add('editedBy', $this->app->user->account)->add('editedDate', helper::now())->skipSpecial('name,desc')->get();
$this->hostZen->checkFormData($formData);
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
$this->host->update($formData);
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
- return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => inlink('browse'), 'closeModal' => true));
+ return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => inlink('browse')));
}
$this->view->title = $this->lang->host->edit;
$this->view->host = $this->host->fetchByID($id);
- $this->view->osName = $osName ? $osName : $this->view->host->osName;
$this->view->rooms = $this->loadModel('serverroom')->getPairs();
- $this->view->accounts = $this->loadModel('account')->getPairs();
$this->view->optionMenu = $this->loadModel('tree')->getOptionMenu(0, 'host');
$this->display();
}
@@ -133,7 +128,6 @@ class host extends control
$this->view->rooms = $this->loadModel('serverroom')->getPairs();
$this->view->optionMenu = $this->loadModel('tree')->getOptionMenu(0, 'host');
$this->view->actions = $this->loadModel('action')->getList('host', $id);
- $this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->display();
}
@@ -195,4 +189,24 @@ class host extends control
$this->view->type = $type;
$this->display();
}
+
+ /**
+ * Js获取所有的操作系统列表。
+ * Get all os list.
+ *
+ * @param string $type
+ * @access public
+ * @return void
+ */
+ public function ajaxGetOS(string $type)
+ {
+ $type .= 'List';
+ $osList = $this->lang->host->{$type};
+ if(empty($osList)) return '';
+
+ $osItems = array();
+ foreach($osList as $version => $os) $osItems[] = array('text' => $os, 'value' => $version);
+
+ return print(json_encode($osItems));
+ }
}
diff --git a/module/host/js/browse.ui.js b/module/host/js/browse.ui.js
index 5453d6eb8c..96b99f3136 100644
--- a/module/host/js/browse.ui.js
+++ b/module/host/js/browse.ui.js
@@ -1,11 +1,13 @@
window.renderCell = function(result, {col, row})
{
+ if(col.name === 'serverRoom')
+ {
+ if(row.data.serverRoom) result[1].attrs.title = rooms[row.data.serverRoom];
+ }
if(col.name === 'osVersion')
{
const{osName, osVersion} = row.data;
if(osName) result[0] = {html: hostLang[osName + 'List'][osVersion]};
-
- return result;
}
return result;
diff --git a/module/host/js/common.ui.js b/module/host/js/common.ui.js
new file mode 100644
index 0000000000..c4c5c23702
--- /dev/null
+++ b/module/host/js/common.ui.js
@@ -0,0 +1,24 @@
+window.osChange = function()
+{
+ const osName = $('[name="osName"]').val();
+ if(typeof osName === 'undefined') return;
+
+ toggleLoading('#osVersion', true);
+ const $picker = $('[name="osVersion"]').zui('picker');
+ if(typeof $picker === 'undefined') return;
+
+ $picker.$.clear();
+ if(!osName)
+ {
+ $picker.render({items: []});
+ toggleLoading('#osVersion', false);
+ return;
+ }
+
+ $.getJSON($.createLink('host', 'ajaxGetOS', 'type=' + osName), function(items)
+ {
+ $picker.render({items: items});
+ if(typeof(host) !== 'undefined') $picker.$.setValue(host.osVersion);
+ toggleLoading('#osVersion', false);
+ });
+};
diff --git a/module/host/js/create.ui.js b/module/host/js/create.ui.js
deleted file mode 100644
index 44a291ffdb..0000000000
--- a/module/host/js/create.ui.js
+++ /dev/null
@@ -1,4 +0,0 @@
-window.osChange = function(e)
-{
- loadPage($.createLink('host', 'create', 'osName=' + e.target.value), '#osVersion');
-}
\ No newline at end of file
diff --git a/module/host/js/edit.ui.js b/module/host/js/edit.ui.js
deleted file mode 100644
index 894d3eed0d..0000000000
--- a/module/host/js/edit.ui.js
+++ /dev/null
@@ -1,4 +0,0 @@
-window.osChange = function(e)
-{
- loadPage($.createLink('host', 'edit', 'id=' + host.id + '&osName=' + e.target.value), '#osVersion');
-}
\ No newline at end of file
diff --git a/module/host/lang/de.php b/module/host/lang/de.php
index 10634d761a..e44d0ebe7d 100644
--- a/module/host/lang/de.php
+++ b/module/host/lang/de.php
@@ -3,7 +3,7 @@ $lang->host->common = 'Host';
$lang->host->browse = 'Host List';
$lang->host->create = 'Add Host';
$lang->host->view = 'Host View';
-$lang->host->edit = 'Edit';
+$lang->host->edit = 'Edit Host';
$lang->host->editAction = 'Edit Host';
$lang->host->delete = 'Delete';
$lang->host->deleteAction = 'Delete Host';
@@ -28,6 +28,7 @@ $lang->host->cpuCores = 'CPU Cores';
$lang->host->cpuRate = 'CPU Rate';
$lang->host->memory = 'Memory Size';
$lang->host->serverRoom = 'IDC';
+$lang->host->desc = 'Description';
$lang->host->createdBy = 'CreatedBy';
$lang->host->createdDate = 'CreatedDate';
@@ -54,10 +55,6 @@ $lang->host->offlineReason = 'Offline Reason';
$lang->host->unitList['GB'] = 'GB';
$lang->host->unitList['TB'] = 'TB';
-$lang->host->cpuBrandList[''] = '';
-$lang->host->cpuBrandList['intel'] = 'Intel';
-$lang->host->cpuBrandList['amd'] = 'AMD';
-
$lang->host->database = 'Database';
$lang->host->databaseList[''] = '';
$lang->host->databaseList['mysql55'] = 'MySQL 5.5';
@@ -168,9 +165,14 @@ $lang->host->diskTypeList['ssd'] = 'SSD';
$lang->host->confirmDelete = 'Do you want to delete this host?';
$lang->host->notice = new stdclass();
-$lang->host->notice->memory = 'Memory size should be numbers！';
-$lang->host->notice->diskSize = 'Disk size should be numbers！';
-$lang->host->notice->cpuNumber = 'CPU number should be numbers！';
-$lang->host->notice->cpuCores = 'CPU cores should be numbers！';
-$lang->host->notice->int = '『%s』should be a positive integer!';
-$lang->host->notice->ip = '『%s』incorrect format!';
+$lang->host->notice->memory = 'Memory size should be numbers！';
+$lang->host->notice->diskSize = 'Disk size should be numbers！';
+$lang->host->notice->cpuNumber = 'CPU number should be numbers！';
+$lang->host->notice->cpuCores = 'CPU cores should be numbers！';
+$lang->host->notice->int = '『%s』should be a positive integer!';
+$lang->host->notice->ip = '『%s』incorrect format!';
+$lang->host->notice->nameLength = 'Host name length should not exceed 100 characters!';
+$lang->host->notice->descLength = 'Host description length should not exceed 255 characters!';
+
+$lang->host->CDlist = array();
+$lang->host->CDlist['manual'] = 'Manual';
diff --git a/module/host/lang/en.php b/module/host/lang/en.php
index 10634d761a..e44d0ebe7d 100644
--- a/module/host/lang/en.php
+++ b/module/host/lang/en.php
@@ -3,7 +3,7 @@ $lang->host->common = 'Host';
$lang->host->browse = 'Host List';
$lang->host->create = 'Add Host';
$lang->host->view = 'Host View';
-$lang->host->edit = 'Edit';
+$lang->host->edit = 'Edit Host';
$lang->host->editAction = 'Edit Host';
$lang->host->delete = 'Delete';
$lang->host->deleteAction = 'Delete Host';
@@ -28,6 +28,7 @@ $lang->host->cpuCores = 'CPU Cores';
$lang->host->cpuRate = 'CPU Rate';
$lang->host->memory = 'Memory Size';
$lang->host->serverRoom = 'IDC';
+$lang->host->desc = 'Description';
$lang->host->createdBy = 'CreatedBy';
$lang->host->createdDate = 'CreatedDate';
@@ -54,10 +55,6 @@ $lang->host->offlineReason = 'Offline Reason';
$lang->host->unitList['GB'] = 'GB';
$lang->host->unitList['TB'] = 'TB';
-$lang->host->cpuBrandList[''] = '';
-$lang->host->cpuBrandList['intel'] = 'Intel';
-$lang->host->cpuBrandList['amd'] = 'AMD';
-
$lang->host->database = 'Database';
$lang->host->databaseList[''] = '';
$lang->host->databaseList['mysql55'] = 'MySQL 5.5';
@@ -168,9 +165,14 @@ $lang->host->diskTypeList['ssd'] = 'SSD';
$lang->host->confirmDelete = 'Do you want to delete this host?';
$lang->host->notice = new stdclass();
-$lang->host->notice->memory = 'Memory size should be numbers！';
-$lang->host->notice->diskSize = 'Disk size should be numbers！';
-$lang->host->notice->cpuNumber = 'CPU number should be numbers！';
-$lang->host->notice->cpuCores = 'CPU cores should be numbers！';
-$lang->host->notice->int = '『%s』should be a positive integer!';
-$lang->host->notice->ip = '『%s』incorrect format!';
+$lang->host->notice->memory = 'Memory size should be numbers！';
+$lang->host->notice->diskSize = 'Disk size should be numbers！';
+$lang->host->notice->cpuNumber = 'CPU number should be numbers！';
+$lang->host->notice->cpuCores = 'CPU cores should be numbers！';
+$lang->host->notice->int = '『%s』should be a positive integer!';
+$lang->host->notice->ip = '『%s』incorrect format!';
+$lang->host->notice->nameLength = 'Host name length should not exceed 100 characters!';
+$lang->host->notice->descLength = 'Host description length should not exceed 255 characters!';
+
+$lang->host->CDlist = array();
+$lang->host->CDlist['manual'] = 'Manual';
diff --git a/module/host/lang/fr.php b/module/host/lang/fr.php
index f995df5764..e44d0ebe7d 100644
--- a/module/host/lang/fr.php
+++ b/module/host/lang/fr.php
@@ -1,45 +1,46 @@
host->common = 'Serveurs';
-$lang->host->browse = 'Liste Serveurs';
-$lang->host->create = 'Ajouter Serveur';
-$lang->host->view = 'Détail Serveur';
-$lang->host->edit = 'Editer';
-$lang->host->editAction = 'Editer Serveur';
-$lang->host->delete = 'Supprimer';
-$lang->host->deleteAction = 'Supprimer Serveur';
-$lang->host->treemap = 'Topologie Serveur';
+$lang->host->common = 'Host';
+$lang->host->browse = 'Host List';
+$lang->host->create = 'Add Host';
+$lang->host->view = 'Host View';
+$lang->host->edit = 'Edit Host';
+$lang->host->editAction = 'Edit Host';
+$lang->host->delete = 'Delete';
+$lang->host->deleteAction = 'Delete Host';
+$lang->host->treemap = 'Host Topology';
$lang->host->changeStatus = 'Online/Offline';
-$lang->host->byQuery = 'Recherche';
-$lang->host->reason = 'Raison';
+$lang->host->byQuery = 'Search';
+$lang->host->reason = 'Reason';
-$lang->host->name = 'Nom';
+$lang->host->name = 'Name';
$lang->host->type = 'Type';
-$lang->host->hardwareType = 'Type Hardware';
-$lang->host->group = 'Groupe Serveur';
+$lang->host->hardwareType = 'Hardware Type';
+$lang->host->group = 'Host Group';
$lang->host->admin = 'Admin';
-$lang->host->cabinet = 'Local';
-$lang->host->intranet = 'IP Privée';
+$lang->host->cabinet = 'Cabinet';
+$lang->host->intranet = 'Intranet IP';
$lang->host->extranet = 'Extranet IP';
$lang->host->mac = 'MAC';
-$lang->host->cpuBrand = 'CPU Marque';
-$lang->host->cpuModel = 'CPU Modèle';
-$lang->host->cpuNumber = 'CPU Numéro';
+$lang->host->cpuBrand = 'CPU Brand';
+$lang->host->cpuModel = 'CPU Model';
+$lang->host->cpuNumber = 'CPU Number';
$lang->host->cpuCores = 'CPU Cores';
-$lang->host->cpuRate = 'CPU Freq.';
-$lang->host->memory = 'Capacité Mémoire';
+$lang->host->cpuRate = 'CPU Rate';
+$lang->host->memory = 'Memory Size';
$lang->host->serverRoom = 'IDC';
+$lang->host->desc = 'Description';
-$lang->host->createdBy = 'Créé par';
-$lang->host->createdDate = 'Créé le';
-$lang->host->editedBy = 'Edité par';
-$lang->host->editedDate = 'Edité le';
-$lang->host->all = 'Tous Serveurs';
+$lang->host->createdBy = 'CreatedBy';
+$lang->host->createdDate = 'CreatedDate';
+$lang->host->editedBy = 'EditedBy';
+$lang->host->editedDate = 'EditedDate';
+$lang->host->all = 'All Hosts';
$lang->host->empty = 'No Host';
-$lang->host->groupMaintenance = 'Gérer Groupes';
+$lang->host->groupMaintenance = 'Manage Group';
-$lang->host->status = 'Statut';
+$lang->host->status = 'Status';
$lang->host->statusList['online'] = 'Online';
$lang->host->statusList['busy'] = 'Overloaded';
$lang->host->statusList['offline'] = 'Offline';
@@ -48,16 +49,12 @@ $lang->host->online = 'On';
$lang->host->busy = 'Overload';
$lang->host->offline = 'Off';
-$lang->host->onlineReason = 'Raison Online';
-$lang->host->offlineReason = 'Raison Offline';
+$lang->host->onlineReason = 'Online Reason';
+$lang->host->offlineReason = 'Offline Reason';
$lang->host->unitList['GB'] = 'GB';
$lang->host->unitList['TB'] = 'TB';
-$lang->host->cpuBrandList[''] = '';
-$lang->host->cpuBrandList['intel'] = 'Intel';
-$lang->host->cpuBrandList['amd'] = 'AMD';
-
$lang->host->database = 'Database';
$lang->host->databaseList[''] = '';
$lang->host->databaseList['mysql55'] = 'MySQL 5.5';
@@ -71,7 +68,7 @@ $lang->host->databaseList['mongodb34'] = 'MongoDB 3.4';
$lang->host->databaseList['postgresql95'] = 'PostgreSQL 9.5';
$lang->host->databaseList['postgresql96'] = 'PostgreSQL 9.6';
-$lang->host->webserver = 'Serveur Web';
+$lang->host->webserver = 'Web Server';
$lang->host->webserverList[''] = '';
$lang->host->webserverList['apache2425'] = 'Apache 2.4.25';
$lang->host->webserverList['apache2426'] = 'Apache 2.4.26';
@@ -84,7 +81,7 @@ $lang->host->webserverList['iis7'] = 'IIS 7';
$lang->host->webserverList['iis8'] = 'IIS 8';
$lang->host->webserverList['iis10'] = 'IIS 10';
-$lang->host->language = 'Langage';
+$lang->host->language = 'Language';
$lang->host->languageList[''] = '';
$lang->host->languageList['php56'] = 'PHP 5.6';
$lang->host->languageList['php70'] = 'PHP 7.0';
@@ -97,10 +94,10 @@ $lang->host->featureBar['browse']['all'] = $lang->host->all;
$lang->host->featureBar['browse']['serverroom'] = 'Physical Topology';
$lang->host->featureBar['browse']['group'] = 'Logical Topology';
-$lang->host->serverModel = 'Modèle Serveur';
-$lang->host->hostType = 'Type Serveur';
-$lang->host->hostTypeList['physical'] = 'Physique';
-$lang->host->hostTypeList['virtual'] = 'Virtuel';
+$lang->host->serverModel = 'Server Model';
+$lang->host->hostType = 'Host Type';
+$lang->host->hostTypeList['physical'] = 'Physical';
+$lang->host->hostTypeList['virtual'] = 'Virtual';
$lang->host->osVersion = 'OS Version';
$lang->host->osName = 'OS Name';
@@ -116,7 +113,7 @@ $lang->host->osNameList['windows'] = 'Microsoft Windows';
$lang->host->osNameList['solaris'] = 'Solaris';
$lang->host->osNameList['netware'] = 'Novell NetWare';
$lang->host->osNameList['esx'] = 'VMware ESX';
-$lang->host->osNameList['other'] = 'Autres';
+$lang->host->osNameList['other'] = 'Others';
$lang->host->tagsList['vm'] = 'VM';
$lang->host->tagsList['native'] = 'Native';
@@ -127,7 +124,7 @@ $lang->host->windows = 'Microsoft Windows';
$lang->host->solaris = 'Solaris';
$lang->host->netware = 'Novell NetWare';
$lang->host->esx = 'VMware ESX';
-$lang->host->other = 'Autres';
+$lang->host->other = 'Others';
$lang->host->linuxList[''] = '';
$lang->host->linuxList['centos65'] = 'CentOS 6.5';
@@ -160,17 +157,22 @@ $lang->host->otherList[''] = '';
$lang->host->otherList['freebsd'] = 'FreeBSD';
$lang->host->otherList['freebsdx64'] = 'FreeBSD X64';
-$lang->host->diskSize = 'Taille Disque';
-$lang->host->diskType = 'Type Disque';
+$lang->host->diskSize = 'Disk Size';
+$lang->host->diskType = 'Disk Type';
$lang->host->diskTypeList['hdd'] = 'HDD';
$lang->host->diskTypeList['ssd'] = 'SSD';
-$lang->host->confirmDelete = 'Voulez-vous supprimer ce serveur ?';
+$lang->host->confirmDelete = 'Do you want to delete this host?';
$lang->host->notice = new stdclass();
-$lang->host->notice->memory = 'La capacité mémoire doit être numérique !';
-$lang->host->notice->diskSize = 'La capacité du disque doit être numérique !';
-$lang->host->notice->cpuNumber = 'CPU number doit être numérique !';
-$lang->host->notice->cpuCores = 'CPU cores doit être numérique !';
-$lang->host->notice->int = '『%s』should be a positive integer!';
-$lang->host->notice->ip = '『%s』incorrect format!';
+$lang->host->notice->memory = 'Memory size should be numbers！';
+$lang->host->notice->diskSize = 'Disk size should be numbers！';
+$lang->host->notice->cpuNumber = 'CPU number should be numbers！';
+$lang->host->notice->cpuCores = 'CPU cores should be numbers！';
+$lang->host->notice->int = '『%s』should be a positive integer!';
+$lang->host->notice->ip = '『%s』incorrect format!';
+$lang->host->notice->nameLength = 'Host name length should not exceed 100 characters!';
+$lang->host->notice->descLength = 'Host description length should not exceed 255 characters!';
+
+$lang->host->CDlist = array();
+$lang->host->CDlist['manual'] = 'Manual';
diff --git a/module/host/lang/zh-cn.php b/module/host/lang/zh-cn.php
index d55d9bee85..009d4d6486 100644
--- a/module/host/lang/zh-cn.php
+++ b/module/host/lang/zh-cn.php
@@ -3,7 +3,7 @@ $lang->host->common = '主机';
$lang->host->browse = '主机列表';
$lang->host->create = '添加主机';
$lang->host->view = '主机详情';
-$lang->host->edit = '编辑';
+$lang->host->edit = '编辑主机';
$lang->host->editAction = '编辑主机';
$lang->host->delete = '删除';
$lang->host->deleteAction = '删除主机';
@@ -28,6 +28,7 @@ $lang->host->cpuCores = '单CPU核心数';
$lang->host->cpuRate = 'CPU频率';
$lang->host->memory = '内存大小';
$lang->host->serverRoom = '机房';
+$lang->host->desc = '描述';
$lang->host->createdBy = '由谁创建';
$lang->host->createdDate = '创建时间';
@@ -54,10 +55,6 @@ $lang->host->offlineReason = '下架原因';
$lang->host->unitList['GB'] = 'GB';
$lang->host->unitList['TB'] = 'TB';
-$lang->host->cpuBrandList[''] = '';
-$lang->host->cpuBrandList['intel'] = '英特尔';
-$lang->host->cpuBrandList['amd'] = 'AMD';
-
$lang->host->database = '数据库';
$lang->host->databaseList[''] = '';
$lang->host->databaseList['mysql55'] = 'MySQL 5.5';
@@ -168,9 +165,14 @@ $lang->host->diskTypeList['ssd'] = '固态硬盘';
$lang->host->confirmDelete = '是否删除该主机记录？';
$lang->host->notice = new stdclass();
-$lang->host->notice->memory = '内存大小只能为数字！';
-$lang->host->notice->diskSize = '硬盘容量只能为数字！';
-$lang->host->notice->cpuNumber = 'CPU数量只能为数字！';
-$lang->host->notice->cpuCores = 'CPU核心数只能为数字！';
-$lang->host->notice->int = '『%s』应当是正整数！';
-$lang->host->notice->ip = '『%s』格式不正确！';
+$lang->host->notice->memory = '内存大小只能为数字！';
+$lang->host->notice->diskSize = '硬盘容量只能为数字！';
+$lang->host->notice->cpuNumber = 'CPU数量只能为数字！';
+$lang->host->notice->cpuCores = 'CPU核心数只能为数字！';
+$lang->host->notice->int = '『%s』应当是正整数！';
+$lang->host->notice->ip = '『%s』格式不正确！';
+$lang->host->notice->nameLength = '主机名称长度不能超过100个字符！';
+$lang->host->notice->descLength = '主机描述长度不能超过255个字符！';
+
+$lang->host->CDlist = array();
+$lang->host->CDlist['manual'] = '手工';
diff --git a/module/host/lang/zh-tw.php b/module/host/lang/zh-tw.php
index 076f77df46..a3afedb1bf 100644
--- a/module/host/lang/zh-tw.php
+++ b/module/host/lang/zh-tw.php
@@ -43,10 +43,6 @@ $lang->host->offline = '下架';
$lang->host->unitList['GB'] = 'GB';
$lang->host->unitList['TB'] = 'TB';
-$lang->host->cpuBrandList[''] = '';
-$lang->host->cpuBrandList['intel'] = '英特爾';
-$lang->host->cpuBrandList['amd'] = 'AMD';
-
$lang->host->database = '資料庫';
$lang->host->databaseList[''] = '';
$lang->host->databaseList['mysql55'] = 'MySQL 5.5';
diff --git a/module/host/model.php b/module/host/model.php
index de9ad53976..5333086c3e 100644
--- a/module/host/model.php
+++ b/module/host/model.php
@@ -54,7 +54,7 @@ class hostModel extends model
$modules = 0;
if($browseType == 'bymodule' && $param) $modules = $this->loadModel('tree')->getAllChildId($param);
- return $this->dao->select('*')->from(TABLE_HOST)
+ $hostList = $this->dao->select('*')->from(TABLE_HOST)
->where('deleted')->eq('0')
->andWhere('type')->eq('normal')
->beginIF($modules)->andWhere('`group`')->in($modules)->fi()
@@ -62,6 +62,9 @@ class hostModel extends model
->orderBy($orderBy)
->page($pager)
->fetchAll();
+ foreach($hostList as &$host) if(!$host->serverRoom) $host->serverRoom = '';
+
+ return $hostList;
}
/**
@@ -103,7 +106,11 @@ class hostModel extends model
*/
public function create(object $formData): bool
{
- $this->dao->insert(TABLE_HOST)->data($formData)->batchCheck($this->config->host->create->requiredFields, 'notempty')->autoCheck()->exec();
+ $this->dao->insert(TABLE_HOST)->data($formData)
+ ->check('name', 'unique')
+ ->batchCheck($this->config->host->create->requiredFields, 'notempty')
+ ->autoCheck()
+ ->exec();
if(dao::isError()) return false;
$hostID = $this->dao->lastInsertID();
@@ -125,7 +132,12 @@ class hostModel extends model
if(empty($formData->id)) return false;
$oldHost = $this->fetchByID($formData->id);
- $this->dao->update(TABLE_HOST)->data($formData)->batchCheck($this->config->host->edit->requiredFields, 'notempty')->autoCheck()->where('id')->eq($formData->id)->exec();
+ $this->dao->update(TABLE_HOST)->data($formData)
+ ->check('name', 'unique', '`id` != ' . $formData->id)
+ ->batchCheck($this->config->host->edit->requiredFields, 'notempty')
+ ->autoCheck()
+ ->where('id')->eq($formData->id)
+ ->exec();
if(dao::isError()) return false;
$changes = common::createChanges($oldHost, $formData);
diff --git a/module/host/ui/browse.html.php b/module/host/ui/browse.html.php
index 9ea2daa16c..2f85c6d075 100644
--- a/module/host/ui/browse.html.php
+++ b/module/host/ui/browse.html.php
@@ -13,6 +13,7 @@ declare(strict_types=1);
namespace zin;
jsVar('hostLang', $lang->host);
+jsVar('rooms', $rooms);
$config->host->featureBar['all']['active'] = true;
$config->host->featureBar['all']['badge'] = $pager->recTotal != '' ? array('text' => $pager->recTotal, 'class' => 'size-sm rounded-full white') : null;
@@ -28,7 +29,6 @@ $createLink = $this->createLink('host', 'create');
$createItem = array('text' => $lang->host->create, 'url' => $createLink, 'class' => 'primary', 'icon' => 'plus');
$config->host->dtable->fieldList['group']['map'] = $optionMenu;
-$config->host->dtable->fieldList['admin']['map'] = $accounts;
$config->host->dtable->fieldList['serverRoom']['map'] = $rooms;
$tableData = initTableData($hostList, $config->host->dtable->fieldList, $this->host);
foreach($tableData as $row)
@@ -51,14 +51,16 @@ sidebar
'settingText' => $lang->host->groupMaintenance,
'showDisplay' => false,
'settingLink' => $this->createLink('tree', 'browse', "productID=0&view=host"),
- 'closeLink' => $this->createLink('host', 'browse')
+ 'closeLink' => $this->createLink('host', 'browse'),
+ 'settingApp' => 'devops',
)))
);
+$cols = $this->loadModel('datatable')->getSetting('host');
dtable
(
- set::userMap($accounts),
- set::cols(array_values($config->host->dtable->fieldList)),
+ set::customCols(true),
+ set::cols($cols),
set::data($tableData),
set::sortLink(createLink('host', 'browse', "browseType=$browseType¶m=$param&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")),
set::orderBy($orderBy),
diff --git a/module/host/ui/create.html.php b/module/host/ui/create.html.php
index ad615fdbbe..75d6bfecee 100644
--- a/module/host/ui/create.html.php
+++ b/module/host/ui/create.html.php
@@ -17,6 +17,26 @@ formPanel
set::id('hostCreateForm'),
set::title($lang->host->create),
formRow
+ (
+ setID('groupRow'),
+ formGroup
+ (
+ set::width('1/3'),
+ set::label($lang->host->group),
+ set::control('picker'),
+ set::name('group'),
+ set::items($optionMenu)
+ ),
+ formGroup
+ (
+ set::width('1/3'),
+ set::label($lang->host->serverRoom),
+ set::control('picker'),
+ set::name('serverRoom'),
+ set::items($rooms)
+ )
+ ),
+ formRow
(
formGroup
(
@@ -27,10 +47,11 @@ formPanel
formGroup
(
set::width('1/3'),
- set::label($lang->host->admin),
+ set::label($lang->host->osName),
set::control('picker'),
- set::name('admin'),
- set::items($accounts)
+ set::name('osName'),
+ set::items($lang->host->osNameList),
+ on::change('osChange')
)
),
formRow
@@ -38,31 +59,32 @@ formPanel
formGroup
(
set::width('1/3'),
- set::label($lang->host->cpuBrand),
- set::control('picker'),
- set::name('cpuBrand'),
- set::items($lang->host->cpuBrandList)
+ set::name('intranet'),
+ set::label($lang->host->intranet)
),
formGroup
(
set::width('1/3'),
- set::name('cpuModel'),
- set::label($lang->host->cpuModel)
+ set::label($lang->host->osVersion),
+ set::control('picker'),
+ set::name('osVersion'),
+ set::items(array())
)
),
formRow
(
+ formGroup
+ (
+ set::width('1/3'),
+ set::name('extranet'),
+ set::label($lang->host->extranet)
+ ),
formGroup
(
set::width('1/3'),
set::name('cpuNumber'),
- set::label($lang->host->cpuNumber)
- ),
- formGroup
- (
- set::width('1/3'),
- set::name('cpuCores'),
- set::label($lang->host->cpuCores)
+ set::label($lang->host->cpuNumber),
+ set::control(array('type' => 'number', 'min' => 1))
)
),
formRow
@@ -90,119 +112,22 @@ formPanel
'suffix' => 'GB',
'suffixWidth' => 40
))
- )
- ),
- formRow
- (
- formGroup
- (
- set::width('1/3'),
- set::label($lang->host->group),
- set::control('picker'),
- set::name('group'),
- set::items($optionMenu)
),
- formGroup
- (
- set::width('1/3'),
- set::label($lang->host->serverRoom),
- set::control('picker'),
- set::name('serverRoom'),
- set::items($rooms)
- )
),
- formRow
+ formGroup
(
- formGroup
- (
- set::width('1/3'),
- set::name('serverModel'),
- set::label($lang->host->serverModel)
- ),
- formGroup
- (
- set::width('1/3'),
- set::label($lang->host->hostType),
- set::control('picker'),
- set::name('hostType'),
- set::items($lang->host->hostTypeList),
- set::value('virtual')
- )
+ set::width('2/3'),
+ set::name('desc'),
+ set::label($lang->host->desc),
+ set::control(array('type' => 'textarea', 'rows' => 3))
),
- formRow
+ formGroup
(
- formGroup
- (
- set::width('1/3'),
- set::label($lang->host->osName),
- set::control('picker'),
- set::name('osName'),
- set::items($lang->host->osNameList),
- set::value($osName ? $osName : $host->osName),
- on::change('osChange')
- ),
- formGroup
- (
- set::width('1/3'),
- set::label($lang->host->osVersion),
- set::control('picker'),
- set::name('osVersion'),
- set::items($lang->host->{"{$osName}List"})
- )
- ),
- formRow
- (
- formGroup
- (
- set::width('1/3'),
- set::name('zap'),
- set::label($lang->host->zap),
- set::value(8086)
- ),
- formGroup
- (
- set::width('1/3'),
- set::label($lang->host->tags),
- set::control('picker'),
- set::name('vsoft'),
- set::items($lang->host->tagsList),
- set::value('vm')
- )
- ),
- formRow
- (
- formGroup
- (
- set::width('1/3'),
- set::name('intranet'),
- set::label($lang->host->intranet)
- ),
- formGroup
- (
- set::width('1/3'),
- set::name('extranet'),
- set::label($lang->host->extranet)
- )
- ),
- formRow
- (
- formGroup
- (
- set::width('1/3'),
- set::label($lang->host->provider),
- set::control('picker'),
- set::name('provider'),
- set::items($lang->host->providerList)
- ),
- formGroup
- (
- set::width('1/3'),
- set::name('status'),
- set::control('radioList'),
- set::label($lang->host->status),
- set::value('online'),
- set::inline(true),
- set::items($lang->host->statusList)
- )
+ set::name('status'),
+ set::control('radioList'),
+ set::label($lang->host->status),
+ set::value('online'),
+ set::inline(true),
+ set::items($lang->host->statusList)
)
);
diff --git a/module/host/ui/edit.html.php b/module/host/ui/edit.html.php
index eabc7c1689..fbe619e6e1 100644
--- a/module/host/ui/edit.html.php
+++ b/module/host/ui/edit.html.php
@@ -16,97 +16,16 @@ jsVar('host', $host);
formPanel
(
- set::id('hostCreateForm'),
+ set::id('hostEditForm'),
set::title($lang->host->edit),
+ set::submitBtnText($lang->save),
+ on::init()->do('$(function() {setTimeout(osChange, 50); });'),
formRow
(
+ setID('groupRow'),
formGroup
(
- set::width('400px'),
- set::name('name'),
- set::label($lang->host->name),
- set::value($host->name)
- ),
- formGroup
- (
- set::width('400px'),
- set::label($lang->host->admin),
- set::control('picker'),
- set::name('admin'),
- set::items($accounts),
- set::value($host->admin)
- )
- ),
- formRow
- (
- formGroup
- (
- set::width('400px'),
- set::label($lang->host->cpuBrand),
- set::control('picker'),
- set::name('cpuBrand'),
- set::items($lang->host->cpuBrandList),
- set::value($host->cpuBrand)
- ),
- formGroup
- (
- set::width('400px'),
- set::name('cpuModel'),
- set::label($lang->host->cpuModel),
- set::value($host->cpuModel)
- )
- ),
- formRow
- (
- formGroup
- (
- set::width('400px'),
- set::name('cpuNumber'),
- set::label($lang->host->cpuNumber),
- set::value($host->cpuNumber)
- ),
- formGroup
- (
- set::width('400px'),
- set::name('cpuCores'),
- set::label($lang->host->cpuCores),
- set::value($host->cpuCores)
- )
- ),
- formRow
- (
- formGroup
- (
- set::width('400px'),
- set::name('memory'),
- set::label($lang->host->memory),
- set::value($host->memory),
- set::control(array
- (
- 'type' => 'inputControl',
- 'suffix' => 'GB',
- 'suffixWidth' => 40
- ))
- ),
- formGroup
- (
- set::width('400px'),
- set::name('diskSize'),
- set::label($lang->host->diskSize),
- set::value($host->diskSize),
- set::control(array
- (
- 'type' => 'inputControl',
- 'suffix' => 'GB',
- 'suffixWidth' => 40
- ))
- )
- ),
- formRow
- (
- formGroup
- (
- set::width('400px'),
+ set::width('1/3'),
set::label($lang->host->group),
set::control('picker'),
set::name('group'),
@@ -115,7 +34,7 @@ formPanel
),
formGroup
(
- set::width('400px'),
+ set::width('1/3'),
set::label($lang->host->serverRoom),
set::control('picker'),
set::name('serverRoom'),
@@ -127,40 +46,39 @@ formPanel
(
formGroup
(
- set::width('400px'),
- set::name('serverModel'),
- set::label($lang->host->serverModel),
- set::value($host->serverModel)
+ set::width('1/3'),
+ set::name('name'),
+ set::label($lang->host->name),
+ set::value($host->name)
),
formGroup
(
- set::width('400px'),
- set::label($lang->host->hostType),
+ set::width('1/3'),
+ set::label($lang->host->osName),
set::control('picker'),
- set::name('hostType'),
- set::items($lang->host->hostTypeList),
- set::value($host->hostType ? $host->hostType : 'virtual')
+ set::name('osName'),
+ set::items($lang->host->osNameList),
+ set::value(zget($host, 'osName', '')),
+ on::change('osChange')
)
),
formRow
(
formGroup
(
- set::width('400px'),
- set::label($lang->host->osName),
- set::control('picker'),
- set::name('osName'),
- set::items($lang->host->osNameList),
- set::value($osName ? $osName : $host->osName),
- on::change('osChange')
+ set::width('1/3'),
+ set::name('intranet'),
+ set::label($lang->host->intranet),
+ set::value($host->intranet)
),
formGroup
(
- set::width('400px'),
+ setID('osVersion'),
+ set::width('1/3'),
set::label($lang->host->osVersion),
set::control('picker'),
set::name('osVersion'),
- set::items($lang->host->{"{$osName}List"}),
+ set::items(array()),
set::value($host->osVersion)
)
),
@@ -168,58 +86,64 @@ formPanel
(
formGroup
(
- set::width('400px'),
- set::name('zap'),
- set::label($lang->host->zap),
- set::value($host->zap ? $host->zap : 8086)
- ),
- formGroup
- (
- set::width('400px'),
- set::label($lang->host->tags),
- set::control('picker'),
- set::name('vsoft'),
- set::items($lang->host->tagsList),
- set::value($host->vsoft ? $host->vsoft : 'vm')
- )
- ),
- formRow
- (
- formGroup
- (
- set::width('400px'),
- set::name('intranet'),
- set::label($lang->host->intranet),
- set::value($host->intranet)
- ),
- formGroup
- (
- set::width('400px'),
+ set::width('1/3'),
set::name('extranet'),
set::label($lang->host->extranet),
set::value($host->extranet)
+ ),
+ formGroup
+ (
+ set::width('1/3'),
+ set::name('cpuNumber'),
+ set::label($lang->host->cpuNumber),
+ set::control(array('type' => 'number', 'min' => 1)),
+ set::value(zget($host, 'cpuNumber', '') ? $host->cpuNumber : '')
)
),
formRow
(
formGroup
(
- set::width('400px'),
- set::label($lang->host->provider),
- set::control('picker'),
- set::name('provider'),
- set::items($lang->host->providerList),
- set::value($host->provider)
+ set::width('1/3'),
+ set::name('memory'),
+ set::label($lang->host->memory),
+ set::value(zget($host, 'memory', '') ? $host->memory : ''),
+ set::control(array
+ (
+ 'type' => 'inputControl',
+ 'suffix' => 'GB',
+ 'suffixWidth' => 40
+ ))
),
formGroup
(
- set::width('400px'),
- set::name('status'),
- set::control('radioList'),
- set::label($lang->host->status),
- set::value($host->status ? $host->status : 'online'),
- set::inline(true),
- set::items($lang->host->statusList)
+ set::width('1/3'),
+ set::name('diskSize'),
+ set::label($lang->host->diskSize),
+ set::value(zget($host, 'diskSize', '') ? $host->diskSize : ''),
+ set::control(array
+ (
+ 'type' => 'inputControl',
+ 'suffix' => 'GB',
+ 'suffixWidth' => 40
+ ))
)
+ ),
+ formGroup
+ (
+ set::width('2/3'),
+ set::name('desc'),
+ set::label($lang->host->desc),
+ set::control(array('type' => 'textarea', 'rows' => 3)),
+ set::value($host->desc)
+ ),
+ formGroup
+ (
+ set::name('status'),
+ set::control('radioList'),
+ set::label($lang->host->status),
+ set::value($host->status ? $host->status : 'online'),
+ set::inline(true),
+ set::items($lang->host->statusList)
)
);
diff --git a/module/host/ui/view.html.php b/module/host/ui/view.html.php
index ddb1507f1e..9f99df5841 100644
--- a/module/host/ui/view.html.php
+++ b/module/host/ui/view.html.php
@@ -16,7 +16,7 @@ detailHeader
isAjaxRequest('modal') ? to::prefix() : '',
to::title(
entityLabel(
- set(array('entityID' => $host->id, 'level' => 1, 'text' => $host->name))
+ set(array('entityID' => $host->id, 'level' => 1, 'text' => $host->name, 'className' => 'clip', 'title' => $host->name))
)
)
);
@@ -32,10 +32,10 @@ detailBody
setClass('table table-fixed canvas host-view-table'),
h::tr
(
+ isset($host->CD) ? h::th($lang->host->CD) : null,
+ isset($host->CD) ? h::td($lang->host->CDlist[$host->CD]) : null,
h::th($lang->host->name),
- h::td($host->name),
- h::th(),
- h::td()
+ h::td($host->name)
),
h::tr
(
@@ -44,26 +44,22 @@ detailBody
h::th($lang->host->serverRoom),
h::td(zget($rooms, $host->serverRoom, ""))
),
- h::tr
+ zget($host, 'CD') == 'spug' ? h::tr
(
- h::th($lang->host->serverModel),
- h::td($host->serverModel),
- h::th($lang->host->hostType),
- h::td(zget($lang->host->hostTypeList, $host->hostType, ""))
- ),
- h::tr
+ h::th($lang->host->admin),
+ h::td(zget($host, 'admin'))
+ ) : null,
+ zget($host, 'CD') == 'spug' ? h::tr
(
- h::th($lang->host->cpuBrand),
- h::td($host->cpuBrand),
- h::th($lang->host->cpuModel),
- h::td($host->cpuModel)
- ),
+ h::th($lang->host->password),
+ h::td($lang->host->defaultPWD),
+ h::th($lang->host->sshPort),
+ h::td($host->sshPort)
+ ) : null,
h::tr
(
h::th($lang->host->cpuNumber),
- h::td($host->cpuNumber),
- h::th($lang->host->cpuCores),
- h::td($host->cpuCores)
+ h::td($host->cpuNumber ? $host->cpuNumber : ''),
),
h::tr
(
@@ -75,24 +71,25 @@ detailBody
h::tr
(
h::th($lang->host->intranet),
- h::td($host->intranet),
+ h::td($host->intranet, set::title($host->intranet)),
h::th($lang->host->extranet),
- h::td($host->extranet)
+ h::td($host->extranet, set::title($host->extranet))
),
h::tr
(
- h::th($lang->host->osName),
- h::td($host->osName),
+ zget($host, 'CD') != 'spug' ? h::th($lang->host->osName) : null,
+ zget($host, 'CD') != 'spug' ? h::td($host->osName) : null,
h::th($lang->host->osVersion),
- h::td(zget($lang->host->{$host->osName.'List'}, $host->osVersion))
+ zget($host, 'CD') == 'spug' ? h::td($host->osVersion) : null,
+ zget($host, 'CD') != 'spug' && !empty($host->osName) ? h::td(zget($lang->host->{$host->osName.'List'}, $host->osVersion)) : null
),
- h::tr
+ zget($host, 'CD') != 'spug' ? h::tr
(
h::th($lang->host->status),
h::td($lang->host->statusList[$host->status]),
h::th(),
h::td()
- )
+ ) : null
)
),
history
diff --git a/module/host/zen.php b/module/host/zen.php
index 6492534ce2..6c8b0d51ba 100644
--- a/module/host/zen.php
+++ b/module/host/zen.php
@@ -21,21 +21,40 @@ class hostZen extends host
*/
protected function checkFormData(object $formData): bool
{
+ if($formData->name && mb_strlen($formData->name) > 100)
+ {
+ dao::$errors['name'] = $this->lang->host->notice->nameLength;
+ }
+
+ if($formData->desc && mb_strlen($formData->desc) > 255)
+ {
+ dao::$errors['desc'] = $this->lang->host->notice->descLength;
+ }
+
$intFields = explode(',', $this->config->host->create->intFields);
foreach($intFields as $field)
{
- if(!preg_match("/^-?\d+$/", (string)$formData->{$field}))
+ if(!$formData->{$field}) continue;
+
+ if(!preg_match("/^-?\d+$/", $formData->{$field}))
{
- dao::$errors[$field] = sprintf($this->lang->host->notice->int, $this->lang->host->{$field});
+ dao::$errors[$field] = $this->lang->host->notice->{$field};
}
}
$ipFields = explode(',', $this->config->host->create->ipFields);
foreach($ipFields as $field)
{
- if(!preg_match('/((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})(\.((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})){3}/', (string)$formData->{$field}))
+ if(!$formData->{$field}) continue;
+
+ $ipList = explode(',', $formData->{$field});
+ foreach($ipList as $ip)
{
- dao::$errors[$field] = sprintf($this->lang->host->notice->ip, $this->lang->host->{$field});
+ $address = str_replace(array('https://', 'http://'), '', $ip);
+ if(!filter_var($address, FILTER_VALIDATE_IP) && !filter_var(gethostbyname($address), FILTER_VALIDATE_IP))
+ {
+ dao::$errors[$field] = sprintf($this->lang->host->notice->ip, $this->lang->host->{$field});
+ }
}
}
return !dao::isError();
diff --git a/module/instance/config.php b/module/instance/config.php
index b96ece6aaa..0712bac169 100644
--- a/module/instance/config.php
+++ b/module/instance/config.php
@@ -59,7 +59,8 @@ $config->instance->actions->view = array();
$config->instance->actions->view['mainActions'] = array('visit', 'ajaxStart', 'ajaxStop', 'upgrade');
$config->instance->actions->view['suffixActions'] = array('ajaxUninstall');
-$config->instance->devopsApps = array('gitea', 'gitlab', 'jenkins', 'sonarqube', 'nexus3', 'nexus');
+$config->instance->devopsApps = array('gitea', 'gitlab', 'jenkins', 'sonarqube', 'nexus3', 'nexus');
+$config->instance->initUserApps = array();
/* The zentaopaas instance object. */
$config->instance->zentaopaas = new stdclass();
diff --git a/module/instance/config/dtable.php b/module/instance/config/dtable.php
new file mode 100644
index 0000000000..0e2cbfa198
--- /dev/null
+++ b/module/instance/config/dtable.php
@@ -0,0 +1,62 @@
+backup))
+{
+ $config->backup = new stdClass();
+ $config->backup->dtable = new stdclass();
+ $config->backup->dtable->fieldList['create_time']['name'] = 'create_time';
+ $config->backup->dtable->fieldList['create_time']['title'] = $lang->instance->backup->date;
+ $config->backup->dtable->fieldList['create_time']['type'] = 'desc';
+ $config->backup->dtable->fieldList['create_time']['sortType'] = false;
+ $config->backup->dtable->fieldList['create_time']['hint'] = true;
+ $config->backup->dtable->fieldList['create_time']['formatDate'] = 'YYYY-MM-dd hh:mm:ss';
+ $config->backup->dtable->fieldList['create_time']['width'] = '120';
+
+ $config->backup->dtable->fieldList['operator']['name'] = 'operator';
+ $config->backup->dtable->fieldList['operator']['title'] = $lang->instance->backup->operator;
+ $config->backup->dtable->fieldList['operator']['type'] = 'desc';
+ $config->backup->dtable->fieldList['operator']['sortType'] = false;
+ $config->backup->dtable->fieldList['operator']['hint'] = true;
+ $config->backup->dtable->fieldList['operator']['width'] = '100';
+
+ $config->backup->dtable->fieldList['dbStatus']['name'] = 'status';
+ $config->backup->dtable->fieldList['dbStatus']['title'] = $lang->instance->backup->dbStatus;
+ $config->backup->dtable->fieldList['dbStatus']['type'] = 'desc';
+ $config->backup->dtable->fieldList['dbStatus']['sortType'] = false;
+ $config->backup->dtable->fieldList['dbStatus']['hint'] = true;
+ $config->backup->dtable->fieldList['dbStatus']['width'] = '80';
+
+ $config->backup->dtable->fieldList['backupSize']['name'] = 'backupSize';
+ $config->backup->dtable->fieldList['backupSize']['title'] = $lang->instance->backup->backupSize;
+ $config->backup->dtable->fieldList['backupSize']['type'] = 'desc';
+ $config->backup->dtable->fieldList['backupSize']['sortType'] = false;
+ $config->backup->dtable->fieldList['backupSize']['hint'] = true;
+ $config->backup->dtable->fieldList['backupSize']['width'] = '100';
+
+ $config->backup->dtable->fieldList['restoreDate']['name'] = 'latestRestoreTime';
+ $config->backup->dtable->fieldList['restoreDate']['title'] = $lang->instance->backup->restoreDate;
+ $config->backup->dtable->fieldList['restoreDate']['type'] = 'desc';
+ $config->backup->dtable->fieldList['restoreDate']['sortType'] = false;
+ $config->backup->dtable->fieldList['restoreDate']['hint'] = true;
+ $config->backup->dtable->fieldList['restoreDate']['width'] = '120';
+
+ $config->backup->dtable->fieldList['restoreStatus']['name'] = 'latestRestoreStatus';
+ $config->backup->dtable->fieldList['restoreStatus']['title'] = $lang->instance->backup->restoreStatus;
+ $config->backup->dtable->fieldList['restoreStatus']['type'] = 'desc';
+ $config->backup->dtable->fieldList['restoreStatus']['sortType'] = false;
+ $config->backup->dtable->fieldList['restoreStatus']['hint'] = true;
+ $config->backup->dtable->fieldList['restoreStatus']['width'] = '100';
+
+ $config->backup->dtable->fieldList['actions']['name'] = 'actions';
+ $config->backup->dtable->fieldList['actions']['title'] = $lang->instance->backup->action;
+ $config->backup->dtable->fieldList['actions']['type'] = 'actions';
+ $config->backup->dtable->fieldList['actions']['hint'] = true;
+ $config->backup->dtable->fieldList['actions']['width'] = '100';
+ $config->backup->dtable->fieldList['actions']['menu'] = array('restore');
+
+ $config->backup->dtable->fieldList['actions']['list']['restore']['icon'] = 'icon-restart';
+ $config->backup->dtable->fieldList['actions']['list']['restore']['hint'] = $lang->instance->restore->common;
+ $config->backup->dtable->fieldList['actions']['list']['restore']['url'] = helper::createLink('instance', 'ajaxRestore', 'instanceID={instanceId}&backupName={name}');
+ $config->backup->dtable->fieldList['actions']['list']['restore']['className'] = 'ajax-submit';
+}
diff --git a/module/instance/control.php b/module/instance/control.php
index 27dae0624d..db51cbd2cc 100644
--- a/module/instance/control.php
+++ b/module/instance/control.php
@@ -532,4 +532,124 @@ class instance extends control
$this->loadModel('instance')->syncGitFoxData();
return true;
}
+
+ /**
+ * Instance Backup List.
+ * 应用备份列表。
+ * @param int $id
+ * @param int $recPerPage
+ * @param int $pageID
+ * @return void
+ */
+ public function backupList(int $id, int $recPerPage = 5, int $pageID = 1)
+ {
+ /* Initialize Backup List. */
+ $instance = $this->instance->getByID($id);
+ $backupList = $this->instance->backupList($instance);
+
+ /* Pager. */
+ $this->app->loadClass('pager', true);
+ $recTotal = count($backupList);
+ $pager = new pager($recTotal, $recPerPage, $pageID);
+ $backupList = array_chunk($backupList, $pager->recPerPage);
+ $backupList = empty($backupList) ? array() : $backupList[$pageID - 1];
+
+ $this->view->instance = $instance;
+ $this->view->pager = $pager;
+ $this->view->backupList = $backupList;
+ $this->display();
+ }
+
+ /**
+ * Restore instance by ajax.
+ * 还原应用。
+ * @access public
+ * @return void
+ */
+ public function ajaxRestore(int $instanceID, string $backupName)
+ {
+ if(empty($instanceID) || empty($backupName)) return $this->send(array('result' => 'fail', 'message' => $this->lang->instance->errors->wrongRequestData));
+
+ $instance = $this->instance->getByID($instanceID);
+ if(empty($instance)) return $this->send(array('result' => 'fail', 'load' => array('alert' => $this->lang->instance->instanceNotExists)));
+
+ $success = $this->instance->restore($instance, $this->app->user, $backupName);
+ if(!$success)
+ {
+ $this->action->create('instance', $instance->id, 'restore', '', json_encode(array('result' => array('result' => 'fail'))));
+ return $this->send(array('result' => 'fail', 'message' => zget($this->lang->instance->notices, 'restoreFail') ));
+ }
+ $this->action->create('instance', $instance->id, 'restore', '', json_encode(array('result' => array('result' => 'success'))));
+ return $this->send(array('result' => 'success', 'message' => zget($this->lang->instance->notices, 'restoreSuccess'), 'load' => true));
+ }
+
+ /**
+ * 手动备份。
+ * Manual backup.
+ *
+ * @param int $id
+ * @param string $component 0|mysql
+ * @access public
+ * @return void
+ */
+ public function manualBackup(int $id)
+ {
+ $instance = $this->instance->getByID($id);
+ $success = $this->instance->backup($instance, $this->app->user);
+ if(!$success)
+ {
+ $this->action->create('instance', $instance->id, 'manualbackup', '', json_encode(array('result' => 'fail')));
+ return $this->send(array('result' => 'fail', 'message' => zget($this->lang->instance->notices, 'backupFail')));
+ }
+ $this->action->create('instance', $instance->id, 'manualbackup', '', json_encode(array('result' => 'success')));
+ return $this->send(array('result' => 'success', 'message' => zget($this->lang->instance->notices, 'backupSuccess')));
+ }
+
+ /**
+ * 备份设置。
+ * backup settings.
+ *
+ * @param int $id
+ * @param string $component 0|mysql
+ * @access public
+ * @return void
+ */
+ public function backupSettings(int $instanceID)
+ {
+ $instance = $this->instance->getByID($instanceID);
+ if($_POST)
+ {
+ $this->instance->saveBackupSettings($instance);
+ if(dao::isError()) return $this->send(array('result' => 'fail', 'load' => array('alert' => dao::getError())));
+
+ $locate = $this->createLink('instance', 'view', 'id=' . $instanceID);
+ return $this->send(array('result' => 'success', 'load' => array('alert' => $this->lang->saveSuccess, 'locate' => $locate, 'closeModal' => true)));
+ }
+ $this->view->instance = $instance;
+ $this->view->backupSettings = $this->instance->getBackupSettings($instanceID);
+ $this->display();
+ }
+
+
+ /**
+ * Cron task of auto backup.
+ * 定时备份。
+ *
+ * @param $instanceID
+ * @return int|null
+ */
+ public function cronBackup(string $instanceID)
+ {
+ $instance = $this->instance->getByID((int)$instanceID);
+ if(empty($instance)) $this->send(array('result' => 'success', 'message' => $this->lang->instance->instanceNotExists));
+
+ $sysUser = new stdclass;
+ $sysUser->account = 'system';
+ $success = $this->instance->autoBackup($instance, $sysUser);
+ if(!$success)
+ {
+ return $this->send(array('result' => 'fail', 'message' => zget($this->lang->instance->notices, 'backupFail')));
+ }
+ return $this->send(array('result' => 'success', 'message' => zget($this->lang->instance->notices, 'backupSuccess')));
+ }
}
diff --git a/module/instance/js/backupsettings.ui.js b/module/instance/js/backupsettings.ui.js
new file mode 100644
index 0000000000..a7edfaa4b3
--- /dev/null
+++ b/module/instance/js/backupsettings.ui.js
@@ -0,0 +1,10 @@
+$(function()
+{
+ $("input[type=radio][name='autoBackup']").on('change', function(event)
+ {
+ var enabled = $("input[type=radio][name='autoBackup']:checked").val();
+ if(enabled == 1) $('.backup-settings').show();
+ if(enabled == 0) $('.backup-settings').hide();
+ });
+ $("input[type=radio][name='autoBackup']").trigger("change");
+});
\ No newline at end of file
diff --git a/module/instance/js/view.ui.js b/module/instance/js/view.ui.js
index 23ac8b3e57..ccce8dd772 100644
--- a/module/instance/js/view.ui.js
+++ b/module/instance/js/view.ui.js
@@ -73,3 +73,20 @@ window.copyText = function(dom)
time: 2000
});
}
+
+window.onManualBackup = function()
+{
+ zui.Modal.confirm({message: confirmBackupTip, icon: 'icon-exclamation-sign', iconClass: 'warning-pale rounded-full icon-2x'}).then(res =>
+ {
+ if(res)
+ {
+ $.ajaxSubmit({
+ url: $.createLink('instance', 'manualBackup', `modelID=${instanceID}`),
+ onSuccess: function(res)
+ {
+ if(res.result === 'success') $('#backupList').load($.createLink('instance', 'backupList', `id=${instanceID}`));
+ }
+ });
+ }
+ })
+}
diff --git a/module/instance/lang/de.php b/module/instance/lang/de.php
index 2cb84ddfaa..ebd34a6ae0 100644
--- a/module/instance/lang/de.php
+++ b/module/instance/lang/de.php
@@ -94,12 +94,12 @@ $lang->instance->backup->date = 'backup time';
$lang->instance->backup->operator = 'Backup person';
$lang->instance->backup->type = 'Backup type';
$lang->instance->backup->backupStatus = 'Backup Status';
-$lang->instance->backup->restoreStatus = 'Rollback Status';
-$lang->instance->backup->restoreOperator = 'Rollback by';
-$lang->instance->backup->restoreTime = 'rollback time';
+$lang->instance->backup->restoreStatus = 'Restore Status';
+$lang->instance->backup->restoreOperator = 'Restore by';
+$lang->instance->backup->restoreTime = 'Restore time';
$lang->instance->backup->action = 'Operation';
$lang->instance->backup->restore = 'rollback';
-$lang->instance->backup->restoreInfo = 'Rollback Information';
+$lang->instance->backup->restoreInfo = 'Restore Information';
$lang->instance->backup->delete = 'Delete';
$lang->instance->backup->rebackup = 'Retrying backup';
$lang->instance->backup->create = 'Create backup';
@@ -116,7 +116,7 @@ $lang->instance->backup->volStatus = 'Status';
$lang->instance->backup->volSpentSeconds = 'Time taken (seconds)';
$lang->instance->backup->volSize = 'Size';
$lang->instance->backup->lastRestore = 'Last rollback';
-$lang->instance->backup->restoreDate = 'Rollback time';
+$lang->instance->backup->restoreDate = 'Restore time';
$lang->instance->backup->latestBackupAt = 'Last backup time';
$lang->instance->backup->backupBeforeRestore = 'We recommend that you backup before rolling back!';
$lang->instance->backup->enableAutoBackup = 'Enable automatic backup';
@@ -129,11 +129,17 @@ $lang->instance->backup->firstStartTime = '%s The first backup will be perf
$lang->instance->backup->invalidTime = 'Invalid time';
$lang->instance->backup->disableAutoBackup = 'Automatic backup has been turned off';
$lang->instance->backup->keepBackupBySystem = 'The system will only delete expired automatic backup data when there is more than one backup data.';
+$lang->instance->backup->backupSize = 'Size';
+$lang->instance->backup->confirmTip = 'Are you sure you want to back up?';
+$lang->instance->backup->cronRemark = 'DevOps service automatic backup task';
+$lang->instance->backup->backupSettingsTips = 'The system will delete backups that exceed the set number of days, but will retain at least one valid backup.';
$lang->instance->backup->cycleList[1] = 'Daily';
$lang->instance->backup->operators = array();
-$lang->instance->backup->operators['auto'] = 'Automatic backup';
+$lang->instance->backup->operators['auto'] = 'Automatic backup';
+$lang->instance->backup->operators['manual'] = 'Manual backup';
+$lang->instance->backup->operators['settings'] = 'Backup Settings';
$lang->instance->backup->statusList = array();
$lang->instance->backup->statusList['success'] = 'successful';
@@ -150,10 +156,11 @@ $lang->instance->backup->statusList['downloading'] = 'Downloading';
$lang->instance->backup->statusList['downloadFailed'] = 'Download failed';
$lang->instance->restore = new stdclass;
+$lang->instance->restore->common = 'Restore';
$lang->instance->restore->autoRestore = 'Auto Restore';
-$lang->instance->restore->enableAutoRestore = 'Enable automatic restore';
-$lang->instance->restore->cycleDays = 'Restore cycle';
-$lang->instance->restore->restoreTime = 'Restore Time';
+$lang->instance->restore->enableAutoRestore = 'Automatic backup';
+$lang->instance->restore->cycleDays = 'Backup cycle';
+$lang->instance->restore->restoreTime = 'Backup Time';
$lang->instance->restore->invalidTime = 'Invalid time';
$lang->instance->restore->disableAutoRestore = 'Automatic restore has been turned off';
$lang->instance->restore->firstStartTime = '%s The first automatic restore will be executed on %s';
@@ -282,6 +289,7 @@ $lang->instance->notices['upgradeSuccess'] = 'Upgrade successful';
$lang->instance->notices['upgradeFail'] = 'Upgrade failed';
$lang->instance->notices['backupSuccess'] = 'Backup task submitted';
$lang->instance->notices['backupFail'] = 'Backup failed';
+$lang->instance->notices['cleanBackupsSuccess'] = 'Backup cleanup successfuls';
$lang->instance->notices['restoreSuccess'] = 'The rollback task has been submitted';
$lang->instance->notices['restoreFail'] = 'Rollback failed';
$lang->instance->notices['deleteSuccess'] = 'DeleteSuccess';
diff --git a/module/instance/lang/en.php b/module/instance/lang/en.php
index 2cb84ddfaa..ebd34a6ae0 100644
--- a/module/instance/lang/en.php
+++ b/module/instance/lang/en.php
@@ -94,12 +94,12 @@ $lang->instance->backup->date = 'backup time';
$lang->instance->backup->operator = 'Backup person';
$lang->instance->backup->type = 'Backup type';
$lang->instance->backup->backupStatus = 'Backup Status';
-$lang->instance->backup->restoreStatus = 'Rollback Status';
-$lang->instance->backup->restoreOperator = 'Rollback by';
-$lang->instance->backup->restoreTime = 'rollback time';
+$lang->instance->backup->restoreStatus = 'Restore Status';
+$lang->instance->backup->restoreOperator = 'Restore by';
+$lang->instance->backup->restoreTime = 'Restore time';
$lang->instance->backup->action = 'Operation';
$lang->instance->backup->restore = 'rollback';
-$lang->instance->backup->restoreInfo = 'Rollback Information';
+$lang->instance->backup->restoreInfo = 'Restore Information';
$lang->instance->backup->delete = 'Delete';
$lang->instance->backup->rebackup = 'Retrying backup';
$lang->instance->backup->create = 'Create backup';
@@ -116,7 +116,7 @@ $lang->instance->backup->volStatus = 'Status';
$lang->instance->backup->volSpentSeconds = 'Time taken (seconds)';
$lang->instance->backup->volSize = 'Size';
$lang->instance->backup->lastRestore = 'Last rollback';
-$lang->instance->backup->restoreDate = 'Rollback time';
+$lang->instance->backup->restoreDate = 'Restore time';
$lang->instance->backup->latestBackupAt = 'Last backup time';
$lang->instance->backup->backupBeforeRestore = 'We recommend that you backup before rolling back!';
$lang->instance->backup->enableAutoBackup = 'Enable automatic backup';
@@ -129,11 +129,17 @@ $lang->instance->backup->firstStartTime = '%s The first backup will be perf
$lang->instance->backup->invalidTime = 'Invalid time';
$lang->instance->backup->disableAutoBackup = 'Automatic backup has been turned off';
$lang->instance->backup->keepBackupBySystem = 'The system will only delete expired automatic backup data when there is more than one backup data.';
+$lang->instance->backup->backupSize = 'Size';
+$lang->instance->backup->confirmTip = 'Are you sure you want to back up?';
+$lang->instance->backup->cronRemark = 'DevOps service automatic backup task';
+$lang->instance->backup->backupSettingsTips = 'The system will delete backups that exceed the set number of days, but will retain at least one valid backup.';
$lang->instance->backup->cycleList[1] = 'Daily';
$lang->instance->backup->operators = array();
-$lang->instance->backup->operators['auto'] = 'Automatic backup';
+$lang->instance->backup->operators['auto'] = 'Automatic backup';
+$lang->instance->backup->operators['manual'] = 'Manual backup';
+$lang->instance->backup->operators['settings'] = 'Backup Settings';
$lang->instance->backup->statusList = array();
$lang->instance->backup->statusList['success'] = 'successful';
@@ -150,10 +156,11 @@ $lang->instance->backup->statusList['downloading'] = 'Downloading';
$lang->instance->backup->statusList['downloadFailed'] = 'Download failed';
$lang->instance->restore = new stdclass;
+$lang->instance->restore->common = 'Restore';
$lang->instance->restore->autoRestore = 'Auto Restore';
-$lang->instance->restore->enableAutoRestore = 'Enable automatic restore';
-$lang->instance->restore->cycleDays = 'Restore cycle';
-$lang->instance->restore->restoreTime = 'Restore Time';
+$lang->instance->restore->enableAutoRestore = 'Automatic backup';
+$lang->instance->restore->cycleDays = 'Backup cycle';
+$lang->instance->restore->restoreTime = 'Backup Time';
$lang->instance->restore->invalidTime = 'Invalid time';
$lang->instance->restore->disableAutoRestore = 'Automatic restore has been turned off';
$lang->instance->restore->firstStartTime = '%s The first automatic restore will be executed on %s';
@@ -282,6 +289,7 @@ $lang->instance->notices['upgradeSuccess'] = 'Upgrade successful';
$lang->instance->notices['upgradeFail'] = 'Upgrade failed';
$lang->instance->notices['backupSuccess'] = 'Backup task submitted';
$lang->instance->notices['backupFail'] = 'Backup failed';
+$lang->instance->notices['cleanBackupsSuccess'] = 'Backup cleanup successfuls';
$lang->instance->notices['restoreSuccess'] = 'The rollback task has been submitted';
$lang->instance->notices['restoreFail'] = 'Rollback failed';
$lang->instance->notices['deleteSuccess'] = 'DeleteSuccess';
diff --git a/module/instance/lang/fr.php b/module/instance/lang/fr.php
index 2cb84ddfaa..ebd34a6ae0 100644
--- a/module/instance/lang/fr.php
+++ b/module/instance/lang/fr.php
@@ -94,12 +94,12 @@ $lang->instance->backup->date = 'backup time';
$lang->instance->backup->operator = 'Backup person';
$lang->instance->backup->type = 'Backup type';
$lang->instance->backup->backupStatus = 'Backup Status';
-$lang->instance->backup->restoreStatus = 'Rollback Status';
-$lang->instance->backup->restoreOperator = 'Rollback by';
-$lang->instance->backup->restoreTime = 'rollback time';
+$lang->instance->backup->restoreStatus = 'Restore Status';
+$lang->instance->backup->restoreOperator = 'Restore by';
+$lang->instance->backup->restoreTime = 'Restore time';
$lang->instance->backup->action = 'Operation';
$lang->instance->backup->restore = 'rollback';
-$lang->instance->backup->restoreInfo = 'Rollback Information';
+$lang->instance->backup->restoreInfo = 'Restore Information';
$lang->instance->backup->delete = 'Delete';
$lang->instance->backup->rebackup = 'Retrying backup';
$lang->instance->backup->create = 'Create backup';
@@ -116,7 +116,7 @@ $lang->instance->backup->volStatus = 'Status';
$lang->instance->backup->volSpentSeconds = 'Time taken (seconds)';
$lang->instance->backup->volSize = 'Size';
$lang->instance->backup->lastRestore = 'Last rollback';
-$lang->instance->backup->restoreDate = 'Rollback time';
+$lang->instance->backup->restoreDate = 'Restore time';
$lang->instance->backup->latestBackupAt = 'Last backup time';
$lang->instance->backup->backupBeforeRestore = 'We recommend that you backup before rolling back!';
$lang->instance->backup->enableAutoBackup = 'Enable automatic backup';
@@ -129,11 +129,17 @@ $lang->instance->backup->firstStartTime = '%s The first backup will be perf
$lang->instance->backup->invalidTime = 'Invalid time';
$lang->instance->backup->disableAutoBackup = 'Automatic backup has been turned off';
$lang->instance->backup->keepBackupBySystem = 'The system will only delete expired automatic backup data when there is more than one backup data.';
+$lang->instance->backup->backupSize = 'Size';
+$lang->instance->backup->confirmTip = 'Are you sure you want to back up?';
+$lang->instance->backup->cronRemark = 'DevOps service automatic backup task';
+$lang->instance->backup->backupSettingsTips = 'The system will delete backups that exceed the set number of days, but will retain at least one valid backup.';
$lang->instance->backup->cycleList[1] = 'Daily';
$lang->instance->backup->operators = array();
-$lang->instance->backup->operators['auto'] = 'Automatic backup';
+$lang->instance->backup->operators['auto'] = 'Automatic backup';
+$lang->instance->backup->operators['manual'] = 'Manual backup';
+$lang->instance->backup->operators['settings'] = 'Backup Settings';
$lang->instance->backup->statusList = array();
$lang->instance->backup->statusList['success'] = 'successful';
@@ -150,10 +156,11 @@ $lang->instance->backup->statusList['downloading'] = 'Downloading';
$lang->instance->backup->statusList['downloadFailed'] = 'Download failed';
$lang->instance->restore = new stdclass;
+$lang->instance->restore->common = 'Restore';
$lang->instance->restore->autoRestore = 'Auto Restore';
-$lang->instance->restore->enableAutoRestore = 'Enable automatic restore';
-$lang->instance->restore->cycleDays = 'Restore cycle';
-$lang->instance->restore->restoreTime = 'Restore Time';
+$lang->instance->restore->enableAutoRestore = 'Automatic backup';
+$lang->instance->restore->cycleDays = 'Backup cycle';
+$lang->instance->restore->restoreTime = 'Backup Time';
$lang->instance->restore->invalidTime = 'Invalid time';
$lang->instance->restore->disableAutoRestore = 'Automatic restore has been turned off';
$lang->instance->restore->firstStartTime = '%s The first automatic restore will be executed on %s';
@@ -282,6 +289,7 @@ $lang->instance->notices['upgradeSuccess'] = 'Upgrade successful';
$lang->instance->notices['upgradeFail'] = 'Upgrade failed';
$lang->instance->notices['backupSuccess'] = 'Backup task submitted';
$lang->instance->notices['backupFail'] = 'Backup failed';
+$lang->instance->notices['cleanBackupsSuccess'] = 'Backup cleanup successfuls';
$lang->instance->notices['restoreSuccess'] = 'The rollback task has been submitted';
$lang->instance->notices['restoreFail'] = 'Rollback failed';
$lang->instance->notices['deleteSuccess'] = 'DeleteSuccess';
diff --git a/module/instance/lang/zh-cn.php b/module/instance/lang/zh-cn.php
index 5d29f9176f..e40e9d8865 100644
--- a/module/instance/lang/zh-cn.php
+++ b/module/instance/lang/zh-cn.php
@@ -94,9 +94,9 @@ $lang->instance->backup->date = '备份时间';
$lang->instance->backup->operator = '备份人';
$lang->instance->backup->type = '备份类型';
$lang->instance->backup->backupStatus = '备份状态';
-$lang->instance->backup->restoreStatus = '回滚状态';
-$lang->instance->backup->restoreOperator = '回滚人';
-$lang->instance->backup->restoreTime = '回滚时间';
+$lang->instance->backup->restoreStatus = '还原状态';
+$lang->instance->backup->restoreOperator = '还原人';
+$lang->instance->backup->restoreTime = '还原时间';
$lang->instance->backup->action = '操作';
$lang->instance->backup->restore = '回滚';
$lang->instance->backup->restoreInfo = '回滚信息';
@@ -116,7 +116,7 @@ $lang->instance->backup->volStatus = '状态';
$lang->instance->backup->volSpentSeconds = '耗时(秒)';
$lang->instance->backup->volSize = '大小';
$lang->instance->backup->lastRestore = '上次回滚';
-$lang->instance->backup->restoreDate = '回滚时间';
+$lang->instance->backup->restoreDate = '还原时间';
$lang->instance->backup->latestBackupAt = '上次备份时间';
$lang->instance->backup->backupBeforeRestore = '回滚前建议您先备份!';
$lang->instance->backup->enableAutoBackup = '开启自动备份';
@@ -129,11 +129,17 @@ $lang->instance->backup->firstStartTime = '%s 首次备份将于%s 执行';
$lang->instance->backup->invalidTime = '无效的时间';
$lang->instance->backup->disableAutoBackup = '自动备份已关闭';
$lang->instance->backup->keepBackupBySystem = '备份数据超过1条时系统才会删除过期的自动备份数据。';
+$lang->instance->backup->backupSize = '大小';
+$lang->instance->backup->confirmTip = '确认要备份吗？';
+$lang->instance->backup->cronRemark = 'Devops服务自动备份任务';
+$lang->instance->backup->backupSettingsTips = '系统会删除超过设置天数的备份，但会保留至少一个有效备份。';
$lang->instance->backup->cycleList[1] = '每日';
$lang->instance->backup->operators = array();
-$lang->instance->backup->operators['auto'] = '自动备份';
+$lang->instance->backup->operators['auto'] = '自动备份';
+$lang->instance->backup->operators['manual'] = '手动备份';
+$lang->instance->backup->operators['settings'] = '备份设置';
$lang->instance->backup->statusList = array();
$lang->instance->backup->statusList['success'] = '成功';
@@ -149,14 +155,19 @@ $lang->instance->backup->statusList['uploadFailed'] = '上传失败';
$lang->instance->backup->statusList['downloading'] = '下载中';
$lang->instance->backup->statusList['downloadFailed'] = '下载失败';
+$lang->instance->backup->autoRestoreOptions[0] = '关闭';
+$lang->instance->backup->autoRestoreOptions[1] = '开启';
+
$lang->instance->restore = new stdclass;
-$lang->instance->restore->autoRestore = '自动还原';
-$lang->instance->restore->enableAutoRestore = '开启自动还原';
+$lang->instance->restore->common = '还原';
+$lang->instance->restore->autoRestore = '自动备份';
+$lang->instance->restore->enableAutoRestore = '自动备份';
$lang->instance->restore->cycleDays = '还原周期';
$lang->instance->restore->restoreTime = '还原时间';
$lang->instance->restore->invalidTime = '无效的时间';
-$lang->instance->restore->disableAutoRestore = '自动还原已关闭';
-$lang->instance->restore->firstStartTime = '%s 首次自动还原将于%s 执行';
+$lang->instance->restore->disableAutoRestore = '自动备份已关闭';
+$lang->instance->restore->firstStartTime = '%s 首次自动备份将于%s 执行';
+
$lang->instance->restore->cycleList[1] = '每日';
@@ -282,8 +293,9 @@ $lang->instance->notices['upgradeSuccess'] = '升级成功';
$lang->instance->notices['upgradeFail'] = '升级失败';
$lang->instance->notices['backupSuccess'] = '备份任务已提交';
$lang->instance->notices['backupFail'] = '备份失败';
-$lang->instance->notices['restoreSuccess'] = '回滚任务已提交';
-$lang->instance->notices['restoreFail'] = '回滚失败';
+$lang->instance->notices['cleanBackupsSuccess'] = '备份清理成功';
+$lang->instance->notices['restoreSuccess'] = '还原任务已提交';
+$lang->instance->notices['restoreFail'] = '还原失败';
$lang->instance->notices['deleteSuccess'] = '删除成功';
$lang->instance->notices['deleteFail'] = '删除失败';
$lang->instance->notices['starting'] = '启动中，请稍候...';
@@ -292,7 +304,7 @@ $lang->instance->notices['installing'] = '安装中，请稍候...
$lang->instance->notices['uninstalling'] = '删除中，请稍候...';
$lang->instance->notices['upgrading'] = '升级中，请稍候...';
$lang->instance->notices['backuping'] = '备份中，请稍候...';
-$lang->instance->notices['restoring'] = '回滚中，请稍候...';
+$lang->instance->notices['restoring'] = '还原中，请稍候...';
$lang->instance->notices['deleting'] = '删除中，请稍候...';
$lang->instance->notices['adjusting'] = '调整中，请稍候...';
$lang->instance->notices['switching'] = '提交中，请稍候...';
diff --git a/module/instance/model.php b/module/instance/model.php
index f0370c715c..2e583a843f 100644
--- a/module/instance/model.php
+++ b/module/instance/model.php
@@ -304,7 +304,7 @@ class instanceModel extends model
$settings->settings_map->resources = new stdclass;
$settings->settings_map->resources->cpu = $size;
- $oldValue = $instance->oldValue;
+ $oldValue = (int)$instance->oldValue;
$newValue = (string)$size;
unset($instance->oldValue);
$success = $this->cne->updateConfig($instance, $settings);
@@ -536,7 +536,7 @@ class instanceModel extends model
$settingsMap->ci->enabled = true;
}
- if($instance->source == 'system')
+ if($instance->source == 'system' && in_array($instance->chart, $this->config->instance->initUserApps))
{
$user = $this->dao->select('account')->from(TABLE_USER)->where('deleted')->eq(0)->fetch('account');
if($user)
@@ -1151,4 +1151,232 @@ class instanceModel extends model
if(empty($this->loadModel('pipeline')->getByNameAndType($name . '-' . $times, $name))) return $name . '-' . $times;
}
}
+
+ /**
+ * Backup instance.
+ * 备份应用实例。
+ * @param object $instance
+ * @param object $user
+ * @access public
+ * @return bool
+ */
+ public function backup($instance, $user)
+ {
+ $result = $this->cne->backup($instance, $user->account);
+ if($result->code != 200) return false;
+
+ return true;
+ }
+
+ /**
+ * Get backup list of instance.
+ * 获取应用备份列表。
+ *
+ * @param object $instance
+ * @access public
+ * @return array
+ */
+ public function backupList($instance)
+ {
+ $result = $this->cne->getBackupList($instance);
+ if(empty($result) || $result->code != 200 || empty($result->data)) return array();
+
+ $backupList = $result->data;
+ usort($backupList, function($backup1, $backup2)
+ {
+ if($backup1->create_time < $backup2->create_time) return 1;
+ elseif ($backup1->create_time > $backup2->create_time) return -1;
+ else return 0;
+ });
+
+ $accounts = array_column($backupList, 'creator');
+ foreach($backupList as $backup) $accounts = array_merge($accounts, array_column($backup->restores, 'creator'));
+
+ $accounts = array_unique($accounts);
+
+ $users = $this->dao->select('account,realname')->from(TABLE_USER)->where('account')->in($accounts)->fetchPairs('account', 'realname');
+
+ foreach($backupList as &$backup)
+ {
+ $backup->latest_restore_time = 0;
+ $backup->latest_restore_status = '';
+ $backup->username = zget($users, $backup->creator);
+ /* Mount backup operator info and latest restore info. */
+ foreach($backup->restores as &$restore)
+ {
+ $restore->username = zget($users, $restore->creator);
+
+ if($restore->create_time > $backup->latest_restore_time)
+ {
+ $backup->latest_restore_time = $restore->create_time;
+ $backup->latest_restore_status = $restore->status;
+ }
+ }
+
+ /* Calculate backup size. */
+ $backupSize = isset($backup->backup_details->db[0]) ? intval(zget($backup->backup_details->db[0], 'size', 0)) : 0;
+ $backupSize += isset($backup->backup_details->volume[0]) ? intval(zget($backup->backup_details->volume[0], 'doneBytes', 0)) : 0;
+ $backup->fmtBackupSize = helper::formatKB($backupSize / 1024);
+ }
+ return $backupList;
+ }
+
+ /**
+ * Save backup settings.
+ * 保存备份设置。
+ *
+ * @param $instance
+ * @return void
+ */
+ public function saveBackupSettings($instance)
+ {
+ /* Initialize properties and validate. */
+ $settings = fixer::input('post')
+ ->setDefault('autoBackup', '0')
+ ->setDefault('backupTime', '1:00')
+ ->setDefault('backupCycle', '1')
+ ->get();
+ $autoBackup = (int)$settings->autoBackup;
+ $command = 'moduleName=instance&methodName=cronBackup&instanceID=' . $instance->id;
+ if(!validater::checkInt($settings->backupKeepDays, 1, 30))
+ {
+ dao::$errors['message'] = $this->lang->instance->backup->keepDayRange;
+ return false;
+ }
+ if($autoBackup == 1 && !preg_match("/^([0-2][0-9]):([0-5][0-9])$/", $settings->backupTime, $parts))
+ {
+ dao::$errors['message'] = $this->lang->instance->backup->invalidTime;
+ return false;
+ }
+ if($instance->backupKeepDays != $settings->backupKeepDays)
+ {
+ $this->dao->update(TABLE_INSTANCE)->set('backupKeepDays')->eq($settings->backupKeepDays)->where('id')->eq($instance->id)->exec();
+ if($this->dao->isError()) return false;
+ }
+
+ /* Disable backup operation. */
+ if(!$autoBackup)
+ {
+ $this->dao->delete()->from(TABLE_CRON)->where('command')->eq($command)->exec();
+ $this->dao->update(TABLE_INSTANCE)->set('autoBackup')->eq($autoBackup)->where('id')->eq($instance->id)->exec();
+ if($this->dao->isError()) return false;
+
+ $this->action->create('instance', $instance->id, 'savebackupsettings', '', json_encode(array('result' => 'success', 'data' => $settings)));
+ return true;
+ }
+
+ /* Enable backup operation. */
+ $cron = $this->dao->select('*')->from(TABLE_CRON)->where('command')->eq($command)->fetch();
+ list($hour, $minute) = explode(':', $settings->backupTime);
+ $cronData = new stdclass;
+ $cronData->m = intval($minute);
+ $cronData->h = intval($hour);
+ $cronData->dom = '*';
+ $cronData->mon = '*';
+ $cronData->dow = '*';
+ $cronData->type = 'zentao';
+ $cronData->status = 'normal';
+ $cronData->command = $command;
+ $cronData->remark = $this->lang->instance->backup->cronRemark;
+
+ $this->dao->update(TABLE_INSTANCE)->set('autoBackup')->eq($autoBackup)->where('id')->eq($instance->id)->exec();
+ if($this->dao->isError()) return false;
+
+ if($cron) $this->dao->update(TABLE_CRON)->autoCheck()->data($cronData)->where('id')->eq($cron->id)->exec();
+ else $this->dao->insert(TABLE_CRON)->data($cronData)->exec();
+ if($this->dao->isError()) return false;
+ $this->action->create('instance', $instance->id, 'savebackupsettings', '', json_encode(array('result' => 'success', 'data' => $settings)));
+ return true;
+ }
+
+ /**
+ * Get backup settings.
+ * 获取备份设置。
+ *
+ * @param int $instnaceID
+ * @access public
+ * @return object
+ */
+ public function getBackupSettings($instanceID)
+ {
+ $instance = $this->getByID($instanceID);
+ $cron = $this->dao->select('*')->from(TABLE_CRON)->where('command')->eq('moduleName=instance&methodName=cronBackup&instanceID=' . $instance->id)->limit(1)->fetch();
+ if(!$cron) $cron = new stdclass;
+
+ $hour = substr('0' . zget($cron, 'h', '1'), -2, 2);
+ $minute = substr('0' . zget($cron, 'm', '00'), -2, 2);
+
+ $settings = new stdclass;
+ $settings->backupTime = "{$hour}:{$minute}";
+ $settings->autoBackup = boolval(zget($instance, 'autoBackup', false));
+ $settings->cycleDays = 1; // Cycle days is always is 1 at present.
+ return $settings;
+ }
+
+ /**
+ * Restore instance.
+ * 还原应用实例。
+ * @param object $instance
+ * @param object $user
+ * @param string $backupName
+ * @access public
+ * @return bool
+ */
+ public function restore($instance, $user, $backupName)
+ {
+ $result = $this->cne->restore($instance, $backupName, $user->account);
+ if ($result->code != 200) return false;
+ return true;
+ }
+
+ /**
+ * auto backup.
+ * 自动备份。
+ *
+ * @param $instance
+ * @param $user
+ * @return void
+ */
+ public function autoBackup($instance, $user)
+ {
+ $cron = $this->dao->select('*')->from(TABLE_CRON)->where('command')->eq('moduleName=instance&methodName=cronBackup&instanceID=' . $instance->id)->limit(1)->fetch();
+ if(!$cron)
+ {
+ $this->action->create('instance', $instance->id, 'autobackup', '', json_encode(array('result' => 'fail', 'data'=> $cron)));
+ return false;
+ }
+
+ /* 1. Call automatic backup*/
+ $result = $this->cne->backup($instance, $user->account);
+ if($result->code != 200)
+ {
+ $this->action->create('instance', $instance->id, 'autobackup', '', json_encode(array('result' => 'fail', 'data' => $result)));
+ return false;
+ }
+ $this->action->create('instance', $instance->id, 'autobackup', '', json_encode(array('result' => 'success', 'data' => $result)));
+
+ /* 2. Pick latest successful backup recorder. */
+ $latestBackup = null;
+ $backupList = $this->backupList($instance);
+ foreach($backupList as $backup)
+ {
+ if(empty($latestBackup) or $backup->status == 'completed' && $backup->create_time > $latestBackup->create_time) $latestBackup = $backup;
+ }
+
+ /* 3. delete expired backup. Get backup list of instance, then check every backup is expired or not.*/
+ $deleteData = array();
+ foreach($backupList as $backup)
+ {
+ if($latestBackup && $latestBackup->name == $backup->name) continue; // Keep latest successful backup.
+
+ $deadline = intval($backup->create_time) + $instance->backupKeepDays * 24 * 3600;
+ if($deadline < time())
+ {
+ $this->cne->deleteBackup($instance, $backup->name);
+ array_push($deleteData, array('backupName' => $backup->name, 'backupCreateTime' => $backup->create_time));
+ }
+ }
+ if(count($deleteData) > 0) $this->action->create('instance', $instance->id, 'deleteexpiredbackup', '', json_encode(array('result' => 'success', 'data' =>$deleteData)));
+ return true;
+ }
}
diff --git a/module/instance/ui/backuplist.html.php b/module/instance/ui/backuplist.html.php
new file mode 100644
index 0000000000..15a5556cec
--- /dev/null
+++ b/module/instance/ui/backuplist.html.php
@@ -0,0 +1,53 @@
+
+ * @package repo
+ * @link https://www.zentao.net
+ */
+namespace zin;
+
+$backups = initTableData($backupList, $config->backup->dtable->fieldList, $this->instance);
+$hasRestoreLog = false;
+foreach($backupList as &$backup)
+{
+ /* Initialization calculation and assignment. */
+ $status = $backup->status;
+ $restoreStatus = '';
+ $backupSize = isset($backup->backup_details->db[0]) ? intval(zget($backup->backup_details->db[0], 'size', 0)) : 0;
+ $backupSize += isset($backup->backup_details->volume[0]) ? intval(zget($backup->backup_details->volume[0], 'doneBytes', 0)) : 0;
+
+ $backup->instanceId = $instance->id;
+ $backup->operator = zget($lang->instance->backup->operators, $backup->username, $backup->username);
+ $backup->status = zget($lang->instance->backup->statusList, strtolower($backup->status));
+ $backup->backupSize = helper::formatKB($backupSize);
+
+ /* Mark recently restored information. */
+ $backup->latestRestoreTime = 0;
+ $backup->latestRestoreStatus = '';
+ foreach($backup->restores as $restore)
+ {
+ $hasRestoreLog = true;
+ if($restore->create_time > $backup->latestRestoreTime)
+ {
+ $backup->latestRestoreTime = $restore->create_time;
+ $restoreStatus = $restore->status;
+ $backup->latestRestoreStatus = zget($lang->instance->restore->statusList, $restore->status, $restore->status);
+ }
+ }
+ $backup->latestRestoreTime = $backup->latestRestoreTime == 0 ? '' : date('Y-m-d H:i:s', $backup->latestRestoreTime);
+ $backup->restoreTime = zget($lang->instance->backup->operators, $backup->username, $backup->username);
+
+ if(!in_array($status, array('success', 'completed')) || in_array($restoreStatus, array('pending', 'inprogress'))) $backup->actions[0]['disabled'] = true;
+}
+dtable
+(
+ set::cols($config->backup->dtable->fieldList),
+ set::data($backups),
+ set::sortLink(createLink('instance', 'backuplist', "id={$instance->id}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&pageID={$pager->pageID}")),
+ set::loadPartial(true),
+ set::footPager(usePager())
+);
diff --git a/module/instance/ui/backupsettings.html.php b/module/instance/ui/backupsettings.html.php
new file mode 100644
index 0000000000..50d5ab52e0
--- /dev/null
+++ b/module/instance/ui/backupsettings.html.php
@@ -0,0 +1,74 @@
+
+ * @package instance
+ * @link https://www.zentao.net
+ */
+
+namespace zin;
+
+formPanel
+(
+ set::id('backupSettingsForm'),
+ set::title($lang->instance->backup->operators['settings']),
+ set::submitBtnText($lang->save),
+ set::actions(array('submit')),
+ formRow
+ (
+ formGroup
+ (
+ set::name('backupKeepDays'),
+ set::width('20px'),
+ set::required(true),
+ set::label($this->lang->instance->backup->keepDays),
+ set::control('input'),
+ set::value((int)$instance->backupKeepDays),
+ span($this->lang->instance->backup->backupSettingsTips, set::className('text-warning inline-block mt-2'))
+ ),
+ ),
+ formRow
+ (
+ formGroup
+ (
+ set::width('20px'),
+ set::label($lang->instance->restore->enableAutoRestore),
+ radioList
+ (
+ set::name('autoBackup'),
+ set::items($lang->instance->backup->autoRestoreOptions),
+ set::value($instance->autoBackup),
+ set::inline(true)
+ )
+ )
+ ),
+ formRow(
+ formGroup
+ (
+ set::name('backupTime'),
+ set::width('20px'),
+ set::required(true),
+ set::class('backup-settings'),
+ set::label($lang->instance->backup->backupTime),
+ set::control(array('control' => 'time')),
+ set::value($backupSettings->backupTime)
+ )
+ ),
+ formRow(
+ formGroup
+ (
+ set::name('backupCycle'),
+ set::width('20px'),
+ set::required(true),
+ set::control('picker'),
+ set::class('backup-settings'),
+ set::label($lang->instance->backup->cycleDays),
+ set::items($lang->instance->backup->cycleList),
+ set::value($backupSettings->cycleDays)
+ )
+ )
+);
diff --git a/module/instance/ui/view.html.php b/module/instance/ui/view.html.php
index c25d128287..4fe8794b9c 100644
--- a/module/instance/ui/view.html.php
+++ b/module/instance/ui/view.html.php
@@ -13,11 +13,12 @@ declare(strict_types=1);
namespace zin;
-jsVar('copied', $lang->instance->copied);
-jsVar('instanceID', $instance->id);
-jsVar('instanceStatus', $instance->status);
-jsVar('instanceType', $type);
-jsVar('inQuickon', $config->inQuickon);
+jsVar('copied', $lang->instance->copied);
+jsVar('instanceID', $instance->id);
+jsVar('instanceStatus', $instance->status);
+jsVar('instanceType', $type);
+jsVar('inQuickon', $config->inQuickon);
+jsVar('confirmBackupTip', $lang->instance->backup->confirmTip);
if(empty($instance->externalID)) $instance->externalID = 0;
$instance->appName = strtolower($instance->appName);
@@ -271,7 +272,42 @@ div
),
$dbListWg
)
- )
+ ),
+ /* 应用实例备份块。 */
+ /* Instance Backup block. */
+ ($config->inQuickon && $type == 'store' && $instance->name != 'ZenTao') ? section(
+ set::title($lang->instance->backup->common),
+ set::id('backupSection'),
+ div(
+ setClass('flex justify-end'),
+ btn(
+ set(array
+ (
+ 'icon' => 'refresh',
+ 'class' => 'ghost btn',
+ 'text' => $lang->instance->backup->operators['manual'] ,
+ 'data-size' => 'sm',
+ 'onclick' => "onManualBackup({$instance->id})"
+ ))
+ ),
+ btn(
+ set(array
+ (
+ 'icon' => 'backend',
+ 'class' => 'ghost btn',
+ 'text' => $lang->instance->backup->operators['settings'] ,
+ 'url' => createLink('instance', 'backupSettings', "id={$instance->id}"),
+ 'data-size' => 'sm',
+ 'data-toggle' => 'modal'
+ ))
+ ),
+ ),
+ div
+ (
+ setID('backupList'),
+ h::js("if(!$('#backupList').find('.dtable-header-cell').length) loadTarget($.createLink('instance', 'backupList', 'id={$instance->id}'), '#backupList');"),
+ )
+ ) : null,
),
floatToolbar
(
diff --git a/module/instance/zen.php b/module/instance/zen.php
index 35fa2c6cc0..3eafa07a41 100644
--- a/module/instance/zen.php
+++ b/module/instance/zen.php
@@ -50,43 +50,7 @@ class instanceZen extends instance
$this->view->instanceMetric = $instanceMetric;
$this->view->diskSettings = $this->cne->getDiskSettings($instance);
$this->view->dbList = $this->cne->appDBList($instance);
- }
-
- /**
- * 自动保存devops应用授权信息。
- * Auto save auth info of devops.
- *
- * @param object $instance
- * @access protected
- * @return void
- */
- protected function saveAuthInfo(object $instance): void
- {
- if(!in_array($instance->chart, $this->config->instance->devopsApps)) return;
-
- $url = strstr(getWebRoot(true), ':', true) . '://' . $instance->domain;
- $pipeline = $this->loadModel('pipeline')->getByUrl($url);
- if(!empty($pipeline)) return;
-
- $tempMappings = $this->loadModel('cne')->getSettingsMapping($instance);
- if(empty($tempMappings)) return;
-
- $pipeline = new stdclass();
- $instance->type = $instance->chart;
- $pipeline->type = $instance->type;
- $pipeline->private = md5(strval(rand(10,113450)));
- $pipeline->createdBy = 'system';
- $pipeline->createdDate = helper::now();
- $pipeline->url = $url;
- $pipeline->name = $this->generatePipelineName($instance);
- $pipeline->token = zget($tempMappings, 'api_token', '');
- $pipeline->account = zget($tempMappings, 'z_username', '');
- $pipeline->password = zget($tempMappings, 'z_password', '');
- if($instance->appID == 60) $pipeline->token = base64_encode($pipeline->token . ':');
- if(empty($pipeline->account)) $pipeline->account = zget($tempMappings, 'admin_username', '');
-
- $this->pipeline->create($pipeline);
- if(dao::isError()) dao::getError();
+ $this->view->backupList = $this->instance->backupList($instance);
}
/**
diff --git a/module/job/model.php b/module/job/model.php
index fc844b5e4e..1950f021f2 100644
--- a/module/job/model.php
+++ b/module/job/model.php
@@ -321,7 +321,7 @@ class jobModel extends model
$compileID = $this->loadModel('compile')->createByJob($job->id, $tag, 'tag');
}
- if(!$compileID && in_array($triggerType, array('', 'commit')) && strpos($job->triggerType, 'commit') !== false)
+ if(!$compileID && in_array($triggerType, array('', 'commit')) && (!$job->triggerType || strpos($job->triggerType, 'commit') !== false))
{
$compileID = $this->loadModel('compile')->createByJob($job->id);
}
diff --git a/module/metric/calc.class.php b/module/metric/calc.class.php
index 284db04b3b..0e170aff31 100644
--- a/module/metric/calc.class.php
+++ b/module/metric/calc.class.php
@@ -256,6 +256,7 @@ class baseCalc
*/
public function isDate($dateString)
{
+ if(empty($dateString)) return false;
$format = 'Y-m-d';
$dateTime = DateTime::createFromFormat($format, $dateString);
diff --git a/module/metric/calc/execution/rate/rate_of_finished_test_task_in_execution_when_closing.php b/module/metric/calc/execution/rate/rate_of_finished_test_task_in_execution_when_closing.php
index 1ed23d2d75..3223a2c444 100644
--- a/module/metric/calc/execution/rate/rate_of_finished_test_task_in_execution_when_closing.php
+++ b/module/metric/calc/execution/rate/rate_of_finished_test_task_in_execution_when_closing.php
@@ -22,7 +22,7 @@ class rate_of_finished_test_task_in_execution_when_closing extends baseCalc
{
public $dataset = 'getTasks';
- public $fieldList = array('t1.type', 't1.status', 't1.closedReason', 't1.closedDate', 't1.execution', "if(t2.multiple = '1', t2.closedDate, t3.closedDate) as executionClosed");
+ public $fieldList = array('t1.type', 't1.status', 't1.closedReason', 't1.closedDate', 't1.execution', 't2.multiple', 't2.closedDate as executionClosed', 't3.closedDate as projectClosed');
public $result = array();
@@ -30,11 +30,20 @@ class rate_of_finished_test_task_in_execution_when_closing extends baseCalc
public function calculate($row)
{
- if(!helper::isZeroDate($row->executionClosed))
+ $executionClosed = $row->multiple == '1' ? $row->executionClosed : $row->projectClosed;
+ if(!helper::isZeroDate($executionClosed))
{
- if(!isset($this->result[$row->execution])) $this->result[$row->execution] = array('finished' => 0, 'total' => 0);
- if($row->type == 'test' && ($row->status == 'done' || ($row->status == 'closed' && $row->closedReason == 'done')) && !empty($row->executionClosed) && date('Y-m-d', strtotime($row->closedDate)) <= $row->executionClosed) $this->result[$row->execution]['finished'] ++;
- if($row->type == 'test') $this->result[$row->execution]['total'] ++;
+ if($row->type !== 'test') return;
+
+ $execution = $row->execution;
+ $status = $row->status;
+ $closedReason = $row->closedReason;
+ $closedDate = $row->closedDate;
+ if($closedDate) $closedDate = date('Y-m-d', strtotime($closedDate));
+
+ if(!isset($this->result[$execution])) $this->result[$execution] = array('finished' => 0, 'total' => 0);
+ if(($status == 'done' || ($status == 'closed' && $closedReason == 'done')) && $closedDate && $closedDate <= $executionClosed) $this->result[$execution]['finished'] ++;
+ $this->result[$execution]['total'] ++;
}
}
diff --git a/module/metric/calc/execution/scale/count_of_daily_finished_task_in_execution.php b/module/metric/calc/execution/scale/count_of_daily_finished_task_in_execution.php
index aba0c73179..932d8e1847 100755
--- a/module/metric/calc/execution/scale/count_of_daily_finished_task_in_execution.php
+++ b/module/metric/calc/execution/scale/count_of_daily_finished_task_in_execution.php
@@ -32,12 +32,13 @@ class count_of_daily_finished_task_in_execution extends baseCalc
$finishedDate = $row->finishedDate;
$execution = $row->execution;
- if($status != 'done' || empty($finishedDate)) return false;
+ if($status != 'done') return false;
+
+ $year = $this->getYear($finishedDate);
+ if(!$year) return false;
- if(empty($finishedDate)) return false;
$date = substr($finishedDate, 0, 10);
list($year, $month, $day) = explode('-', $date);
- if($year == '0000') return false;
if(!isset($this->result[$execution])) $this->result[$execution] = array();
if(!isset($this->result[$execution][$year])) $this->result[$execution][$year] = array();
diff --git a/module/metric/calc/execution/scale/count_of_finished_test_task_in_execution_when_closing.php b/module/metric/calc/execution/scale/count_of_finished_test_task_in_execution_when_closing.php
index 2473f87132..e305bb81ec 100755
--- a/module/metric/calc/execution/scale/count_of_finished_test_task_in_execution_when_closing.php
+++ b/module/metric/calc/execution/scale/count_of_finished_test_task_in_execution_when_closing.php
@@ -22,7 +22,7 @@ class count_of_finished_test_task_in_execution_when_closing extends baseCalc
{
public $dataset = 'getTasks';
- public $fieldList = array('t1.type', 't1.status', 't1.closedReason', "IF(t1.finishedDate, t1.finishedDate, t1.closedDate) AS finishedDate", 't1.execution', 't2.closedDate AS executionClosedDate');
+ public $fieldList = array('t1.type', 't1.status', 't1.closedReason', 't1.finishedDate', 't1.closedDate', 't1.execution', 't2.closedDate AS executionClosedDate');
public $result = array();
@@ -30,9 +30,10 @@ class count_of_finished_test_task_in_execution_when_closing extends baseCalc
public function calculate($row)
{
+ $finishedDate = $this->isDate($row->finishedDate) ? $row->finishedDate : $row->closedDate;
if(!helper::isZeroDate($row->executionClosedDate))
{
- if($row->type == 'test' && ($row->status == 'done' || $row->status == 'closed' && $row->closedReason == 'done') && $row->finishedDate <= $row->executionClosedDate)
+ if($row->type == 'test' && ($row->status == 'done' || $row->status == 'closed' && $row->closedReason == 'done') && $finishedDate <= $row->executionClosedDate)
{
if(!isset($this->result[$row->execution])) $this->result[$row->execution] = 0;
$this->result[$row->execution] ++;
diff --git a/module/metric/calc/product/scale/count_of_annual_closed_feedback_in_product.php b/module/metric/calc/product/scale/count_of_annual_closed_feedback_in_product.php
index 089db52ad6..ce2fd10c11 100755
--- a/module/metric/calc/product/scale/count_of_annual_closed_feedback_in_product.php
+++ b/module/metric/calc/product/scale/count_of_annual_closed_feedback_in_product.php
@@ -31,11 +31,8 @@ class count_of_annual_closed_feedback_in_product extends baseCalc
$product = $data->product;
$closedDate = $data->closedDate;
- if(empty($closedDate)) return false;
-
- $year = substr($closedDate, 0, 4);
-
- if($year == '0000') return false;
+ $year = $this->getYear($closedDate);
+ if(!$year) return false;
if(!isset($this->result[$product])) $this->result[$product] = array();
if(!isset($this->result[$product][$year])) $this->result[$product][$year] = 0;
diff --git a/module/metric/calc/product/scale/count_of_annual_closed_story_in_product.php b/module/metric/calc/product/scale/count_of_annual_closed_story_in_product.php
index 1f9a27c97c..e990d008a0 100755
--- a/module/metric/calc/product/scale/count_of_annual_closed_story_in_product.php
+++ b/module/metric/calc/product/scale/count_of_annual_closed_story_in_product.php
@@ -34,9 +34,8 @@ class count_of_annual_closed_story_in_product extends baseCalc
$product = $row->product;
$closedDate = $row->closedDate;
- if(empty($closedDate)) return false;
- $year = substr($closedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($closedDate);
+ if(!$year) return false;
if(!isset($this->result[$product])) $this->result[$product] = array();
if(!isset($this->result[$product][$year])) $this->result[$product][$year] = 0;
diff --git a/module/metric/calc/product/scale/count_of_annual_created_bug_in_product.php b/module/metric/calc/product/scale/count_of_annual_created_bug_in_product.php
index f36d68b0bd..52de620958 100755
--- a/module/metric/calc/product/scale/count_of_annual_created_bug_in_product.php
+++ b/module/metric/calc/product/scale/count_of_annual_created_bug_in_product.php
@@ -30,10 +30,9 @@ class count_of_annual_created_bug_in_product extends baseCalc
{
$product = $data->product;
$openedDate = $data->openedDate;
- if(empty($openedDate)) return false;
- $year = substr($openedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($openedDate);
+ if(!$year) return false;
if(!isset($this->result[$product])) $this->result[$product] = array();
if(!isset($this->result[$product][$year])) $this->result[$product][$year] = 0;
diff --git a/module/metric/calc/product/scale/count_of_annual_created_case_in_product.php b/module/metric/calc/product/scale/count_of_annual_created_case_in_product.php
index 7b4e7b30a8..bcfde7d0b0 100755
--- a/module/metric/calc/product/scale/count_of_annual_created_case_in_product.php
+++ b/module/metric/calc/product/scale/count_of_annual_created_case_in_product.php
@@ -31,11 +31,8 @@ class count_of_annual_created_case_in_product extends baseCalc
$product = $row->product;
$openedDate = $row->openedDate;
- if(empty($openedDate)) return false;
-
- $year = substr($openedDate, 0, 4);
-
- if($year == '0000') return false;
+ $year = $this->getYear($openedDate);
+ if(!$year) return false;
if(!isset($this->result[$product])) $this->result[$product] = array();
if(!isset($this->result[$product][$year])) $this->result[$product][$year] = 0;
diff --git a/module/metric/calc/product/scale/count_of_annual_created_effective_bug_in_product.php b/module/metric/calc/product/scale/count_of_annual_created_effective_bug_in_product.php
index 1c4a08b0ef..b119c14a02 100755
--- a/module/metric/calc/product/scale/count_of_annual_created_effective_bug_in_product.php
+++ b/module/metric/calc/product/scale/count_of_annual_created_effective_bug_in_product.php
@@ -30,9 +30,8 @@ class count_of_annual_created_effective_bug_in_product extends baseCalc
{
$openedDate = $data->openedDate;
- if(empty($openedDate)) return false;
- $year = substr($openedDate, 0 ,4);
- if($year == '0000') return false;
+ $year = $this->getYear($openedDate);
+ if(!$year) return false;
$product = $data->product;
if(!isset($this->result[$product])) $this->result[$product] = array();
diff --git a/module/metric/calc/product/scale/count_of_annual_created_feedback_in_product.php b/module/metric/calc/product/scale/count_of_annual_created_feedback_in_product.php
index 205dc0de1d..5202b06e8c 100755
--- a/module/metric/calc/product/scale/count_of_annual_created_feedback_in_product.php
+++ b/module/metric/calc/product/scale/count_of_annual_created_feedback_in_product.php
@@ -31,11 +31,8 @@ class count_of_annual_created_feedback_in_product extends baseCalc
$product = $data->product;
$openedDate = $data->openedDate;
- if(empty($openedDate)) return false;
-
- $year = substr($openedDate, 0, 4);
-
- if($year == '0000') return false;
+ $year = $this->getYear($openedDate);
+ if(!$year) return false;
if(!isset($this->result[$product])) $this->result[$product] = array();
if(!isset($this->result[$product][$year])) $this->result[$product][$year] = 0;
diff --git a/module/metric/calc/product/scale/count_of_annual_created_productplan_in_product.php b/module/metric/calc/product/scale/count_of_annual_created_productplan_in_product.php
index 9e894cc5a5..fb8517b6b1 100755
--- a/module/metric/calc/product/scale/count_of_annual_created_productplan_in_product.php
+++ b/module/metric/calc/product/scale/count_of_annual_created_productplan_in_product.php
@@ -28,10 +28,10 @@ class count_of_annual_created_productplan_in_product extends baseCalc
public function calculate($row)
{
- if(empty(trim($row->createdDate))) return false;
- $row->year = substr($row->createdDate, 0, 4);
- if(empty(trim($row->year))) return false;
- if($row->year == '0000') return false;
+ if(!$this->isDate($row->createdDate)) return false;
+
+ $row->year = $this->getYear($row->createdDate);
+ if(!$row->year) return false;
if(!isset($this->result[$row->year])) $this->result[$row->year] = array();
if(!isset($this->result[$row->year][$row->product])) $this->result[$row->year][$row->product] = 0;
diff --git a/module/metric/calc/product/scale/count_of_annual_created_release_in_product.php b/module/metric/calc/product/scale/count_of_annual_created_release_in_product.php
index c47668c170..5d7a6fa474 100755
--- a/module/metric/calc/product/scale/count_of_annual_created_release_in_product.php
+++ b/module/metric/calc/product/scale/count_of_annual_created_release_in_product.php
@@ -28,10 +28,8 @@ class count_of_annual_created_release_in_product extends baseCalc
public function calculate($row)
{
- if(empty($row->date)) return null;
-
- $year = substr($row->date, 0, 4);
- if($year == '0000') return null;
+ $year = $this->getYear($row->date);
+ if(!$year) return false;
if(!isset($this->result[$year])) $this->result[$year] = array();
if(!isset($this->result[$year][$row->product])) $this->result[$year][$row->product] = 0;
diff --git a/module/metric/calc/product/scale/count_of_annual_created_requirement_in_product.php b/module/metric/calc/product/scale/count_of_annual_created_requirement_in_product.php
index 73776f5898..7988dfbf76 100755
--- a/module/metric/calc/product/scale/count_of_annual_created_requirement_in_product.php
+++ b/module/metric/calc/product/scale/count_of_annual_created_requirement_in_product.php
@@ -32,10 +32,10 @@ class count_of_annual_created_requirement_in_product extends baseCalc
$type = $data->type;
$openedDate = $data->openedDate;
- if(empty($openedDate) || $type != 'requirement') return false;
+ $year = $this->getYear($openedDate);
+ if(!$year) return false;
- $year = substr($openedDate, 0, 4);
- if($year == '0000') return false;
+ if($type != 'requirement') return false;
if(!isset($this->result[$product])) $this->result[$product] = array();
if(!isset($this->result[$product][$year])) $this->result[$product][$year] = 0;
diff --git a/module/metric/calc/product/scale/count_of_annual_created_story_in_product.php b/module/metric/calc/product/scale/count_of_annual_created_story_in_product.php
index bf8b8009ac..00f88e5f30 100755
--- a/module/metric/calc/product/scale/count_of_annual_created_story_in_product.php
+++ b/module/metric/calc/product/scale/count_of_annual_created_story_in_product.php
@@ -31,11 +31,8 @@ class count_of_annual_created_story_in_product extends baseCalc
$product = $row->product;
$openedDate = $row->openedDate;
- if(empty($openedDate)) return false;
-
- $year = substr($openedDate, 0, 4);
-
- if(empty($year) || $year == '0000') return false;
+ $year = $this->getYear($openedDate);
+ if(!$year) return false;
if(!isset($this->result[$product])) $this->result[$product] = array();
if(!isset($this->result[$product][$year])) $this->result[$product][$year] = 0;
diff --git a/module/metric/calc/product/scale/count_of_annual_delivered_story_in_product.php b/module/metric/calc/product/scale/count_of_annual_delivered_story_in_product.php
index 715660893b..3e0265abb7 100755
--- a/module/metric/calc/product/scale/count_of_annual_delivered_story_in_product.php
+++ b/module/metric/calc/product/scale/count_of_annual_delivered_story_in_product.php
@@ -37,16 +37,14 @@ class count_of_annual_delivered_story_in_product extends baseCalc
$year = null;
if($stage == 'released')
{
- if(empty($releasedDate)) return false;
- $year = substr($releasedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($releasedDate);
+ if(!$year) return false;
}
if($closedReason == 'done')
{
- if(empty($closedDate)) return false;
- $year = substr($closedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($closedDate);
+ if(!$year) return false;
}
if(empty($year)) return false;
diff --git a/module/metric/calc/product/scale/count_of_annual_finished_story_in_product.php b/module/metric/calc/product/scale/count_of_annual_finished_story_in_product.php
index 04a8881cae..601203da39 100755
--- a/module/metric/calc/product/scale/count_of_annual_finished_story_in_product.php
+++ b/module/metric/calc/product/scale/count_of_annual_finished_story_in_product.php
@@ -33,11 +33,8 @@ class count_of_annual_finished_story_in_product extends baseCalc
$product = $row->product;
$closedDate = $row->closedDate;
- if(empty($closedDate)) return false;
-
- $year = substr($closedDate, 0, 4);
-
- if(empty($year) || $year == '0000') return false;
+ $year = $this->getYear($closedDate);
+ if(!$year) return false;
if(!isset($this->result[$product])) $this->result[$product] = array();
if(!isset($this->result[$product][$year])) $this->result[$product][$year] = 0;
diff --git a/module/metric/calc/product/scale/count_of_annual_fixed_bug_in_product.php b/module/metric/calc/product/scale/count_of_annual_fixed_bug_in_product.php
index 67e03fabe9..d839b06531 100755
--- a/module/metric/calc/product/scale/count_of_annual_fixed_bug_in_product.php
+++ b/module/metric/calc/product/scale/count_of_annual_fixed_bug_in_product.php
@@ -32,10 +32,10 @@ class count_of_annual_fixed_bug_in_product extends baseCalc
$resolution = $data->resolution;
$closedDate = $data->closedDate;
- if(empty($closedDate)) return false;
+ $year = $this->getYear($closedDate);
+ if(!$year) return false;
- $year = substr($closedDate, 0, 4);
- if($resolution != 'fixed' || $year == '0000') return false;
+ if($resolution != 'fixed') return false;
if(!isset($this->result[$product])) $this->result[$product] = array();
if(!isset($this->result[$product][$year])) $this->result[$product][$year] = 0;
diff --git a/module/metric/calc/product/scale/count_of_daily_closed_bug_in_product.php b/module/metric/calc/product/scale/count_of_daily_closed_bug_in_product.php
index ea367a4e6d..f0be003fa9 100755
--- a/module/metric/calc/product/scale/count_of_daily_closed_bug_in_product.php
+++ b/module/metric/calc/product/scale/count_of_daily_closed_bug_in_product.php
@@ -28,7 +28,10 @@ class count_of_daily_closed_bug_in_product extends baseCalc
public function calculate($row)
{
- if($row->status != 'closed' || empty($row->closedDate)) return false;
+ $year = $this->getYear($row->closedDate);
+ if(!$year) return false;
+
+ if($row->status != 'closed') return false;
$date = substr($row->closedDate, 0, 10);
list($year, $month, $day) = explode('-', $date);
diff --git a/module/metric/calc/product/scale/count_of_daily_created_bug_in_product.php b/module/metric/calc/product/scale/count_of_daily_created_bug_in_product.php
index c9c693045d..89e5dc78e0 100755
--- a/module/metric/calc/product/scale/count_of_daily_created_bug_in_product.php
+++ b/module/metric/calc/product/scale/count_of_daily_created_bug_in_product.php
@@ -28,11 +28,11 @@ class count_of_daily_created_bug_in_product extends baseCalc
public function calculate($row)
{
- if(empty($row->openedDate)) return false;
+ $year = $this->getYear($row->openedDate);
+ if(!$year) return false;
$date = substr($row->openedDate, 0, 10);
list($year, $month, $day) = explode('-', $date);
- if($year == '0000') return false;
if(!isset($this->result[$row->product])) $this->result[$row->product] = array();
if(!isset($this->result[$row->product][$year])) $this->result[$row->product][$year] = array();
diff --git a/module/metric/calc/product/scale/count_of_daily_resolved_bug_in_product.php b/module/metric/calc/product/scale/count_of_daily_resolved_bug_in_product.php
index 9acb9e62ac..41387624c4 100755
--- a/module/metric/calc/product/scale/count_of_daily_resolved_bug_in_product.php
+++ b/module/metric/calc/product/scale/count_of_daily_resolved_bug_in_product.php
@@ -28,11 +28,13 @@ class count_of_daily_resolved_bug_in_product extends baseCalc
public function calculate($row)
{
- if($row->status == 'active' || empty($row->resolvedDate)) return false;
+ $year = $this->getYear($row->resolvedDate);
+ if(!$year) return false;
+
+ if($row->status == 'active') return false;
$date = substr($row->resolvedDate, 0, 10);
list($year, $month, $day) = explode('-', $date);
- if($year == '0000') return false;
if(!isset($this->result[$row->product])) $this->result[$row->product] = array();
if(!isset($this->result[$row->product][$year])) $this->result[$row->product][$year] = array();
diff --git a/module/metric/calc/product/scale/count_of_monthly_closed_bug_in_product.php b/module/metric/calc/product/scale/count_of_monthly_closed_bug_in_product.php
index 14b2031469..dbf09a0487 100755
--- a/module/metric/calc/product/scale/count_of_monthly_closed_bug_in_product.php
+++ b/module/metric/calc/product/scale/count_of_monthly_closed_bug_in_product.php
@@ -31,10 +31,8 @@ class count_of_monthly_closed_bug_in_product extends baseCalc
$product = $row->product;
$closedDate = $row->closedDate;
- if(empty($closedDate)) return false;
-
- $year = substr($closedDate, 0 ,4);
- if($year == '0000') return false;
+ $year = $this->getYear($closedDate);
+ if(!$year) return false;
$month = substr($closedDate, 5, 2);
diff --git a/module/metric/calc/product/scale/count_of_monthly_closed_story_in_product.php b/module/metric/calc/product/scale/count_of_monthly_closed_story_in_product.php
index b07071e10c..57ae78c17c 100755
--- a/module/metric/calc/product/scale/count_of_monthly_closed_story_in_product.php
+++ b/module/metric/calc/product/scale/count_of_monthly_closed_story_in_product.php
@@ -31,13 +31,10 @@ class count_of_monthly_closed_story_in_product extends baseCalc
$product = $data->product;
$closedDate = $data->closedDate;
- if(empty($closedDate)) return false;
-
- $year = substr($closedDate, 0, 4);
+ $year = $this->getYear($closedDate);
+ if(!$year) return false;
$month = substr($closedDate, 5, 2);
- if($year == '0000') return false;
-
if(!isset($this->result[$product])) $this->result[$product] = array();
if(!isset($this->result[$product][$year])) $this->result[$product][$year] = array();
if(!isset($this->result[$product][$year][$month])) $this->result[$product][$year][$month] = 0;
diff --git a/module/metric/calc/product/scale/count_of_monthly_created_bug_in_product.php b/module/metric/calc/product/scale/count_of_monthly_created_bug_in_product.php
index 4bd16afaa2..d4ad3e4354 100755
--- a/module/metric/calc/product/scale/count_of_monthly_created_bug_in_product.php
+++ b/module/metric/calc/product/scale/count_of_monthly_created_bug_in_product.php
@@ -31,10 +31,8 @@ class count_of_monthly_created_bug_in_product extends baseCalc
$product = $row->product;
$openedDate = $row->openedDate;
- if(empty($openedDate)) return false;
-
- $year = substr($openedDate, 0 ,4);
- if($year == '0000') return false;
+ $year = $this->getYear($openedDate);
+ if(!$year) return false;
$month = substr($openedDate, 5, 2);
diff --git a/module/metric/calc/product/scale/count_of_monthly_created_release_in_product.php b/module/metric/calc/product/scale/count_of_monthly_created_release_in_product.php
index fa6845c104..7e83435802 100755
--- a/module/metric/calc/product/scale/count_of_monthly_created_release_in_product.php
+++ b/module/metric/calc/product/scale/count_of_monthly_created_release_in_product.php
@@ -31,10 +31,8 @@ class count_of_monthly_created_release_in_product extends baseCalc
$product = $row->product;
$createdDate = $row->date;
- if(empty($createdDate)) return false;
-
- $year = substr($createdDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($createdDate);
+ if(!$year) return false;
$month = substr($createdDate, 5, 2);
diff --git a/module/metric/calc/product/scale/count_of_monthly_created_story_in_product.php b/module/metric/calc/product/scale/count_of_monthly_created_story_in_product.php
index 52bdd7bd21..77db93c090 100755
--- a/module/metric/calc/product/scale/count_of_monthly_created_story_in_product.php
+++ b/module/metric/calc/product/scale/count_of_monthly_created_story_in_product.php
@@ -31,13 +31,12 @@ class count_of_monthly_created_story_in_product extends baseCalc
$product = $data->product;
$openedDate = $data->openedDate;
- if(empty($openedDate)) return false;
+ $year = $this->getYear($openedDate);
+ if(!$year) return false;
$year = substr($openedDate, 0, 4);
$month = substr($openedDate, 5, 2);
- if($year == '0000') return false;
-
if(!isset($this->result[$product])) $this->result[$product] = array();
if(!isset($this->result[$product][$year])) $this->result[$product][$year] = array();
if(!isset($this->result[$product][$year][$month])) $this->result[$product][$year][$month] = 0;
diff --git a/module/metric/calc/product/scale/count_of_monthly_delivered_story_in_product.php b/module/metric/calc/product/scale/count_of_monthly_delivered_story_in_product.php
index a3310ec537..0b08061bef 100755
--- a/module/metric/calc/product/scale/count_of_monthly_delivered_story_in_product.php
+++ b/module/metric/calc/product/scale/count_of_monthly_delivered_story_in_product.php
@@ -38,22 +38,20 @@ class count_of_monthly_delivered_story_in_product extends baseCalc
$month = null;
if($stage == 'released')
{
- if(empty($releasedDate)) return false;
- $year = substr($releasedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($releasedDate);
+ if(!$year) return false;
+
$month = substr($releasedDate, 5, 2);
}
if($closedReason == 'done')
{
- if(empty($closedDate)) return false;
- $year = substr($closedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($closedDate);
+ if(!$year) return false;
+
$month = substr($closedDate, 5, 2);
}
- if(empty($year)) return false;
-
if(!isset($this->result[$product])) $this->result[$product] = array();
if(!isset($this->result[$product][$year])) $this->result[$product][$year] = array();
if(!isset($this->result[$product][$year][$month])) $this->result[$product][$year][$month] = 0;
diff --git a/module/metric/calc/product/scale/count_of_monthly_finished_story_in_product.php b/module/metric/calc/product/scale/count_of_monthly_finished_story_in_product.php
index 3fe62cfa7b..949dc02a00 100755
--- a/module/metric/calc/product/scale/count_of_monthly_finished_story_in_product.php
+++ b/module/metric/calc/product/scale/count_of_monthly_finished_story_in_product.php
@@ -32,14 +32,10 @@ class count_of_monthly_finished_story_in_product extends baseCalc
$closedDate = $row->closedDate;
$closedReason = $row->closedReason;
- if(empty($closedDate)) return false;
-
- $year = substr($closedDate, 0, 4);
+ $year = $this->getYear($closedDate);
+ if(!$year) return false;
$month = substr($closedDate, 5, 2);
- if(empty($year) || empty($month)) return false;
- if($year == '0000') return false;
-
if($closedReason != 'done') return false;
if(!isset($this->result[$product])) $this->result[$product] = array();
diff --git a/module/metric/calc/product/scale/count_of_monthly_fixed_bug_in_product.php b/module/metric/calc/product/scale/count_of_monthly_fixed_bug_in_product.php
index f940357640..8612fc8b6f 100755
--- a/module/metric/calc/product/scale/count_of_monthly_fixed_bug_in_product.php
+++ b/module/metric/calc/product/scale/count_of_monthly_fixed_bug_in_product.php
@@ -32,11 +32,10 @@ class count_of_monthly_fixed_bug_in_product extends baseCalc
$resolution = $data->resolution;
$closedDate = $data->closedDate;
- if(empty($closedDate)) return false;
-
- $year = substr($closedDate, 0, 4);
- if($resolution != 'fixed' || $year == '0000') return false;
+ if($resolution != 'fixed') return false;
+ $year = $this->getYear($closedDate);
+ if(!$year) return false;
$month = substr($closedDate, 5, 2);
if(!isset($this->result[$product])) $this->result[$product] = array();
diff --git a/module/metric/calc/product/scale/scale_of_annual_closed_story_in_product.php b/module/metric/calc/product/scale/scale_of_annual_closed_story_in_product.php
index c092faa9a4..3e2f6942df 100755
--- a/module/metric/calc/product/scale/scale_of_annual_closed_story_in_product.php
+++ b/module/metric/calc/product/scale/scale_of_annual_closed_story_in_product.php
@@ -35,11 +35,8 @@ class scale_of_annual_closed_story_in_product extends baseCalc
if($parent == '-1') return false;
- if(empty($closedDate)) return false;
-
- $year = substr($closedDate, 0, 4);
-
- if($year == '0000') return false;
+ $year = $this->getYear($closedDate);
+ if(!$year) return false;
if(!isset($this->result[$product])) $this->result[$product] = array();
if(!isset($this->result[$product][$year])) $this->result[$product][$year] = 0;
diff --git a/module/metric/calc/product/scale/scale_of_annual_delivered_story_in_product.php b/module/metric/calc/product/scale/scale_of_annual_delivered_story_in_product.php
index b7c875c2e9..5a810b7fce 100755
--- a/module/metric/calc/product/scale/scale_of_annual_delivered_story_in_product.php
+++ b/module/metric/calc/product/scale/scale_of_annual_delivered_story_in_product.php
@@ -41,16 +41,14 @@ class scale_of_annual_delivered_story_in_product extends baseCalc
$year = null;
if($stage == 'released')
{
- if(empty($releasedDate)) return false;
- $year = substr($releasedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($releasedDate);
+ if(!$year) return false;
}
if($closedReason == 'done')
{
- if(empty($closedDate)) return false;
- $year = substr($closedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($closedDate);
+ if(!$year) return false;
}
if(empty($year)) return false;
diff --git a/module/metric/calc/product/scale/scale_of_annual_finished_story_in_product.php b/module/metric/calc/product/scale/scale_of_annual_finished_story_in_product.php
index f4115ebe7d..43c054ad7e 100755
--- a/module/metric/calc/product/scale/scale_of_annual_finished_story_in_product.php
+++ b/module/metric/calc/product/scale/scale_of_annual_finished_story_in_product.php
@@ -36,11 +36,8 @@ class scale_of_annual_finished_story_in_product extends baseCalc
if($parent == '-1') return false;
- if(empty($closedDate)) return false;
-
- $year = substr($closedDate, 0, 4);
-
- if($year == '0000') return false;
+ $year = $this->getYear($closedDate);
+ if(!$year) return false;
if(!isset($this->result[$product])) $this->result[$product] = array();
if(!isset($this->result[$product][$year])) $this->result[$product][$year] = 0;
diff --git a/module/metric/calc/product/scale/scale_of_monthly_finished_story_in_product.php b/module/metric/calc/product/scale/scale_of_monthly_finished_story_in_product.php
index bcadbae6f8..bc44416ea8 100755
--- a/module/metric/calc/product/scale/scale_of_monthly_finished_story_in_product.php
+++ b/module/metric/calc/product/scale/scale_of_monthly_finished_story_in_product.php
@@ -38,11 +38,8 @@ class scale_of_monthly_finished_story_in_product extends baseCalc
if($closedReason != 'done') return false;
- if(empty($closedDate)) return false;
-
- $year = substr($closedDate, 0, 4);
-
- if($year == '0000') return false;
+ $year = $this->getYear($closedDate);
+ if(!$year) return false;
$month = substr($closedDate, 5, 2);
diff --git a/module/metric/calc/project/scale/count_annual_closed_execution_in_project.php b/module/metric/calc/project/scale/count_annual_closed_execution_in_project.php
index 73b7730ff2..101d87128f 100755
--- a/module/metric/calc/project/scale/count_annual_closed_execution_in_project.php
+++ b/module/metric/calc/project/scale/count_annual_closed_execution_in_project.php
@@ -31,9 +31,8 @@ class count_annual_closed_execution_in_project extends baseCalc
$project = $row->project;
$closedDate = $row->closedDate;
- if(empty($closedDate)) return false;
- $year = substr($closedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($closedDate);
+ if(!$year) return false;
if(!isset($this->result[$project])) $this->result[$project] = array();
if(!isset($this->result[$project][$year])) $this->result[$project][$year] = 0;
diff --git a/module/metric/calc/project/scale/count_of_annual_created_bug_in_project.php b/module/metric/calc/project/scale/count_of_annual_created_bug_in_project.php
index 74fc8086ef..c7868a4fb5 100644
--- a/module/metric/calc/project/scale/count_of_annual_created_bug_in_project.php
+++ b/module/metric/calc/project/scale/count_of_annual_created_bug_in_project.php
@@ -30,10 +30,9 @@ class count_of_annual_created_bug_in_project extends baseCalc
{
$project = $data->project;
$openedDate = $data->openedDate;
- if(empty($openedDate)) return false;
- $year = substr($openedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($openedDate);
+ if(!$year) return false;
if(!isset($this->result[$project])) $this->result[$project] = array();
if(!isset($this->result[$project][$year])) $this->result[$project][$year] = 0;
diff --git a/module/metric/calc/project/scale/count_of_annual_created_effective_bug_in_project.php b/module/metric/calc/project/scale/count_of_annual_created_effective_bug_in_project.php
new file mode 100644
index 0000000000..448ee4a6f2
--- /dev/null
+++ b/module/metric/calc/project/scale/count_of_annual_created_effective_bug_in_project.php
@@ -0,0 +1,59 @@
+
+ * @package
+ * @uses func
+ * @license ZPL(https://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
+ * @Link https://www.zentao.net
+ */
+class count_of_annual_created_effective_bug_in_project extends baseCalc
+{
+ public $dataset = 'getProjectBugs';
+
+ public $fieldList = array('t1.project', 't1.status', 't1.resolution', 't1.openedDate');
+
+ public $result = array();
+
+ public function calculate($data)
+ {
+ $openedDate = $data->openedDate;
+
+ $year = $this->getYear($openedDate);
+ if(!$year) return false;
+
+ $project = $data->project;
+ if(!isset($this->result[$project])) $this->result[$project] = array();
+ if(!isset($this->result[$project][$year])) $this->result[$project][$year] = 0;
+
+ $resolution = $data->resolution;
+ $status = $data->status;
+
+ if($status == 'active' or $resolution == 'fixed' or $resolution == 'postponed') $this->result[$project][$year] += 1;
+ }
+
+ public function getResult($options = array())
+ {
+ $records = array();
+ foreach($this->result as $project => $years)
+ {
+ foreach($years as $year => $value)
+ {
+ $records[] = array('project' => $project, 'year' => $year, 'value' => $value);
+ }
+ }
+
+ return $this->filterByOptions($records, $options);
+ }
+}
diff --git a/module/metric/calc/project/scale/count_of_annual_finished_execution_in_project.php b/module/metric/calc/project/scale/count_of_annual_finished_execution_in_project.php
index 7fc3bcbaf8..648af6b02c 100644
--- a/module/metric/calc/project/scale/count_of_annual_finished_execution_in_project.php
+++ b/module/metric/calc/project/scale/count_of_annual_finished_execution_in_project.php
@@ -31,9 +31,8 @@ class count_of_annual_finished_execution_in_project extends baseCalc
$project = $row->project;
$realEnd = $row->realEnd;
- if(empty($realEnd)) return false;
- $year = substr($realEnd, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($realEnd);
+ if(!$year) return false;
if(!isset($this->result[$project])) $this->result[$project] = array();
if(!isset($this->result[$project][$year])) $this->result[$project][$year] = 0;
diff --git a/module/metric/calc/project/scale/count_of_annual_finished_story_in_project.php b/module/metric/calc/project/scale/count_of_annual_finished_story_in_project.php
index 1f286f27db..f9400ffa6e 100755
--- a/module/metric/calc/project/scale/count_of_annual_finished_story_in_project.php
+++ b/module/metric/calc/project/scale/count_of_annual_finished_story_in_project.php
@@ -31,9 +31,8 @@ class count_of_annual_finished_story_in_project extends baseCalc
$project = $row->project;
$closedDate = $row->closedDate;
- if(empty($closedDate)) return false;
- $year = substr($closedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($closedDate);
+ if(!$year) return false;
if(!isset($this->result[$project])) $this->result[$project] = array();
if(!isset($this->result[$project][$year])) $this->result[$project][$year] = 0;
diff --git a/module/metric/calc/project/scale/count_of_annual_fixed_bug_in_project.php b/module/metric/calc/project/scale/count_of_annual_fixed_bug_in_project.php
new file mode 100644
index 0000000000..78d06cac12
--- /dev/null
+++ b/module/metric/calc/project/scale/count_of_annual_fixed_bug_in_project.php
@@ -0,0 +1,51 @@
+
+ * @package
+ * @uses func
+ * @license ZPL(https://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
+ * @Link https://www.zentao.net
+ */
+class count_of_annual_fixed_bug_in_project extends baseCalc
+{
+ public $dataset = 'getProjectBugs';
+
+ public $fieldList = array('t1.project', 't1.resolution', 't1.closedDate');
+
+ public $result = array();
+
+ public function calculate($data)
+ {
+ $project = $data->project;
+ $resolution = $data->resolution;
+ $closedDate = $data->closedDate;
+
+ $year = $this->getYear($closedDate);
+ if(!$year) return false;
+
+ if($resolution != 'fixed') return false;
+
+ if(!isset($this->result[$project])) $this->result[$project] = array();
+ if(!isset($this->result[$project][$year])) $this->result[$project][$year] = 0;
+
+ $this->result[$project][$year] += 1;
+ }
+
+ public function getResult($options = array())
+ {
+ $records = $this->getRecords(array('project', 'year', 'value'));
+ return $this->filterByOptions($records, $options);
+ }
+}
diff --git a/module/metric/calc/project/scale/count_of_daily_closed_bug_in_project.php b/module/metric/calc/project/scale/count_of_daily_closed_bug_in_project.php
index 9ceea8235c..bee0f9d93c 100644
--- a/module/metric/calc/project/scale/count_of_daily_closed_bug_in_project.php
+++ b/module/metric/calc/project/scale/count_of_daily_closed_bug_in_project.php
@@ -28,11 +28,13 @@ class count_of_daily_closed_bug_in_project extends baseCalc
public function calculate($row)
{
- if($row->status != 'closed' || empty($row->closedDate)) return false;
+ if($row->status != 'closed') return false;
+
+ $year = $this->getYear($row->closedDate);
+ if(!$year) return false;
$date = substr($row->closedDate, 0, 10);
list($year, $month, $day) = explode('-', $date);
- if($year == '0000') return false;
if(!isset($this->result[$row->project])) $this->result[$row->project] = array();
if(!isset($this->result[$row->project][$year])) $this->result[$row->project][$year] = array();
diff --git a/module/metric/calc/project/scale/count_of_daily_created_bug_in_project.php b/module/metric/calc/project/scale/count_of_daily_created_bug_in_project.php
index ff8fdaed00..311edb715b 100644
--- a/module/metric/calc/project/scale/count_of_daily_created_bug_in_project.php
+++ b/module/metric/calc/project/scale/count_of_daily_created_bug_in_project.php
@@ -28,11 +28,11 @@ class count_of_daily_created_bug_in_project extends baseCalc
public function calculate($row)
{
- if(empty($row->openedDate)) return false;
+ $year = $this->getYear($row->openedDate);
+ if(!$year) return false;
$date = substr($row->openedDate, 0, 10);
list($year, $month, $day) = explode('-', $date);
- if($year == '0000') return false;
if(!isset($this->result[$row->project])) $this->result[$row->project] = array();
if(!isset($this->result[$row->project][$year])) $this->result[$row->project][$year] = array();
diff --git a/module/metric/calc/project/scale/count_of_daily_resolved_bug_in_project.php b/module/metric/calc/project/scale/count_of_daily_resolved_bug_in_project.php
index cb5fe403cc..7999f28129 100644
--- a/module/metric/calc/project/scale/count_of_daily_resolved_bug_in_project.php
+++ b/module/metric/calc/project/scale/count_of_daily_resolved_bug_in_project.php
@@ -28,11 +28,13 @@ class count_of_daily_resolved_bug_in_project extends baseCalc
public function calculate($row)
{
- if($row->status == 'active' || empty($row->resolvedDate)) return false;
+ if($row->status == 'active') return false;
+
+ $year = $this->getYear($row->resolvedDate);
+ if(!$year) return false;
$date = substr($row->resolvedDate, 0, 10);
list($year, $month, $day) = explode('-', $date);
- if($year == '0000') return false;
if(!isset($this->result[$row->project])) $this->result[$row->project] = array();
if(!isset($this->result[$row->project][$year])) $this->result[$row->project][$year] = array();
diff --git a/module/metric/calc/project/scale/count_of_monthly_closed_bug_in_project.php b/module/metric/calc/project/scale/count_of_monthly_closed_bug_in_project.php
index b8d52825c5..61edcf6577 100644
--- a/module/metric/calc/project/scale/count_of_monthly_closed_bug_in_project.php
+++ b/module/metric/calc/project/scale/count_of_monthly_closed_bug_in_project.php
@@ -31,10 +31,8 @@ class count_of_monthly_closed_bug_in_project extends baseCalc
$project = $row->project;
$closedDate = $row->closedDate;
- if(empty($closedDate)) return false;
-
- $year = substr($closedDate, 0 ,4);
- if($year == '0000') return false;
+ $year = $this->getYear($closedDate);
+ if(!$year) return false;
$month = substr($closedDate, 5, 2);
diff --git a/module/metric/calc/project/scale/count_of_monthly_created_bug_in_project.php b/module/metric/calc/project/scale/count_of_monthly_created_bug_in_project.php
index 1be09c18b9..f8add1cc1c 100644
--- a/module/metric/calc/project/scale/count_of_monthly_created_bug_in_project.php
+++ b/module/metric/calc/project/scale/count_of_monthly_created_bug_in_project.php
@@ -31,10 +31,8 @@ class count_of_monthly_created_bug_in_project extends baseCalc
$project = $row->project;
$openedDate = $row->openedDate;
- if(empty($openedDate)) return false;
-
- $year = substr($openedDate, 0 ,4);
- if($year == '0000') return false;
+ $year = $this->getYear($openedDate);
+ if(!$year) return false;
$month = substr($openedDate, 5, 2);
diff --git a/module/metric/calc/project/scale/count_of_monthly_fixed_bug_in_project.php b/module/metric/calc/project/scale/count_of_monthly_fixed_bug_in_project.php
index 3c630f061d..c7df829075 100644
--- a/module/metric/calc/project/scale/count_of_monthly_fixed_bug_in_project.php
+++ b/module/metric/calc/project/scale/count_of_monthly_fixed_bug_in_project.php
@@ -1,15 +1,15 @@
@@ -32,10 +32,10 @@ class count_of_monthly_fixed_bug_in_project extends baseCalc
$resolution = $data->resolution;
$closedDate = $data->closedDate;
- if(empty($closedDate)) return false;
+ $year = $this->getYear($closedDate);
+ if(!$year) return false;
- $year = substr($closedDate, 0, 4);
- if($resolution != 'fixed' || $year == '0000') return false;
+ if($resolution != 'fixed') return false;
$month = substr($closedDate, 5, 2);
diff --git a/module/metric/calc/project/scale/scale_of_annual_finished_story_in_project.php b/module/metric/calc/project/scale/scale_of_annual_finished_story_in_project.php
index 87423a6b10..db3cc0ac5b 100755
--- a/module/metric/calc/project/scale/scale_of_annual_finished_story_in_project.php
+++ b/module/metric/calc/project/scale/scale_of_annual_finished_story_in_project.php
@@ -34,9 +34,8 @@ class scale_of_annual_finished_story_in_project extends baseCalc
if($parent == '-1') return false;
- if(empty($closedDate)) return false;
- $year = substr($closedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($closedDate);
+ if(!$year) return false;
if(!isset($this->result[$project])) $this->result[$project] = array();
if(!isset($this->result[$project][$year])) $this->result[$project][$year] = 0;
diff --git a/module/metric/calc/system/hour/consume_of_annual_closed_project.php b/module/metric/calc/system/hour/consume_of_annual_closed_project.php
index ab2b641466..90c35b2517 100755
--- a/module/metric/calc/system/hour/consume_of_annual_closed_project.php
+++ b/module/metric/calc/system/hour/consume_of_annual_closed_project.php
@@ -29,12 +29,12 @@ class consume_of_annual_closed_project extends baseCalc
public function calculate($data)
{
$project = $data->project;
- $year = substr($data->closedDate, 0, 4);
$consumed = $data->consumed;
$status = $data->status;
if($status != 'closed') return false;
- if(empty($year) || $year == '0000') return false;
+ $year = $this->getYear($data->closedDate);
+ if(!$year) return false;
if(!is_numeric($consumed) || empty($consumed)) return false;
diff --git a/module/metric/calc/system/hour/consume_of_monthly_closed_project.php b/module/metric/calc/system/hour/consume_of_monthly_closed_project.php
index e716d9a172..cb7399d214 100755
--- a/module/metric/calc/system/hour/consume_of_monthly_closed_project.php
+++ b/module/metric/calc/system/hour/consume_of_monthly_closed_project.php
@@ -29,12 +29,12 @@ class consume_of_monthly_closed_project extends baseCalc
public function calculate($data)
{
$project = $data->project;
- $year = substr($data->closedDate, 0, 4);
$consumed = $data->consumed;
$status = $data->status;
if($status != 'closed') return false;
- if(empty($year) || $year == '0000') return false;
+ $year = $this->getYear($data->closedDate);
+ if(!$year) return false;
$month = substr($data->closedDate, 5, 2);
diff --git a/module/metric/calc/system/hour/day_of_annual_closed_project.php b/module/metric/calc/system/hour/day_of_annual_closed_project.php
index c5e87a5443..ac51495ecd 100755
--- a/module/metric/calc/system/hour/day_of_annual_closed_project.php
+++ b/module/metric/calc/system/hour/day_of_annual_closed_project.php
@@ -29,13 +29,13 @@ class day_of_annual_closed_project extends baseCalc
public function calculate($data)
{
$project = $data->project;
- $year = substr($data->closedDate, 0, 4);
$consumed = (float)$data->consumed;
$status = $data->status;
$defaultHours = (float)$data->defaultHours;
if($status != 'closed') return false;
- if(empty($year) || $year == '0000') return false;
+ $year = $this->getYear($data->closedDate);
+ if(!$year) return false;
if(!isset($this->result[$year])) $this->result[$year] = array();
if(!isset($this->result[$year][$project])) $this->result[$year][$project] = 0;
diff --git a/module/metric/calc/system/hour/day_of_annual_effort.php b/module/metric/calc/system/hour/day_of_annual_effort.php
index 9ecd5e6947..c5cfcb6094 100755
--- a/module/metric/calc/system/hour/day_of_annual_effort.php
+++ b/module/metric/calc/system/hour/day_of_annual_effort.php
@@ -28,10 +28,8 @@ class day_of_annual_effort extends baseCalc
public function calculate($row)
{
- if(empty($row->date)) return false;
-
- $year = substr($row->date, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($row->date);
+ if(!$year) return false;
$consumed = $row->consumed;
$defaultHours = $row->defaultHours;
diff --git a/module/metric/calc/system/hour/day_of_daily_effort.php b/module/metric/calc/system/hour/day_of_daily_effort.php
index 56387fde9d..f60c98c001 100755
--- a/module/metric/calc/system/hour/day_of_daily_effort.php
+++ b/module/metric/calc/system/hour/day_of_daily_effort.php
@@ -29,10 +29,8 @@ class day_of_daily_effort extends baseCalc
public function calculate($row)
{
$date = $row->date;
- if(empty($date)) return false;
-
- $year = substr($date, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($date);
+ if(!$year) return false;
$month = substr($date, 5, 2);
$day = substr($date, 8, 2);
diff --git a/module/metric/calc/system/hour/hour_of_annual_effort.php b/module/metric/calc/system/hour/hour_of_annual_effort.php
index 123c8e56ba..0b692b18b2 100755
--- a/module/metric/calc/system/hour/hour_of_annual_effort.php
+++ b/module/metric/calc/system/hour/hour_of_annual_effort.php
@@ -28,10 +28,8 @@ class hour_of_annual_effort extends baseCalc
public function calculate($row)
{
- if(empty($row->date)) return false;
-
- $year = substr($row->date, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($row->date);
+ if(!$year) return false;
$consumed = $row->consumed;
diff --git a/module/metric/calc/system/hour/hour_of_daily_effort.php b/module/metric/calc/system/hour/hour_of_daily_effort.php
index 1701b220fd..0f75bb4bf2 100755
--- a/module/metric/calc/system/hour/hour_of_daily_effort.php
+++ b/module/metric/calc/system/hour/hour_of_daily_effort.php
@@ -29,12 +29,8 @@ class hour_of_daily_effort extends baseCalc
public function calculate($row)
{
$date = $row->date;
-
- if(empty($date)) return false;
-
- $year = substr($date, 0, 4);
-
- if($year == '0000') return false;
+ $year = $this->getYear($date);
+ if(!$year) return false;
$month = substr($date, 5, 2);
$day = substr($date, 8, 2);
diff --git a/module/metric/calc/system/rate/rate_of_annual_delivered_story.php b/module/metric/calc/system/rate/rate_of_annual_delivered_story.php
index dd863d3146..0dd1919704 100755
--- a/module/metric/calc/system/rate/rate_of_annual_delivered_story.php
+++ b/module/metric/calc/system/rate/rate_of_annual_delivered_story.php
@@ -38,9 +38,8 @@ class rate_of_annual_delivered_story extends baseCalc
if($stage == 'released' && !empty($closedDate)) $date = $releasedDate;
if(empty($date)) return false;
-
- $year = substr($date, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($date);
+ if(!$year) return false;
if(!isset($this->result[$year])) $this->result[$year] = array('finished' => 0, 'valid' => 0);
if($stage == 'released' || $closedReason == 'done') $this->result[$year]['finished'] += 1;
diff --git a/module/metric/calc/system/rate/rate_of_annual_finished_story.php b/module/metric/calc/system/rate/rate_of_annual_finished_story.php
index 7f0c2098cd..c8e85f7151 100755
--- a/module/metric/calc/system/rate/rate_of_annual_finished_story.php
+++ b/module/metric/calc/system/rate/rate_of_annual_finished_story.php
@@ -31,11 +31,8 @@ class rate_of_annual_finished_story extends baseCalc
$closedDate = $data->closedDate;
$closedReason = $data->closedReason;
- if(empty($closedDate)) return false;
-
- $year = substr($closedDate, 0, 4);
-
- if($year == '0000') return false;
+ $year = $this->getYear($closedDate);
+ if(!$year) return false;
if(!isset($this->result[$year])) $this->result[$year] = array();
diff --git a/module/metric/calc/system/rate/rate_of_delayed_closed_execution_which_annual_finished.php b/module/metric/calc/system/rate/rate_of_delayed_closed_execution_which_annual_finished.php
index e03f06843a..1fae015b16 100755
--- a/module/metric/calc/system/rate/rate_of_delayed_closed_execution_which_annual_finished.php
+++ b/module/metric/calc/system/rate/rate_of_delayed_closed_execution_which_annual_finished.php
@@ -28,10 +28,8 @@ class rate_of_delayed_closed_execution_which_annual_finished extends baseCalc
public function calculate($row)
{
- if(empty($row->closedDate)) return false;
-
- $year = substr($row->closedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($row->closedDate);
+ if(!$year) return false;
if(!isset($this->result[$year])) $this->result[$year] = array('closed' => 0, 'delayed' => 0);
if($row->status == 'closed') $this->result[$year]['closed'] ++;
diff --git a/module/metric/calc/system/rate/rate_of_delayed_finished_project_which_annual_finished.php b/module/metric/calc/system/rate/rate_of_delayed_finished_project_which_annual_finished.php
index 13a390db03..615cd4fe7f 100755
--- a/module/metric/calc/system/rate/rate_of_delayed_finished_project_which_annual_finished.php
+++ b/module/metric/calc/system/rate/rate_of_delayed_finished_project_which_annual_finished.php
@@ -28,9 +28,8 @@ class rate_of_delayed_finished_project_which_annual_finished extends baseCalc
public function calculate($row)
{
- if(empty($row->closedDate)) return false;
-
- $closedYear = substr($row->closedDate, 0, 4);
+ $closedYear = $this->getYear($row->closedDate);
+ if(!$closedYear) return false;
if(!isset($this->result[$closedYear])) $this->result[$closedYear] = array('closed' => 0, 'delayed' => 0);
if($row->status == 'closed') $this->result[$closedYear]['closed'] ++;
diff --git a/module/metric/calc/system/rate/rate_of_undelayed_closed_execution_which_annual_finished.php b/module/metric/calc/system/rate/rate_of_undelayed_closed_execution_which_annual_finished.php
index 23e970239b..e52f57b99b 100755
--- a/module/metric/calc/system/rate/rate_of_undelayed_closed_execution_which_annual_finished.php
+++ b/module/metric/calc/system/rate/rate_of_undelayed_closed_execution_which_annual_finished.php
@@ -28,10 +28,8 @@ class rate_of_undelayed_closed_execution_which_annual_finished extends baseCalc
public function calculate($row)
{
- if(empty($row->closedDate)) return false;
-
- $year = substr($row->closedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($row->closedDate);
+ if(!$year) return false;
if(!isset($this->result[$year])) $this->result[$year] = array('closed' => 0, 'undelayed' => 0);
if($row->status == 'closed') $this->result[$year]['closed'] ++;
diff --git a/module/metric/calc/system/rate/rate_of_undelayed_finished_project_which_annual_finished.php b/module/metric/calc/system/rate/rate_of_undelayed_finished_project_which_annual_finished.php
index 609ec092df..2752fa61a2 100755
--- a/module/metric/calc/system/rate/rate_of_undelayed_finished_project_which_annual_finished.php
+++ b/module/metric/calc/system/rate/rate_of_undelayed_finished_project_which_annual_finished.php
@@ -28,9 +28,8 @@ class rate_of_undelayed_finished_project_which_annual_finished extends baseCalc
public function calculate($row)
{
- if(empty($row->closedDate)) return false;
-
- $closedYear = substr($row->closedDate, 0, 4);
+ $closedYear = $this->getYear($row->closedDate);
+ if(!$closedYear) return false;
if(!isset($this->result[$closedYear])) $this->result[$closedYear] = array('closed' => 0, 'delayed' => 0);
if($row->status == 'closed') $this->result[$closedYear]['closed'] ++;
diff --git a/module/metric/calc/system/scale/count_of_annual_closed_execution.php b/module/metric/calc/system/scale/count_of_annual_closed_execution.php
index d4edc9af64..868923d0aa 100755
--- a/module/metric/calc/system/scale/count_of_annual_closed_execution.php
+++ b/module/metric/calc/system/scale/count_of_annual_closed_execution.php
@@ -29,10 +29,8 @@ class count_of_annual_closed_execution extends baseCalc
public function calculate($row)
{
$closedDate = $row->closedDate;
- if(empty($closedDate)) return false;
-
- $year = substr($closedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($closedDate);
+ if(!$year) return false;
if(!isset($this->result[$year])) $this->result[$year] = 0;
$this->result[$year] += 1;
diff --git a/module/metric/calc/system/scale/count_of_annual_closed_feedback.php b/module/metric/calc/system/scale/count_of_annual_closed_feedback.php
index b0a2a4006a..f338a82e71 100755
--- a/module/metric/calc/system/scale/count_of_annual_closed_feedback.php
+++ b/module/metric/calc/system/scale/count_of_annual_closed_feedback.php
@@ -28,10 +28,10 @@ class count_of_annual_closed_feedback extends baseCalc
public function calculate($row)
{
- if(empty($row->closedDate) || $row->status != 'closed') return false;
+ if($row->status != 'closed') return false;
- $year = substr($row->closedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($row->closedDate);
+ if(!$year) return false;
if(!isset($this->result[$year])) $this->result[$year] = 0;
$this->result[$year] += 1;
diff --git a/module/metric/calc/system/scale/count_of_annual_closed_product.php b/module/metric/calc/system/scale/count_of_annual_closed_product.php
index b635458d4d..0a50961ea8 100755
--- a/module/metric/calc/system/scale/count_of_annual_closed_product.php
+++ b/module/metric/calc/system/scale/count_of_annual_closed_product.php
@@ -29,10 +29,8 @@ class count_of_annual_closed_product extends baseCalc
public function calculate($data)
{
$closedDate = $data->closedDate;
- if(empty($closedDate)) return false;
-
- $year = substr($closedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($closedDate);
+ if(!$year) return false;
if(!isset($this->result[$year])) $this->result[$year] = 0;
$this->result[$year] += 1;
diff --git a/module/metric/calc/system/scale/count_of_annual_closed_productplan.php b/module/metric/calc/system/scale/count_of_annual_closed_productplan.php
index 85002c6f0d..4162b21e8d 100755
--- a/module/metric/calc/system/scale/count_of_annual_closed_productplan.php
+++ b/module/metric/calc/system/scale/count_of_annual_closed_productplan.php
@@ -29,10 +29,8 @@ class count_of_annual_closed_productplan extends baseCalc
public function calculate($data)
{
$closedDate = $data->closedDate;
- if(empty($closedDate)) return false;
-
- $year = substr($closedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($closedDate);
+ if(!$year) return false;
if(!isset($this->result[$year])) $this->result[$year] = 0;
diff --git a/module/metric/calc/system/scale/count_of_annual_closed_project.php b/module/metric/calc/system/scale/count_of_annual_closed_project.php
index 8dd406214b..3b9da8e490 100755
--- a/module/metric/calc/system/scale/count_of_annual_closed_project.php
+++ b/module/metric/calc/system/scale/count_of_annual_closed_project.php
@@ -28,10 +28,10 @@ class count_of_annual_closed_project extends baseCalc
public function calculate($row)
{
- if(empty($row->closedDate) || $row->status != 'closed') return false;
+ if($row->status != 'closed') return false;
- $year = substr($row->closedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($row->closedDate);
+ if(!$year) return false;
if(!isset($this->result[$year])) $this->result[$year] = 0;
$this->result[$year] += 1;
diff --git a/module/metric/calc/system/scale/count_of_annual_closed_top_program.php b/module/metric/calc/system/scale/count_of_annual_closed_top_program.php
index 3a76e66225..60e0fcd3c7 100755
--- a/module/metric/calc/system/scale/count_of_annual_closed_top_program.php
+++ b/module/metric/calc/system/scale/count_of_annual_closed_top_program.php
@@ -28,10 +28,10 @@ class count_of_annual_closed_top_program extends baseCalc
public function calculate($row)
{
- if(empty($row->closedDate) or $row->status != 'closed') return false;
+ if($row->status != 'closed') return false;
- $year = substr($row->closedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($row->closedDate);
+ if(!$year) return false;
if(!isset($this->result[$year])) $this->result[$year] = 0;
$this->result[$year] += 1;
diff --git a/module/metric/calc/system/scale/count_of_annual_created_bug.php b/module/metric/calc/system/scale/count_of_annual_created_bug.php
index 4d4543e2fb..81c9392581 100755
--- a/module/metric/calc/system/scale/count_of_annual_created_bug.php
+++ b/module/metric/calc/system/scale/count_of_annual_created_bug.php
@@ -28,11 +28,8 @@ class count_of_annual_created_bug extends baseCalc
public function calculate($row)
{
- $openedDate = $row->openedDate;
- if(empty($openedDate)) return false;
-
- $year = substr($openedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($row->openedDate);
+ if(!$year) return false;
if(!isset($this->result[$year])) $this->result[$year] = 0;
$this->result[$year] += 1;
diff --git a/module/metric/calc/system/scale/count_of_annual_created_case.php b/module/metric/calc/system/scale/count_of_annual_created_case.php
index 80ec83d097..a2273536f0 100755
--- a/module/metric/calc/system/scale/count_of_annual_created_case.php
+++ b/module/metric/calc/system/scale/count_of_annual_created_case.php
@@ -28,11 +28,8 @@ class count_of_annual_created_case extends baseCalc
public function calculate($row)
{
- $openedDate = $row->openedDate;
- if(empty($openedDate)) return false;
-
- $year = substr($openedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($row->openedDate);
+ if(!$year) return false;
if(!isset($this->result[$year])) $this->result[$year] = 0;
$this->result[$year] += 1;
diff --git a/module/metric/calc/system/scale/count_of_annual_created_doc.php b/module/metric/calc/system/scale/count_of_annual_created_doc.php
index 3700c1cba9..da34e3be35 100755
--- a/module/metric/calc/system/scale/count_of_annual_created_doc.php
+++ b/module/metric/calc/system/scale/count_of_annual_created_doc.php
@@ -28,11 +28,8 @@ class count_of_annual_created_doc extends baseCalc
public function calculate($row)
{
- $addedDate = $row->addedDate;
- if(empty($addedDate)) return false;
-
- $year = substr($addedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($row->addedDate);
+ if(!$year) return false;
if(!isset($this->result[$year])) $this->result[$year] = 0;
$this->result[$year] += 1;
diff --git a/module/metric/calc/system/scale/count_of_annual_created_execution.php b/module/metric/calc/system/scale/count_of_annual_created_execution.php
index f69a81b931..6a29483315 100755
--- a/module/metric/calc/system/scale/count_of_annual_created_execution.php
+++ b/module/metric/calc/system/scale/count_of_annual_created_execution.php
@@ -28,11 +28,8 @@ class count_of_annual_created_execution extends baseCalc
public function calculate($row)
{
- $openedDate = $row->openedDate;
- if(empty($openedDate)) return false;
-
- $year = substr($openedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($row->openedDate);
+ if(!$year) return false;
if(!isset($this->result[$year])) $this->result[$year] = 0;
$this->result[$year] += 1;
diff --git a/module/metric/calc/system/scale/count_of_annual_created_feedback.php b/module/metric/calc/system/scale/count_of_annual_created_feedback.php
index 48257f4cce..2c0aa43d18 100755
--- a/module/metric/calc/system/scale/count_of_annual_created_feedback.php
+++ b/module/metric/calc/system/scale/count_of_annual_created_feedback.php
@@ -28,10 +28,8 @@ class count_of_annual_created_feedback extends baseCalc
public function calculate($row)
{
- if(empty($row->openedDate)) return false;
-
- $year = substr($row->openedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($row->openedDate);
+ if(!$year) return false;
if(!isset($this->result[$year])) $this->result[$year] = 0;
$this->result[$year] += 1;
diff --git a/module/metric/calc/system/scale/count_of_annual_created_product.php b/module/metric/calc/system/scale/count_of_annual_created_product.php
index 7f2f913a62..858839a924 100755
--- a/module/metric/calc/system/scale/count_of_annual_created_product.php
+++ b/module/metric/calc/system/scale/count_of_annual_created_product.php
@@ -28,11 +28,8 @@ class count_of_annual_created_product extends baseCalc
public function calculate($data)
{
- $createdDate = $data->createdDate;
- if(empty($createdDate)) return false;
-
- $year = substr($createdDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($data->createdDate);
+ if(!$year) return false;
if(!isset($this->result[$year])) $this->result[$year] = 0;
$this->result[$year] += 1;
diff --git a/module/metric/calc/system/scale/count_of_annual_created_productplan.php b/module/metric/calc/system/scale/count_of_annual_created_productplan.php
index f1757ce929..7116db4e03 100755
--- a/module/metric/calc/system/scale/count_of_annual_created_productplan.php
+++ b/module/metric/calc/system/scale/count_of_annual_created_productplan.php
@@ -28,11 +28,8 @@ class count_of_annual_created_productplan extends baseCalc
public function calculate($data)
{
- $createdDate = $data->createdDate;
- if(empty($createdDate)) return false;
-
- $year = substr($createdDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($data->createdDate);
+ if(!$year) return false;
if(!isset($this->result[$year])) $this->result[$year] = 0;
diff --git a/module/metric/calc/system/scale/count_of_annual_created_project.php b/module/metric/calc/system/scale/count_of_annual_created_project.php
index 401fb98b05..83675f80eb 100755
--- a/module/metric/calc/system/scale/count_of_annual_created_project.php
+++ b/module/metric/calc/system/scale/count_of_annual_created_project.php
@@ -28,10 +28,8 @@ class count_of_annual_created_project extends baseCalc
public function calculate($row)
{
- if(empty($row->openedDate)) return false;
-
- $year = substr($row->openedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($row->openedDate);
+ if(!$year) return false;
if(!isset($this->result[$year])) $this->result[$year] = 0;
diff --git a/module/metric/calc/system/scale/count_of_annual_created_release.php b/module/metric/calc/system/scale/count_of_annual_created_release.php
index a052e1a1b3..dd004de029 100755
--- a/module/metric/calc/system/scale/count_of_annual_created_release.php
+++ b/module/metric/calc/system/scale/count_of_annual_created_release.php
@@ -28,13 +28,9 @@ class count_of_annual_created_release extends baseCalc
public function calculate($data)
{
- if(empty($data->date)) return false;
-
$date = $data->date;
-
- $year = substr($date, 0, 4);
-
- if($year == '0000') return false;
+ $year = $this->getYear($date);
+ if(!$year) return false;
if(!isset($this->result[$year])) $this->result[$year] = 0;
diff --git a/module/metric/calc/system/scale/count_of_annual_created_story.php b/module/metric/calc/system/scale/count_of_annual_created_story.php
index 3bdf646889..ba589cfae0 100755
--- a/module/metric/calc/system/scale/count_of_annual_created_story.php
+++ b/module/metric/calc/system/scale/count_of_annual_created_story.php
@@ -30,10 +30,8 @@ class count_of_annual_created_story extends baseCalc
{
$openedDate = $data->openedDate;
- if(empty($openedDate)) return false;
-
- $year = substr($openedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($openedDate);
+ if(!$year) return false;
if(!isset($this->result[$year])) $this->result[$year] = 0;
diff --git a/module/metric/calc/system/scale/count_of_annual_created_task.php b/module/metric/calc/system/scale/count_of_annual_created_task.php
index 5a2e04874e..b8f0d21810 100755
--- a/module/metric/calc/system/scale/count_of_annual_created_task.php
+++ b/module/metric/calc/system/scale/count_of_annual_created_task.php
@@ -30,10 +30,8 @@ class count_of_annual_created_task extends baseCalc
{
$openedDate = $data->openedDate;
- if(empty($openedDate)) return false;
-
- $year = substr($openedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($openedDate);
+ if(!$year) return false;
if(!isset($this->result[$year])) $this->result[$year] = 0;
diff --git a/module/metric/calc/system/scale/count_of_annual_created_top_program.php b/module/metric/calc/system/scale/count_of_annual_created_top_program.php
index b5ae5a8991..0628751f0d 100755
--- a/module/metric/calc/system/scale/count_of_annual_created_top_program.php
+++ b/module/metric/calc/system/scale/count_of_annual_created_top_program.php
@@ -28,10 +28,8 @@ class count_of_annual_created_top_program extends baseCalc
public function calculate($row)
{
- if(empty($row->openedDate)) return false;
-
- $year = substr($row->openedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($row->openedDate);
+ if(!$year) return false;
if(!isset($this->result[$year])) $this->result[$year] = 0;
$this->result[$year] += 1;
diff --git a/module/metric/calc/system/scale/count_of_annual_created_user.php b/module/metric/calc/system/scale/count_of_annual_created_user.php
index 85b39a6ba3..a661db13dd 100755
--- a/module/metric/calc/system/scale/count_of_annual_created_user.php
+++ b/module/metric/calc/system/scale/count_of_annual_created_user.php
@@ -29,10 +29,9 @@ class count_of_annual_created_user extends baseCalc
public function calculate($row)
{
$join = $row->join;
- if(empty($join)) return false;
- $year = substr($join, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($join);
+ if(!$year) return false;
if(!isset($this->result[$year])) $this->result[$year] = 0;
$this->result[$year] += 1;
diff --git a/module/metric/calc/system/scale/count_of_annual_delivered_story.php b/module/metric/calc/system/scale/count_of_annual_delivered_story.php
index cb507b17a6..01ce04ea3d 100755
--- a/module/metric/calc/system/scale/count_of_annual_delivered_story.php
+++ b/module/metric/calc/system/scale/count_of_annual_delivered_story.php
@@ -39,8 +39,8 @@ class count_of_annual_delivered_story extends baseCalc
if($date === null) return false;
- $year = substr($date, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($date);
+ if(!$year) return false;
if(!isset($this->result[$year])) $this->result[$year] = 0;
diff --git a/module/metric/calc/system/scale/count_of_annual_finished_execution.php b/module/metric/calc/system/scale/count_of_annual_finished_execution.php
index d4fe8b503f..d21db196ca 100644
--- a/module/metric/calc/system/scale/count_of_annual_finished_execution.php
+++ b/module/metric/calc/system/scale/count_of_annual_finished_execution.php
@@ -28,11 +28,8 @@ class count_of_annual_finished_execution extends baseCalc
public function calculate($row)
{
- $realEnd = $row->realEnd;
- if(empty($realEnd)) return false;
-
- $year = substr($realEnd, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($row->realEnd);
+ if(!$year) return false;
if(!isset($this->result[$year])) $this->result[$year] = 0;
$this->result[$year] += 1;
diff --git a/module/metric/calc/system/scale/count_of_annual_finished_productplan.php b/module/metric/calc/system/scale/count_of_annual_finished_productplan.php
index 75c0439b6f..3689b79280 100755
--- a/module/metric/calc/system/scale/count_of_annual_finished_productplan.php
+++ b/module/metric/calc/system/scale/count_of_annual_finished_productplan.php
@@ -29,10 +29,8 @@ class count_of_annual_finished_productplan extends baseCalc
public function calculate($data)
{
$finishedDate = $data->finishedDate;
- if(empty($finishedDate)) return false;
-
- $year = substr($finishedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($finishedDate);
+ if(!$year) return false;
if(!isset($this->result[$year])) $this->result[$year] = 0;
diff --git a/module/metric/calc/system/scale/count_of_annual_finished_project.php b/module/metric/calc/system/scale/count_of_annual_finished_project.php
index ab7b108fdf..4978ff6fd6 100755
--- a/module/metric/calc/system/scale/count_of_annual_finished_project.php
+++ b/module/metric/calc/system/scale/count_of_annual_finished_project.php
@@ -28,12 +28,10 @@ class count_of_annual_finished_project extends baseCalc
public function calculate($row)
{
- if(empty($row->realEnd)) return false;
+ $year = $this->getYear($row->realEnd);
+ if(!$year) return false;
- if(empty($row->realEnd)) return false;
- $year = substr($row->realEnd, 0, 4);
-
- if($year == '0000' || $row->status != 'closed') return false;
+ if($row->status != 'closed') return false;
if(!isset($this->result[$year])) $this->result[$year] = 0;
diff --git a/module/metric/calc/system/scale/count_of_annual_finished_story.php b/module/metric/calc/system/scale/count_of_annual_finished_story.php
index 3a7d9f97d4..037bbec5bb 100755
--- a/module/metric/calc/system/scale/count_of_annual_finished_story.php
+++ b/module/metric/calc/system/scale/count_of_annual_finished_story.php
@@ -31,11 +31,10 @@ class count_of_annual_finished_story extends baseCalc
$closedDate = $data->closedDate;
$closedReason = $data->closedReason;
- if(empty($closedDate)) return false;
+ $year = $this->getYear($closedDate);
+ if(!$year) return false;
- $year = substr($closedDate, 0, 4);
-
- if($year == '0000' || $closedReason != 'done') return false;
+ if($closedReason != 'done') return false;
if(!isset($this->result[$year])) $this->result[$year] = 0;
diff --git a/module/metric/calc/system/scale/count_of_annual_finished_task.php b/module/metric/calc/system/scale/count_of_annual_finished_task.php
index 65ab80f95a..38132ceafe 100755
--- a/module/metric/calc/system/scale/count_of_annual_finished_task.php
+++ b/module/metric/calc/system/scale/count_of_annual_finished_task.php
@@ -28,13 +28,10 @@ class count_of_annual_finished_task extends baseCalc
public function calculate($data)
{
- if(empty($data->finishedDate) or $data->status != 'done') return false;
+ $year = $this->getYear($data->finishedDate);
+ if(!$year) return false;
- $finishedDate = $data->finishedDate;
-
- if(empty($finishedDate)) return false;
- $year = substr($finishedDate, 0, 4);
- if($year == '0000') return false;
+ if($data->status != 'done') return false;
if(!isset($this->result[$year])) $this->result[$year] = 0;
diff --git a/module/metric/calc/system/scale/count_of_annual_fixed_bug.php b/module/metric/calc/system/scale/count_of_annual_fixed_bug.php
index 1ad26b09fd..58e2307021 100755
--- a/module/metric/calc/system/scale/count_of_annual_fixed_bug.php
+++ b/module/metric/calc/system/scale/count_of_annual_fixed_bug.php
@@ -28,11 +28,8 @@ class count_of_annual_fixed_bug extends baseCalc
public function calculate($row)
{
- $closedDate = $row->closedDate;
- if(empty($closedDate)) return false;
-
- $year = substr($closedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($row->closedDate);
+ if(!$year) return false;
if(!isset($this->result[$year])) $this->result[$year] = 0;
if($row->status == 'closed' and $row->resolution == 'fixed') $this->result[$year] += 1;
diff --git a/module/metric/calc/system/scale/count_of_daily_closed_bug.php b/module/metric/calc/system/scale/count_of_daily_closed_bug.php
index 94e4845465..b080e42427 100755
--- a/module/metric/calc/system/scale/count_of_daily_closed_bug.php
+++ b/module/metric/calc/system/scale/count_of_daily_closed_bug.php
@@ -29,10 +29,9 @@ class count_of_daily_closed_bug extends baseCalc
public function calculate($row)
{
$closedDate = $row->closedDate;
- if(empty($closedDate)) return false;
+ $year = $this->getYear($closedDate);
+ if(!$year) return false;
- $year = substr($closedDate, 0, 4);
- if($year == '0000') return false;
$month = substr($closedDate, 5, 2);
$day = substr($closedDate, 8, 2);
diff --git a/module/metric/calc/system/scale/count_of_daily_created_story.php b/module/metric/calc/system/scale/count_of_daily_created_story.php
index 5d69d9b323..adb7ccfd71 100755
--- a/module/metric/calc/system/scale/count_of_daily_created_story.php
+++ b/module/metric/calc/system/scale/count_of_daily_created_story.php
@@ -30,10 +30,8 @@ class count_of_daily_created_story extends baseCalc
{
$openedDate = $row->openedDate;
- if(empty($openedDate)) return false;
-
- $year = substr($openedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($openedDate);
+ if(!$year) return false;
list($year, $month, $day) = explode('-', $openedDate);
diff --git a/module/metric/calc/system/scale/count_of_daily_finished_task.php b/module/metric/calc/system/scale/count_of_daily_finished_task.php
index 59cd369625..b2888badb2 100755
--- a/module/metric/calc/system/scale/count_of_daily_finished_task.php
+++ b/module/metric/calc/system/scale/count_of_daily_finished_task.php
@@ -29,10 +29,10 @@ class count_of_daily_finished_task extends baseCalc
public function calculate($row)
{
$finishedDate = $row->finishedDate;
- if(empty($finishedDate)) return false;
- $year = substr($finishedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($finishedDate);
+ if(!$year) return false;
+
$month = substr($finishedDate, 5, 2);
$day = substr($finishedDate, 8, 2);
diff --git a/module/metric/calc/system/scale/count_of_daily_run_case.php b/module/metric/calc/system/scale/count_of_daily_run_case.php
index 6662b362c8..4efca05f6b 100755
--- a/module/metric/calc/system/scale/count_of_daily_run_case.php
+++ b/module/metric/calc/system/scale/count_of_daily_run_case.php
@@ -29,10 +29,9 @@ class count_of_daily_run_case extends baseCalc
public function calculate($row)
{
$date = $row->date;
- if(empty($date)) return false;
- $year = substr($date, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($date);
+ if(!$year) return false;
$month = substr($date, 5, 2);
$day = substr($date, 8, 2);
diff --git a/module/metric/calc/system/scale/count_of_delayed_finished_execution_which_annual_finished.php b/module/metric/calc/system/scale/count_of_delayed_finished_execution_which_annual_finished.php
index 1da389e196..f528149419 100755
--- a/module/metric/calc/system/scale/count_of_delayed_finished_execution_which_annual_finished.php
+++ b/module/metric/calc/system/scale/count_of_delayed_finished_execution_which_annual_finished.php
@@ -28,10 +28,10 @@ class count_of_delayed_finished_execution_which_annual_finished extends baseCalc
public function calculate($row)
{
- if(empty($row->closedDate) || empty($row->firstEnd)) return false;
+ if(empty($row->firstEnd)) return false;
- $year = substr($row->closedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($row->closedDate);
+ if(!$year) return false;
if($row->status == 'closed' and $row->closedDate > $row->firstEnd)
{
diff --git a/module/metric/calc/system/scale/count_of_delayed_finished_project_which_annual_finished.php b/module/metric/calc/system/scale/count_of_delayed_finished_project_which_annual_finished.php
index 6e26c8c542..be743c3284 100755
--- a/module/metric/calc/system/scale/count_of_delayed_finished_project_which_annual_finished.php
+++ b/module/metric/calc/system/scale/count_of_delayed_finished_project_which_annual_finished.php
@@ -30,9 +30,11 @@ class count_of_delayed_finished_project_which_annual_finished extends baseCalc
{
if(empty($row->closedDate) || empty($row->firstEnd) || empty($row->realEnd)) return false;
- $finishedYear = substr($row->realEnd, 0, 4);
- $firstEndYear = substr($row->firstEnd, 0, 4);
- if($finishedYear == '0000' || $firstEndYear == '0000') return false;
+ $finishedYear = $this->getYear($row->realEnd);
+ if(!$finishedYear) return false;
+
+ $firstEndYear = $this->getYear($row->firstEnd);
+ if(!$firstEndYear) return false;
if($row->status == 'closed' && $row->realEnd > $row->firstEnd)
{
diff --git a/module/metric/calc/system/scale/count_of_monthly_closed_execution.php b/module/metric/calc/system/scale/count_of_monthly_closed_execution.php
index 31f169ffe5..6726c6c58e 100755
--- a/module/metric/calc/system/scale/count_of_monthly_closed_execution.php
+++ b/module/metric/calc/system/scale/count_of_monthly_closed_execution.php
@@ -29,10 +29,9 @@ class count_of_monthly_closed_execution extends baseCalc
public function calculate($row)
{
$closedDate = $row->closedDate;
- if(empty($closedDate)) return false;
+ $year = $this->getYear($closedDate);
+ if(!$year) return false;
- $year = substr($closedDate, 0, 4);
- if($year == '0000') return false;
$month = substr($closedDate, 5, 2);
if(!isset($this->result[$year])) $this->result[$year] = array();
diff --git a/module/metric/calc/system/scale/count_of_monthly_closed_project.php b/module/metric/calc/system/scale/count_of_monthly_closed_project.php
index 17276f9d8f..1ea23491ec 100755
--- a/module/metric/calc/system/scale/count_of_monthly_closed_project.php
+++ b/module/metric/calc/system/scale/count_of_monthly_closed_project.php
@@ -28,13 +28,12 @@ class count_of_monthly_closed_project extends baseCalc
public function calculate($row)
{
- if(empty($row->closedDate) || $row->status != 'closed') return false;
+ if($row->status != 'closed') return false;
- $year = substr($row->closedDate, 0, 4);
+ $year = $this->getYear($row->closedDate);
+ if(!$year) return false;
$month = substr($row->closedDate, 5, 2);
- if($year == '0000') return false;
-
if(!isset($this->result[$year])) $this->result[$year] = array();
if(!isset($this->result[$year][$month])) $this->result[$year][$month] = 0;
diff --git a/module/metric/calc/system/scale/count_of_monthly_created_bug.php b/module/metric/calc/system/scale/count_of_monthly_created_bug.php
index 1eaf0e5a1d..d77f93e5b1 100755
--- a/module/metric/calc/system/scale/count_of_monthly_created_bug.php
+++ b/module/metric/calc/system/scale/count_of_monthly_created_bug.php
@@ -29,10 +29,9 @@ class count_of_monthly_created_bug extends baseCalc
public function calculate($row)
{
$openedDate = $row->openedDate;
- if(empty($openedDate)) return false;
+ $year = $this->getYear($openedDate);
+ if(!$year) return false;
- $year = substr($openedDate, 0, 4);
- if($year == '0000') return false;
$month = substr($openedDate, 5, 2);
if(!isset($this->result[$year])) $this->result[$year] = array();
diff --git a/module/metric/calc/system/scale/count_of_monthly_created_execution.php b/module/metric/calc/system/scale/count_of_monthly_created_execution.php
index d241e62fa0..8eb05dc70b 100755
--- a/module/metric/calc/system/scale/count_of_monthly_created_execution.php
+++ b/module/metric/calc/system/scale/count_of_monthly_created_execution.php
@@ -29,10 +29,9 @@ class count_of_monthly_created_execution extends baseCalc
public function calculate($row)
{
$openedDate = $row->openedDate;
- if(empty($openedDate)) return false;
- $year = substr($openedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($openedDate);
+ if(!$year) return false;
$month = substr($openedDate, 5, 2);
if(!isset($this->result[$year])) $this->result[$year] = array();
diff --git a/module/metric/calc/system/scale/count_of_monthly_created_project.php b/module/metric/calc/system/scale/count_of_monthly_created_project.php
index f70c196793..56176ca370 100755
--- a/module/metric/calc/system/scale/count_of_monthly_created_project.php
+++ b/module/metric/calc/system/scale/count_of_monthly_created_project.php
@@ -28,13 +28,11 @@ class count_of_monthly_created_project extends baseCalc
public function calculate($row)
{
- if(empty($row->openedDate)) return false;
+ $year = $this->getYear($row->openedDate);
+ if(!$year) return false;
- $year = substr($row->openedDate, 0, 4);
$month = substr($row->openedDate, 5, 2);
- if($year == '0000') return false;
-
if(!isset($this->result[$year])) $this->result[$year] = array();
if(!isset($this->result[$year][$month])) $this->result[$year][$month] = 0;
diff --git a/module/metric/calc/system/scale/count_of_monthly_created_release.php b/module/metric/calc/system/scale/count_of_monthly_created_release.php
index 0fa9d5c87b..953f970198 100755
--- a/module/metric/calc/system/scale/count_of_monthly_created_release.php
+++ b/module/metric/calc/system/scale/count_of_monthly_created_release.php
@@ -28,15 +28,12 @@ class count_of_monthly_created_release extends baseCalc
public function calculate($data)
{
- if(empty($data->date)) return false;
-
$date = $data->date;
+ $year = $this->getYear($date);
+ if(!$year) return false;
- $year = substr($date, 0, 4);
$month = substr($date, 5, 2);
- if($year == '0000') return false;
-
if(!isset($this->result[$year])) $this->result[$year] = array();
if(!isset($this->result[$year][$month])) $this->result[$year][$month] = 0;
diff --git a/module/metric/calc/system/scale/count_of_monthly_created_story.php b/module/metric/calc/system/scale/count_of_monthly_created_story.php
index 71d47db042..6b6aa50531 100755
--- a/module/metric/calc/system/scale/count_of_monthly_created_story.php
+++ b/module/metric/calc/system/scale/count_of_monthly_created_story.php
@@ -30,13 +30,10 @@ class count_of_monthly_created_story extends baseCalc
{
$openedDate = $data->openedDate;
- if(empty($openedDate)) return false;
-
- $year = substr($openedDate, 0, 4);
+ $year = $this->getYear($openedDate);
+ if(!$year) return false;
$month = substr($openedDate, 5, 2);
- if($year == '0000') return false;
-
if(!isset($this->result[$year])) $this->result[$year] = array();
if(!isset($this->result[$year][$month])) $this->result[$year][$month] = 0;
diff --git a/module/metric/calc/system/scale/count_of_monthly_created_task.php b/module/metric/calc/system/scale/count_of_monthly_created_task.php
index 01917c955d..00f35924ad 100755
--- a/module/metric/calc/system/scale/count_of_monthly_created_task.php
+++ b/module/metric/calc/system/scale/count_of_monthly_created_task.php
@@ -29,10 +29,9 @@ class count_of_monthly_created_task extends baseCalc
public function calculate($row)
{
$openedDate = $row->openedDate;
- if(empty($openedDate)) return false;
+ $year = $this->getYear($openedDate);
+ if(!$year) return false;
- $year = substr($openedDate, 0, 4);
- if($year == '0000') return false;
$month = substr($openedDate, 5, 2);
if(!isset($this->result[$year])) $this->result[$year] = array();
diff --git a/module/metric/calc/system/scale/count_of_monthly_finished_story.php b/module/metric/calc/system/scale/count_of_monthly_finished_story.php
index fc32f68f51..bc17fe13cd 100755
--- a/module/metric/calc/system/scale/count_of_monthly_finished_story.php
+++ b/module/metric/calc/system/scale/count_of_monthly_finished_story.php
@@ -31,12 +31,12 @@ class count_of_monthly_finished_story extends baseCalc
$closedDate = $data->closedDate;
$closedReason = $data->closedReason;
- if(empty($closedDate)) return false;
+ $year = $this->getYear($closedDate);
+ if(!$year) return false;
- $year = substr($closedDate, 0, 4);
$month = substr($closedDate, 5, 2);
- if($year == '0000' || $closedReason != 'done') return false;
+ if($closedReason != 'done') return false;
if(!isset($this->result[$year])) $this->result[$year] = array();
if(!isset($this->result[$year][$month])) $this->result[$year][$month] = 0;
diff --git a/module/metric/calc/system/scale/count_of_monthly_finished_task.php b/module/metric/calc/system/scale/count_of_monthly_finished_task.php
index 882f31a304..05a3f36ccd 100755
--- a/module/metric/calc/system/scale/count_of_monthly_finished_task.php
+++ b/module/metric/calc/system/scale/count_of_monthly_finished_task.php
@@ -29,10 +29,10 @@ class count_of_monthly_finished_task extends baseCalc
public function calculate($row)
{
$closedDate = $row->closedDate;
- if(empty($closedDate)) return false;
- $year = substr($closedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($closedDate);
+ if(!$year) return false;
+
$month = substr($closedDate, 5, 2);
if(!isset($this->result[$year])) $this->result[$year] = array();
diff --git a/module/metric/calc/system/scale/count_of_monthly_fixed_bug.php b/module/metric/calc/system/scale/count_of_monthly_fixed_bug.php
index e65557dace..1811c60c6b 100755
--- a/module/metric/calc/system/scale/count_of_monthly_fixed_bug.php
+++ b/module/metric/calc/system/scale/count_of_monthly_fixed_bug.php
@@ -29,10 +29,9 @@ class count_of_monthly_fixed_bug extends baseCalc
public function calculate($row)
{
$closedDate = $row->closedDate;
- if(empty($closedDate)) return false;
+ $year = $this->getYear($closedDate);
+ if(!$year) return false;
- $year = substr($closedDate, 0, 4);
- if($year == '0000') return false;
$month = substr($closedDate, 5, 2);
if(!isset($this->result[$year])) $this->result[$year] = array();
diff --git a/module/metric/calc/system/scale/count_of_undelayed_finished_execution_which_annual_finished.php b/module/metric/calc/system/scale/count_of_undelayed_finished_execution_which_annual_finished.php
index 43aff76444..2979bce1ec 100755
--- a/module/metric/calc/system/scale/count_of_undelayed_finished_execution_which_annual_finished.php
+++ b/module/metric/calc/system/scale/count_of_undelayed_finished_execution_which_annual_finished.php
@@ -30,8 +30,8 @@ class count_of_undelayed_finished_execution_which_annual_finished extends baseCa
{
if(empty($row->closedDate) || empty($row->firstEnd)) return false;
- $year = substr($row->closedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($row->closedDate);
+ if(!$year) return false;
if($row->status == 'closed' && $row->closedDate <= $row->firstEnd)
{
diff --git a/module/metric/calc/system/scale/count_of_undelayed_finished_project_which_annual_finished.php b/module/metric/calc/system/scale/count_of_undelayed_finished_project_which_annual_finished.php
index 5d16077421..8d7d9e2883 100755
--- a/module/metric/calc/system/scale/count_of_undelayed_finished_project_which_annual_finished.php
+++ b/module/metric/calc/system/scale/count_of_undelayed_finished_project_which_annual_finished.php
@@ -30,9 +30,11 @@ class count_of_undelayed_finished_project_which_annual_finished extends baseCalc
{
if(empty($row->closedDate) || empty($row->firstEnd) || empty($row->realEnd)) return false;
- $finishedYear = substr($row->realEnd, 0, 4);
- $firstEndYear = substr($row->firstEnd, 0, 4);
- if($finishedYear == '0000' || $firstEndYear == '0000') return false;
+ $finishedYear = $this->getYear($row->realEnd);
+ if(!$finishedYear) return false;
+
+ $firstEndYear = $this->getYear($row->firstEnd);
+ if(!$firstEndYear) return false;
if($row->status == 'closed' && $row->realEnd <= $row->firstEnd)
{
diff --git a/module/metric/calc/system/scale/count_of_undelayed_finished_project_which_annual_started.php b/module/metric/calc/system/scale/count_of_undelayed_finished_project_which_annual_started.php
index 9f5bf8de9f..b60293300b 100755
--- a/module/metric/calc/system/scale/count_of_undelayed_finished_project_which_annual_started.php
+++ b/module/metric/calc/system/scale/count_of_undelayed_finished_project_which_annual_started.php
@@ -30,8 +30,8 @@ class count_of_undelayed_finished_project_which_annual_started extends baseCalc
{
if(empty($row->realBegan) or empty($row->realEnd) or empty($row->firstEnd)) return false;
- $beginYear = substr($row->realBegan, 0, 4);
- if($beginYear == '0000') return false;
+ $beginYear = $this->getYear($row->realBegan);
+ if(!$beginYear) return false;
if(!isset($this->result[$beginYear])) $this->result[$beginYear] = 0;
diff --git a/module/metric/calc/system/scale/scale_of_annual_closed_story.php b/module/metric/calc/system/scale/scale_of_annual_closed_story.php
index b2dceab878..76e9a132f7 100755
--- a/module/metric/calc/system/scale/scale_of_annual_closed_story.php
+++ b/module/metric/calc/system/scale/scale_of_annual_closed_story.php
@@ -34,7 +34,7 @@ class scale_of_annual_closed_story extends baseCalc
if(empty($row->closedDate) or !isset($row->estimate)) return false;
$year = $this->getYear($row->closedDate);
- if($year == '0000') return false;
+ if(!$year) return false;
if($row->status == 'closed')
{
diff --git a/module/metric/calc/system/scale/scale_of_annual_finished_story.php b/module/metric/calc/system/scale/scale_of_annual_finished_story.php
index 9146b424b2..3aabf6d10e 100755
--- a/module/metric/calc/system/scale/scale_of_annual_finished_story.php
+++ b/module/metric/calc/system/scale/scale_of_annual_finished_story.php
@@ -33,8 +33,8 @@ class scale_of_annual_finished_story extends baseCalc
if(empty($row->closedDate) or !isset($row->estimate)) return false;
- $year = substr($row->closedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($row->closedDate);
+ if(!$year) return false;
if($row->status == 'closed' and $row->closedReason == 'done')
{
diff --git a/module/metric/calc/system/scale/scale_of_monthly_closed_story.php b/module/metric/calc/system/scale/scale_of_monthly_closed_story.php
index 6539a3600b..25b8f02694 100755
--- a/module/metric/calc/system/scale/scale_of_monthly_closed_story.php
+++ b/module/metric/calc/system/scale/scale_of_monthly_closed_story.php
@@ -33,11 +33,10 @@ class scale_of_monthly_closed_story extends baseCalc
if(empty($row->closedDate) || $row->status != 'closed') return false;
- $year = substr($row->closedDate, 0, 4);
+ $year = $this->getYear($row->closedDate);
+ if(!$year) return false;
$month = substr($row->closedDate, 5, 2);
- if($year == '0000') return false;
-
if(!isset($this->result[$year])) $this->result[$year] = array();
if(!isset($this->result[$year][$month])) $this->result[$year][$month] = 0;
diff --git a/module/metric/calc/system/scale/scale_of_monthly_delivered_story.php b/module/metric/calc/system/scale/scale_of_monthly_delivered_story.php
index 569ca1ea9e..3ec383d447 100755
--- a/module/metric/calc/system/scale/scale_of_monthly_delivered_story.php
+++ b/module/metric/calc/system/scale/scale_of_monthly_delivered_story.php
@@ -37,9 +37,9 @@ class scale_of_monthly_delivered_story extends baseCalc
if($date === null) return false;
- $year = substr($date, 0, 4);
+ $year = $this->getYear($date);
+ if(!$year) return false;
$month = substr($date, 5, 2);
- if($year == '0000') return false;
if(!isset($this->result[$year])) $this->result[$year] = array();
if(!isset($this->result[$year][$month])) $this->result[$year][$month] = 0;
diff --git a/module/metric/calc/system/scale/scale_of_monthly_finished_story.php b/module/metric/calc/system/scale/scale_of_monthly_finished_story.php
index 687ab81b5b..93f8c1ac9f 100755
--- a/module/metric/calc/system/scale/scale_of_monthly_finished_story.php
+++ b/module/metric/calc/system/scale/scale_of_monthly_finished_story.php
@@ -33,11 +33,10 @@ class scale_of_monthly_finished_story extends baseCalc
if(empty($row->closedDate) || $row->closedReason != 'done') return false;
- $year = substr($row->closedDate, 0, 4);
+ $year = $this->getYear($row->closedDate);
+ if(!$year) return false;
$month = substr($row->closedDate, 5, 2);
- if($year == '0000') return false;
-
if(!isset($this->result[$year])) $this->result[$year] = array();
if(!isset($this->result[$year][$month])) $this->result[$year][$month] = 0;
diff --git a/module/metric/calc/user/scale/count_of_daily_finished_task_in_user.php b/module/metric/calc/user/scale/count_of_daily_finished_task_in_user.php
index b8fa9f016a..bab7625fab 100755
--- a/module/metric/calc/user/scale/count_of_daily_finished_task_in_user.php
+++ b/module/metric/calc/user/scale/count_of_daily_finished_task_in_user.php
@@ -50,8 +50,8 @@ class count_of_daily_finished_task_in_user extends baseCalc
if(empty($finishedDate) || empty($finishedBy)) return false;
if($projectStatus == 'suspended' || $executionStatus == 'suspended') return false;
- $year = substr($finishedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($finishedDate);
+ if(!$year) return false;
$date = date("Y-m-d", strtotime($finishedDate));
list($year, $month, $day) = explode('-', $date);
diff --git a/module/metric/calc/user/scale/count_of_daily_fixed_bug_in_user.php b/module/metric/calc/user/scale/count_of_daily_fixed_bug_in_user.php
index ebbe13903f..b1fc84dfad 100755
--- a/module/metric/calc/user/scale/count_of_daily_fixed_bug_in_user.php
+++ b/module/metric/calc/user/scale/count_of_daily_fixed_bug_in_user.php
@@ -45,8 +45,8 @@ class count_of_daily_fixed_bug_in_user extends baseCalc
if(empty($resolvedDate) || empty($resolvedBy)) return false;
- $year = substr($resolvedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($resolvedDate);
+ if(!$year) return false;
$month = substr($resolvedDate, 5, 2);
$day = substr($resolvedDate, 8, 2);
diff --git a/module/metric/calc/user/scale/count_of_daily_review_feedback_in_user.php b/module/metric/calc/user/scale/count_of_daily_review_feedback_in_user.php
index fd7f443d30..9135af7be6 100755
--- a/module/metric/calc/user/scale/count_of_daily_review_feedback_in_user.php
+++ b/module/metric/calc/user/scale/count_of_daily_review_feedback_in_user.php
@@ -36,8 +36,8 @@ class count_of_daily_review_feedback_in_user extends baseCalc
/* input ,admin output admin */
$reviewedBy = current(array_filter(explode(',', $reviewedBy)));
- $year = substr($reviewedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($reviewedDate);
+ if(!$year) return false;
$date = date("Y-m-d", strtotime($reviewedDate));
list($year, $month, $day) = explode('-', $date);
diff --git a/module/metric/calc/user/scale/count_of_daily_review_story_in_user.php b/module/metric/calc/user/scale/count_of_daily_review_story_in_user.php
index 09a177cf34..9ea703666d 100755
--- a/module/metric/calc/user/scale/count_of_daily_review_story_in_user.php
+++ b/module/metric/calc/user/scale/count_of_daily_review_story_in_user.php
@@ -36,8 +36,8 @@ class count_of_daily_review_story_in_user extends baseCalc
/* input ,admin output admin */
$reviewedBy = current(array_filter(explode(',', $reviewedBy)));
- $year = substr($reviewedDate, 0, 4);
- if($year == '0000') return false;
+ $year = $this->getYear($reviewedDate);
+ if(!$year) return false;
$date = date("Y-m-d", strtotime($reviewedDate));
list($year, $month, $day) = explode('-', $date);
diff --git a/module/metric/calc/user/scale/count_of_dealyed_task_in_user.php b/module/metric/calc/user/scale/count_of_dealyed_task_in_user.php
index 2ca3bad453..5523818cbe 100755
--- a/module/metric/calc/user/scale/count_of_dealyed_task_in_user.php
+++ b/module/metric/calc/user/scale/count_of_dealyed_task_in_user.php
@@ -34,7 +34,9 @@ class count_of_dealyed_task_in_user extends baseCalc
$deadline = $row->deadline;
$assignedTo = $row->assignedTo;
- if(empty($deadline) || substr($deadline, 0 ,4) == '0000') return false;
+ $year = $this->getYear($deadline);
+ if(!$year) return false;
+
if(strtotime($nowDate) <= strtotime($deadline)) return false;
if(!isset($this->result[$assignedTo])) $this->result[$assignedTo] = 0;
diff --git a/module/metric/calc/user/scale/count_of_delayed_task_in_user.php b/module/metric/calc/user/scale/count_of_delayed_task_in_user.php
index 54762cecbe..4d281385d3 100755
--- a/module/metric/calc/user/scale/count_of_delayed_task_in_user.php
+++ b/module/metric/calc/user/scale/count_of_delayed_task_in_user.php
@@ -34,7 +34,9 @@ class count_of_delayed_task_in_user extends baseCalc
$deadline = $row->deadline;
$assignedTo = $row->assignedTo;
- if(empty($deadline) || substr($deadline, 0 ,4) == '0000') return false;
+ $year = $this->getYear($deadline);
+ if(!$year) return false;
+
if(strtotime($nowDate) <= strtotime($deadline)) return false;
if(!isset($this->result[$assignedTo])) $this->result[$assignedTo] = 0;
diff --git a/module/metric/control.php b/module/metric/control.php
index 8050748e51..315711dbb5 100755
--- a/module/metric/control.php
+++ b/module/metric/control.php
@@ -73,6 +73,9 @@ class metric extends control
$result = $this->metric->getResultByCode($current->code, array(), 'cron', $pager);
$allResult = $this->metric->getResultByCode($current->code, array(), 'cron');
+ $result = $this->completeMissingRecords($result, $current);
+ $allResult = $this->completeMissingRecords($allResult, $current);
+
$resultHeader = $this->metric->getViewTableHeader($current);
$resultData = $this->metric->getViewTableData($current, $result);
$allResultData = $this->metric->getViewTableData($current, $allResult);
diff --git a/module/metric/dataset.php b/module/metric/dataset.php
index 44ea1e5533..197bb9c120 100644
--- a/module/metric/dataset.php
+++ b/module/metric/dataset.php
@@ -146,7 +146,7 @@ class dataset
$dbType = $this->config->metricDB->type;
$stmt = $this->dao->select($fieldList)
->from(TABLE_RELEASE)->alias('t1')
- ->beginIF($dbType == 'mysql')->leftJoin(TABLE_PROJECT)->alias('t2')->on("CONCAT(',', t2.id, ',') LIKE CONCAT('%,', t1.project, ',%')")->fi()
+ ->beginIF($dbType == 'mysql' || $dbType == 'duckdb')->leftJoin(TABLE_PROJECT)->alias('t2')->on("CONCAT(',', t2.id, ',') LIKE CONCAT('%,', t1.project, ',%')")->fi()
->beginIF($dbType == 'sqlite')->leftJoin(TABLE_PROJECT)->alias('t2')->on("(',' || t2.id || ',') LIKE ('%' || t1.project || '%')")->fi()
->leftJoin(TABLE_PRODUCT)->alias('t3')->on('t1.product=t3.id')
->where('t1.deleted')->eq(0)
@@ -561,10 +561,18 @@ class dataset
return $this->defaultWhere($stmt, 't1');
}
- $table = 'tmp_case_getDevStories';
- $this->dao->exec("DROP TABLE IF EXISTS `{$table}`");
- $this->dao->exec("CREATE TABLE `{$table}` AS SELECT `story`, COUNT(`id`) AS `case_count` FROM " . TABLE_CASE . 'GROUP BY `story`');
- $this->dao->exec("CREATE INDEX `story` ON `{$table}` (`story`)");
+ $dbType = $this->config->metricDB->type;
+ if($dbType == 'duckdb')
+ {
+ $table = "(SELECT `story`, COUNT(`id`) AS `case_count` FROM " . TABLE_CASE . " GROUP BY `story`)";
+ }
+ else
+ {
+ $table = 'tmp_case_getDevStories';
+ $this->dao->exec("DROP TABLE IF EXISTS `{$table}`");
+ $this->dao->exec("CREATE TABLE `{$table}` AS SELECT `story`, COUNT(`id`) AS `case_count` FROM " . TABLE_CASE . 'GROUP BY `story`');
+ $this->dao->exec("CREATE INDEX `story` ON `{$table}` (`story`)");
+ }
$stmt = $this->dao->select($fieldList)
->from(TABLE_STORY)->alias('t1')
@@ -1228,10 +1236,18 @@ class dataset
$query = $this->defaultWhere($task, 't1')->groupBy('t1.project')->get();
- $table = 'tmp_task_getProjectTasks';
- $this->dao->exec("DROP TABLE IF EXISTS `{$table}`");
- $this->dao->exec("CREATE TABLE `{$table}` AS {$query}");
- $this->dao->exec("CREATE INDEX `project` ON `{$table}` (`project`)");
+ $dbType = $this->config->metricDB->type;
+ if($dbType == 'duckdb')
+ {
+ $table = "($query)";
+ }
+ else
+ {
+ $table = 'tmp_task_getProjectTasks';
+ $this->dao->exec("DROP TABLE IF EXISTS `{$table}`");
+ $this->dao->exec("CREATE TABLE `{$table}` AS {$query}");
+ $this->dao->exec("CREATE INDEX `project` ON `{$table}` (`project`)");
+ }
$stmt = $this->dao->select("$fieldList, $defaultHours AS defaultHours")
->from(TABLE_PROJECT)->alias('t1')
@@ -1320,31 +1336,27 @@ class dataset
$userTable = $this->config->objectTables['user'];
$projectTable = $this->config->objectTables['project'];
- $auditplanSQL = <<dao->select($fieldList)
+ ->from(TABLE_AUDITPLAN)->alias('t1')
+ ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
+ ->leftJoin(TABLE_USER)->alias('t3')->on('t1.assignedTo = t3.account')
+ ->where('t1.status')->eq('wait')
+ ->andWhere('t2.type')->eq('project')
+ ->andWhere('t1.deleted')->eq('0')
+ ->andWhere('t2.deleted')->eq('0')
+ ->andWhere('t3.deleted')->eq('0')->get();
- $ncSQL = <<dao->select($fieldList)
+ ->from(TABLE_NC)->alias('t1')
+ ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
+ ->leftJoin(TABLE_USER)->alias('t3')->on('t1.assignedTo = t3.account')
+ ->where('t1.status')->eq('active')
+ ->andWhere('t2.type')->eq('project')
+ ->andWhere('t1.deleted')->eq('0')
+ ->andWhere('t2.deleted')->eq('0')
+ ->andWhere('t3.deleted')->eq('0')->get();
- $sql = "$auditplanSQL UNION ALL $ncSQL";
+ $sql = "$auditplan UNION ALL $nc";
$stmt = $this->dao->select('*')->from("($sql) tt")->where('1=1');
$stmt = $this->defaultWhere($stmt, 'tt');
diff --git a/module/metric/model.php b/module/metric/model.php
index 1105cf4468..c02abb9548 100755
--- a/module/metric/model.php
+++ b/module/metric/model.php
@@ -571,7 +571,8 @@ class metricModel extends model
*/
public function getDAO()
{
- if($this->config->metricDB->type == 'sqlite')
+ $dbType = $this->config->metricDB->type;
+ if($dbType === 'sqlite')
{
$dao = clone $this->dao;
$dao->reset();
@@ -921,6 +922,14 @@ class metricModel extends model
public function calculateDefaultMetric($calculator, $vision)
{
$statement = $this->getDataStatement($calculator, 'statement', $vision);
+ $dbType = $this->config->metricDB->type;
+ if($dbType == 'duckdb')
+ {
+ $this->loadModel('bi');
+ $sql = $statement->get();
+ $dbh = $this->app->loadDriver('duckdb');
+ $statement = $dbh->query($sql);
+ }
$rows = $statement->fetchAll();
if(!empty($rows)) foreach($rows as $row) $calculator->calculate($row);
}
@@ -1130,19 +1139,27 @@ class metricModel extends model
*/
public function insertMetricLib($recordWithCode, $calcType = 'cron')
{
- $this->dao->begin();
foreach($recordWithCode as $code => $records)
{
+ $schema = '';
+ $values = array();
foreach($records as $record)
{
if(empty($record)) continue;
$record->calcType = $calcType;
$record->calculatedBy = $calcType == 'inference' ? $this->app->user->account : 'system';
- $this->dao->insert(TABLE_METRICLIB)
+
+ $sql = $this->dao->insert(TABLE_METRICLIB)
->data($record)
- ->exec();
+ ->get();
+
+ $position = strpos($sql, 'VALUES');
+
+ if(empty($schema)) $schema .= substr($sql, 0, $position + 6);
+ $values[] = substr($sql, $position + 6);
}
+
$rows = count($records);
$time = helper::now();
@@ -1151,8 +1168,14 @@ class metricModel extends model
->set('lastCalcTime')->eq($time)
->where('code')->eq($code)
->exec();
+
+ while($rows > 0)
+ {
+ $sql = $schema . implode(',', array_splice($values, 0, 10000));
+ $this->dao->exec($sql);
+ $rows -= 10000;
+ }
}
- $this->dao->commit();
return dao::isError();
}
diff --git a/module/metric/tao.php b/module/metric/tao.php
index abb4ed47dc..006ef78a08 100644
--- a/module/metric/tao.php
+++ b/module/metric/tao.php
@@ -61,7 +61,6 @@ class metricTao extends metricModel
->where('deleted')->eq('0')
->andWhere('scope')->in($scopes)
->andWhere('object')->in(array_keys($this->lang->metric->objectList))
- ->groupBy('scope')
->beginIF($limit > 0)->limit($limit)->fi()
->fetchAll('scope');
@@ -510,7 +509,8 @@ class metricTao extends metricModel
{
$this->dao->delete()->from(TABLE_METRICLIB)
->where('metricCode')->eq($code)
- ->andWhere('deleted')->eq('1')
+ ->andWhere('deleted', true)->eq('1')
+ ->orWhere('value')->eq(0)->markRight(1)
->exec();
}
diff --git a/module/metric/zen.php b/module/metric/zen.php
index b29c828dde..a59e2a831e 100644
--- a/module/metric/zen.php
+++ b/module/metric/zen.php
@@ -178,6 +178,30 @@ class metricZen extends metric
return $scopeList;
}
+ /**
+ * 开始计时。
+ *
+ * @access private
+ * @return float
+ */
+ private function startTime()
+ {
+ return microtime(true);
+ }
+
+ /**
+ * 结束计时。
+ *
+ * @param float $beginTime
+ * @access private
+ * @return string
+ */
+ private function endTime($beginTime)
+ {
+ $time = microtime(true) - $beginTime;
+ return number_format((float)$time, 5, '.', '0');
+ }
+
/**
* 计算度量数据。
* Calculate metric data.
@@ -189,22 +213,31 @@ class metricZen extends metric
protected function calculateMetric($classifiedCalcGroup)
{
set_time_limit(0);
+ $calcBeginTime = $this->startTime();
foreach($classifiedCalcGroup as $calcGroup)
{
try
{
- $beginTime = microtime(true);
+ $beginTime = $this->startTime();
$statement = $this->prepareDataset($calcGroup);
$sql = $statement ? $statement->get() : '';
-
$this->calcMetric($statement, $calcGroup->calcList);
-
$recordWithCode = $this->prepareMetricRecord($calcGroup->calcList);
+ $calcTime = $this->endTime($beginTime);
+
+ $beginTime = $this->startTime();
$this->metric->insertMetricLib($recordWithCode);
- $endTime = microtime(true);
- $executeTime = $endTime - $beginTime;
- $codes = implode(',', array_keys($calcGroup->calcList));
- $this->metric->saveLogs("Calculate consumed time: {$executeTime} seconds, the sql: $sql, the codes: $codes");
+ $executeTime = $this->endTime($beginTime);
+
+ $total = 0;
+ $codes = '';
+ foreach($recordWithCode as $code => $records)
+ {
+ $count = count($records);
+ $codes .= "$code($count), ";
+ $total += $count;
+ }
+ $this->metric->saveLogs("Calculate consumed time(seconds): calc: $calcTime, insert: $executeTime, total: $total, sql: $sql, $codes");
}
catch(Exception $e)
{
@@ -216,13 +249,21 @@ class metricZen extends metric
}
}
- $beginTime = microtime(true);
+ $executeTime = $this->endTime($calcBeginTime);
+ $this->metric->saveLogs("Calculate all consumed time: {$executeTime} seconds");
+
+ $beginTime = $this->startTime();
$metrics = $this->metric->getExecutableMetric();
- foreach($metrics as $code) $this->metric->deduplication($code);
+ foreach($metrics as $code)
+ {
+ $deduplicationBeginTime = $this->startTime();
+ $this->metric->deduplication($code);
+ $executeTime = $this->endTime($deduplicationBeginTime);
+ $this->metric->saveLogs("Deduplication consumed time: {$executeTime} seconds, the code: $code");
+ }
$this->metric->rebuildPrimaryKey();
- $endTime = microtime(true);
- $executeTime = $endTime - $beginTime;
- $this->metric->saveLogs("Deduplicate consumed time: {$executeTime} seconds");
+ $executeTime = $this->endTime($beginTime);
+ $this->metric->saveLogs("Deduplicate all consumed time: {$executeTime} seconds");
}
/**
@@ -245,37 +286,25 @@ class metricZen extends metric
$records = array();
foreach($calcList as $code => $calc)
{
- $metric = $this->metric->getByCode($code);
- $dateType = $this->metric->getDateTypeByCode($code);
- $recordCommon = $this->buildRecordCommonFields($metric->id, $code, $now, $dateValues->$dateType);
- $initRecords = !$calc->initRecord ? array() : $this->initMetricRecords($recordCommon, $metric->scope);
-
+ $metric = $this->metric->getByCode($code);
if($calc->reuse) $this->prepareReuseMetricResult($calc, $options);
$results = $calc->getResult($options);
+ $records[$code] = array();
if(is_array($results))
{
foreach($results as $record)
{
$record = (object)$record;
- if(!is_numeric($record->value)) continue;
+ if(!is_numeric($record->value) || empty($record->value)) continue;
$record->metricID = $calc->id;
$record->metricCode = $code;
$record->date = $now;
$record->system = $metric->scope == 'system' ? 1 : 0;
- $uniqueKey = $this->getUniqueKeyByRecord($record);
- if(!isset($initRecords[$uniqueKey]))
- {
- $initRecords[$uniqueKey] = $record;
- continue;
- }
-
- $initRecords[$uniqueKey]->value = $record->value;
+ $records[$code][] = $record;
}
}
-
- $records[$code] = array_values($initRecords);
}
return $records;
@@ -318,11 +347,10 @@ class metricZen extends metric
if($dateType == 'nodate') return array();
if($type == 'all' && $this->metric->checkHasInferenceOfDate($code, $dateType, $date)) return array();
- $dateConfig = $this->metric->parseDateStr($date, $dateType);
- $recordCommon = $this->buildRecordCommonFields($metric->id, $code, $now, $dateConfig);
- $initRecords = !$calc->initRecord ? array() : $this->initMetricRecords($recordCommon, $metric->scope, "{$date} 23:59:59");
+ $records = array();
+ $dateConfig = $this->metric->parseDateStr($date, $dateType);
+ $results = $calc->getResult($dateConfig);
- $results = $calc->getResult($dateConfig);
if(is_array($results))
{
foreach($results as $record)
@@ -335,18 +363,11 @@ class metricZen extends metric
$record->date = $now;
$record->system = $metric->scope == 'system' ? 1 : 0;
- $uniqueKey = $this->getUniqueKeyByRecord($record);
- if(!isset($initRecords[$uniqueKey]))
- {
- $initRecords[$uniqueKey] = $record;
- continue;
- }
-
- $initRecords[$uniqueKey]->value = $record->value;
+ $records[] = $record;
}
}
- return array_values($initRecords);
+ return $records;
}
/**
@@ -403,16 +424,48 @@ class metricZen extends metric
protected function buildRecordCommonFields($metricID, $code, $date, $dateValues)
{
$record = new stdclass();
- $record->value = 0;
- $record->metricID = $metricID;
- $record->metricCode = $code;
- $record->date = $date;
+ $record->value = 0;
+ $record->date = $date;
+ $record->calcType = 'cron';
+ $record->calculatedBy = 'system';
$record = (object)array_merge((array)$record, $dateValues);
return $record;
}
+ /**
+ * 补全缺失的度量数据。
+ * Complete missing metric data.
+ *
+ * @param array $records
+ * @param array $metric
+ * @access protected
+ * @return array
+ */
+ protected function completeMissingRecords($records, $metric)
+ {
+ $now = helper::now();
+ $dateValues = $this->metric->parseDateStr($now);
+ $dateType = $metric->dateType;
+ $recordCommon = $this->buildRecordCommonFields($metric->id, $metric->code, $now, $dateValues->$dateType);
+ $initRecords = $this->initMetricRecords($recordCommon, $metric->scope);
+
+ foreach($records as $record)
+ {
+ $uniqueKey = $this->getUniqueKeyByRecord($record);
+ if(!isset($initRecords[$uniqueKey]))
+ {
+ $initRecords[$uniqueKey] = $record;
+ continue;
+ }
+
+ $initRecords[$uniqueKey]->value = $record->value;
+ }
+
+ return array_values($initRecords);
+ }
+
/**
* 根据度量数据，获取度量数据的唯一键。
* Get the unique key of metric data based on metric data.
@@ -448,8 +501,28 @@ class metricZen extends metric
{
if(empty($statement)) return;
- $statement = $statement->query();
+ $dbType = $this->config->metricDB->type;
+ if($dbType == 'duckdb')
+ {
+ $this->loadModel('bi');
+ $sql = $statement->get();
+ $dbh = $this->app->loadDriver('duckdb');
+ $rows = $dbh->query($sql)->fetchAll();
+ foreach($rows as $row)
+ {
+ foreach($calcList as $calc)
+ {
+ if(!$calc->reuse)
+ {
+ $record = $this->getCalcFields($calc, $row);
+ $calc->calculate($record);
+ }
+ }
+ }
+ return;
+ }
+ $statement = $statement->query();
while($row = $statement->fetch())
{
foreach($calcList as $code => $calc)
diff --git a/module/misc/lang/de.php b/module/misc/lang/de.php
index 2cae117fc8..09c3e40b9f 100644
--- a/module/misc/lang/de.php
+++ b/module/misc/lang/de.php
@@ -114,6 +114,7 @@ $lang->misc->feature->promptExecImage = 'theme/default/images/main/prompt_exec
$lang->misc->feature->promptLearnMore = 'https://www.zentao.net/book/zentaopms/1097.html';
/* Release Date. */
+$lang->misc->releaseDate['21.1'] = '2024-11-15';
$lang->misc->releaseDate['21.0'] = '2024-11-01';
$lang->misc->releaseDate['20.8'] = '2024-10-21';
$lang->misc->releaseDate['20.7.1'] = '2024-09-30';
@@ -239,6 +240,7 @@ $lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
/* Release Detail. */
+$lang->misc->feature->all['21.1'][] = array('title' => 'This launch includes enhanced document interface space, improved host functionality, refined object relationship mapping, implementation of zero-padding logic for metrics, DuckDB-related optimizations, and significant enhancements to our online features.', 'desc' => '');
$lang->misc->feature->all['21.0'][] = array('title' => 'Optimization of document functionalities; enhancements to product and project process templates in the BI designer.', 'desc' => '');
$lang->misc->feature->all['20.8'][] = array('title' => 'Document Optimization: We have optimized the task dependencies and fixed some Bugs.', 'desc' => '');
$lang->misc->feature->all['20.7.1'][] = array('title' => 'Addressing any known bugs.', 'desc' => '');
diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php
index 35b566ed5b..3cd20f9712 100644
--- a/module/misc/lang/en.php
+++ b/module/misc/lang/en.php
@@ -114,6 +114,7 @@ $lang->misc->feature->promptExecImage = 'theme/default/images/main/prompt_exec
$lang->misc->feature->promptLearnMore = 'https://www.zentao.net/book/zentaopms/1097.html';
/* Release Date. */
+$lang->misc->releaseDate['21.1'] = '2024-11-15';
$lang->misc->releaseDate['21.0'] = '2024-11-01';
$lang->misc->releaseDate['20.8'] = '2024-10-21';
$lang->misc->releaseDate['20.7.1'] = '2024-09-30';
@@ -239,6 +240,7 @@ $lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
/* Release Detail. */
+$lang->misc->feature->all['21.1'][] = array('title' => 'This launch includes enhanced document interface space, improved host functionality, refined object relationship mapping, implementation of zero-padding logic for metrics, DuckDB-related optimizations, and significant enhancements to our online features.', 'desc' => '');
$lang->misc->feature->all['21.0'][] = array('title' => 'Optimization of document functionalities; enhancements to product and project process templates in the BI designer.', 'desc' => '');
$lang->misc->feature->all['20.8'][] = array('title' => 'Document Optimization: We have optimized the task dependencies and fixed some Bugs.', 'desc' => '');
$lang->misc->feature->all['20.7.1'][] = array('title' => 'Addressing any known bugs.', 'desc' => '');
diff --git a/module/misc/lang/fr.php b/module/misc/lang/fr.php
index 3ce65c6383..5a85e84887 100644
--- a/module/misc/lang/fr.php
+++ b/module/misc/lang/fr.php
@@ -114,6 +114,7 @@ $lang->misc->feature->promptExecImage = 'theme/default/images/main/prompt_exec
$lang->misc->feature->promptLearnMore = 'https://www.zentao.net/book/zentaopms/1097.html';
/* Release Date. */
+$lang->misc->releaseDate['21.1'] = '2024-11-15';
$lang->misc->releaseDate['21.0'] = '2024-11-01';
$lang->misc->releaseDate['20.8'] = '2024-10-21';
$lang->misc->releaseDate['20.7.1'] = '2024-09-30';
@@ -239,6 +240,7 @@ $lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
/* Release Detail. */
+$lang->misc->feature->all['21.1'][] = array('title' => 'This launch includes enhanced document interface space, improved host functionality, refined object relationship mapping, implementation of zero-padding logic for metrics, DuckDB-related optimizations, and significant enhancements to our online features.', 'desc' => '');
$lang->misc->feature->all['21.0'][] = array('title' => 'Optimization of document functionalities; enhancements to product and project process templates in the BI designer.', 'desc' => '');
$lang->misc->feature->all['20.8'][] = array('title' => 'Document Optimization: We have optimized the task dependencies and fixed some Bugs.', 'desc' => '');
$lang->misc->feature->all['20.7.1'][] = array('title' => 'Addressing any known bugs.', 'desc' => '');
diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php
index 8005640c7b..9a14bac15c 100644
--- a/module/misc/lang/zh-cn.php
+++ b/module/misc/lang/zh-cn.php
@@ -114,6 +114,7 @@ $lang->misc->feature->promptExecImage = 'theme/default/images/main/prompt_exec
$lang->misc->feature->promptLearnMore = 'https://www.zentao.net/book/zentaopms/1097.html';
/* Release Date. */
+$lang->misc->releaseDate['21.1'] = '2024-11-15';
$lang->misc->releaseDate['21.0'] = '2024-11-01';
$lang->misc->releaseDate['20.8'] = '2024-10-21';
$lang->misc->releaseDate['20.7.1'] = '2024-09-30';
@@ -239,6 +240,7 @@ $lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
/* Release Detail. */
+$lang->misc->feature->all['21.1'][] = array('title' => '文档接口空间优化升级，接口空间核心功能入口优化，主机功能优化，对象间关联关系完善，度量项补0逻辑，DuckDB相关优化，上线功能优化。', 'desc' => '');
$lang->misc->feature->all['21.0'][] = array('title' => '文档功能优化；产品流程模板、项目流程模板BI设计器优化。', 'desc' => '');
$lang->misc->feature->all['20.8'][] = array('title' => '文档优化：优化任务关系，修复Bug。', 'desc' => '');
$lang->misc->feature->all['20.7.1'][] = array('title' => '修复已知Bug。', 'desc' => '');
diff --git a/module/my/config.php b/module/my/config.php
index 03932ac8d5..3da7c0d587 100644
--- a/module/my/config.php
+++ b/module/my/config.php
@@ -17,3 +17,13 @@ $config->mobile->todoBar = array('today', 'yesterday', 'thisWeek', 'lastWeek',
$config->mobile->taskBar = array('assignedTo', 'openedBy');
$config->mobile->bugBar = array('assignedTo', 'openedBy', 'resolvedBy');
$config->mobile->storyBar = array('assignedTo', 'openedBy', 'reviewedBy');
+
+$config->my->notFlowModules = array();
+
+$config->my->openedDateField['product'] = 'createdDate';
+$config->my->openedDateField['productplan'] = 'createdDate';
+$config->my->openedDateField['release'] = 'createdDate';
+$config->my->openedDateField['build'] = 'createdDate';
+$config->my->openedDateField['testtask'] = 'createdDate';
+$config->my->openedDateField['testsuite'] = 'addedDate';
+$config->my->openedDateField['caselib'] = 'addedDate';
diff --git a/module/my/config/table.php b/module/my/config/table.php
index 53ceae502e..5ecf2ad765 100644
--- a/module/my/config/table.php
+++ b/module/my/config/table.php
@@ -240,6 +240,7 @@ $config->my->task->dtable->fieldList['name']['title'] = $lang->task->name
$config->my->task->dtable->fieldList['name']['type'] = 'title';
$config->my->task->dtable->fieldList['name']['nestedToggle'] = true;
$config->my->task->dtable->fieldList['name']['link'] = array('url' => array('module' => 'task', 'method' => 'view', 'params' => 'taskID={id}'), 'data-app' => 'execution');
+$config->my->task->dtable->fieldList['name']['styleMap'] = array('--color-link' => 'color');
$config->my->task->dtable->fieldList['name']['fixed'] = 'left';
$config->my->task->dtable->fieldList['name']['data-toggle'] = 'modal';
$config->my->task->dtable->fieldList['name']['data-size'] = 'lg';
@@ -667,6 +668,7 @@ $config->my->bug->dtable->fieldList['id']['group'] = 'left';
$config->my->bug->dtable->fieldList['title']['name'] = 'title';
$config->my->bug->dtable->fieldList['title']['title'] = $lang->bug->title;
+$config->my->bug->dtable->fieldList['title']['styleMap'] = array('--color-link' => 'color');
$config->my->bug->dtable->fieldList['title']['type'] = 'title';
$config->my->bug->dtable->fieldList['title']['minWidth'] = '200';
$config->my->bug->dtable->fieldList['title']['fixed'] = 'left';
@@ -956,6 +958,7 @@ $config->my->testcase->dtable->fieldList['title']['name'] = 'title';
$config->my->testcase->dtable->fieldList['title']['title'] = $lang->testcase->title;
$config->my->testcase->dtable->fieldList['title']['type'] = 'title';
$config->my->testcase->dtable->fieldList['title']['link'] = array('module' => 'testcase', 'method' => 'view', 'params' => 'caseID={id}&version={version}');
+$config->my->testcase->dtable->fieldList['title']['styleMap'] = array('--color-link' => 'color');
$config->my->testcase->dtable->fieldList['title']['fixed'] = 'left';
$config->my->testcase->dtable->fieldList['title']['sortType'] = true;
diff --git a/module/my/js/bug.ui.js b/module/my/js/bug.ui.js
index c7a6405b6b..eb11841bb0 100644
--- a/module/my/js/bug.ui.js
+++ b/module/my/js/bug.ui.js
@@ -24,6 +24,14 @@ window.onRenderBugNameCell = function(result, info)
{
result[result.length] = {html: '' + testcaseTitle.replace('{case}', info.row.data.case) + ''};
}
+ if(info.col.name == 'deadline' && result[0])
+ {
+ const bug = info.row.data;
+ if(['resolved', 'closed'].includes(bug.status)) return result;
+
+ const yesterday = zui.formatDate(zui.createDate() - 24 * 60 * 60 * 1000, 'yyyy-MM-dd');
+ if(result[0] <= yesterday) result[0] = {html: '' + result[0] + ''};
+ }
return result;
}
diff --git a/module/my/js/task.ui.js b/module/my/js/task.ui.js
index bc42fae206..0f53948829 100644
--- a/module/my/js/task.ui.js
+++ b/module/my/js/task.ui.js
@@ -58,9 +58,9 @@ window.setStatistics = function(element, checks)
*/
window.renderCell = function(result, info)
{
+ const task = info.row.data;
if(info.col.name == 'name' && result)
{
- const task = info.row.data;
let html = '';
if(task.team)
{
@@ -74,6 +74,8 @@ window.renderCell = function(result, info)
}
if(info.col.name == 'deadline' && result[0])
{
+ if(['done', 'cancel', 'close'].includes(task.rawStatus)) return result;
+
const today = zui.formatDate(zui.createDate(), 'yyyy-MM-dd');
const yesterday = zui.formatDate(convertStringToDate(today) - 24 * 60 * 60 * 1000, 'yyyy-MM-dd');
if(result[0] == today)
diff --git a/module/my/model.php b/module/my/model.php
index d97e86eade..0efaa5b156 100644
--- a/module/my/model.php
+++ b/module/my/model.php
@@ -1190,8 +1190,12 @@ class myModel extends model
$objectGroup = array();
foreach($objectIdList as $objectType => $idList)
{
- if(!isset($flows[$objectType])) continue;
- $table = zget($this->config->objectTables, $objectType, $flows[$objectType]->table);
+ $table = zget($this->config->objectTables, $objectType, '');
+ if(!in_array($objectType, $this->config->my->notFlowModules))
+ {
+ if(!isset($flows[$objectType])) continue;
+ if(!$table) $table = $flows[$objectType]->table;
+ }
if(empty($table)) continue;
$objectGroup[$objectType] = $this->dao->select('*')->from($table)->where('id')->in($idList)->fetchAll('id');
@@ -1327,6 +1331,8 @@ class myModel extends model
{
$condition = "(objectType in('story','case','feedback') and action = 'submitreview') OR ";
$condition .= "(objectType = 'review' and action = 'opened') OR ";
+ $condition .= "(objectType = 'deploy' and action = 'created') OR ";
+ $condition .= "(objectType = 'deploy' and action = 'submit') OR ";
$condition .= "(objectType = 'attend' and action = 'commited') OR ";
$condition .= "(`action` = 'approvalsubmit') OR ";
$condition .= "(objectType in('leave','makeup','overtime','lieu') and action = 'created')";
diff --git a/module/my/tao.php b/module/my/tao.php
index 9d6d630ee1..b7465ba4f1 100644
--- a/module/my/tao.php
+++ b/module/my/tao.php
@@ -298,9 +298,7 @@ class myTao extends myModel
{
$title = '';
$titleFieldName = zget($objectNameFields, $objectType, '');
- $openedDateField = 'openedDate';
- if(in_array($objectType, array('product', 'productplan', 'release', 'build', 'testtask'))) $openedDateField = 'createdDate';
- if(in_array($objectType, array('testsuite', 'caselib')))$openedDateField = 'addedDate';
+ $openedDateField = zget($this->config->my->openedDateField, $objectType, 'openedDate');
if(empty($titleFieldName) && isset($flows[$objectType]))
{
if(!empty($flows[$objectType]->titleField)) $titleFieldName = $flows[$objectType]->titleField;
@@ -316,7 +314,7 @@ class myTao extends myModel
$data->type = $objectType;
$data->time = $object->{$openedDateField};
$data->status = 'doing';
- $data->app = $flows[$objectType]->app;
+ $data->app = isset($flows[$objectType]->app) ? $flows[$objectType]->app : zget($this->lang->navGroup, $objectType, '');
$approvalList[] = $data;
}
}
diff --git a/module/my/ui/task.html.php b/module/my/ui/task.html.php
index 1afdd0d098..1783497fb5 100644
--- a/module/my/ui/task.html.php
+++ b/module/my/ui/task.html.php
@@ -36,8 +36,13 @@ if($type == 'assignedTo') unset($config->my->task->dtable->fieldList['assignedTo
if($type == 'openedBy') unset($config->my->task->dtable->fieldList['openedBy']);
if($type == 'finishedBy') unset($config->my->task->dtable->fieldList['finishedBy']);
-$tasks = initTableData($tasks, $config->my->task->dtable->fieldList, $this->task);
$cols = array_values($config->my->task->dtable->fieldList);
+$tasks = initTableData($tasks, $config->my->task->dtable->fieldList, $this->task);
+foreach($tasks as $task)
+{
+ $task->rawStatus = $task->status;
+ $task->status = $this->processStatus('task', $task);
+}
$data = array_values($tasks);
if($config->edition == 'ipd')
diff --git a/module/ops/control.php b/module/ops/control.php
index efaf85fc78..d8ed87ef30 100644
--- a/module/ops/control.php
+++ b/module/ops/control.php
@@ -49,19 +49,6 @@ class ops extends control
$this->setting('serverroom', 'city', 'city', $currentLang);
}
- /**
- * 管理主机CPU品牌信息。
- * Manger cpuBrand options of host.
- *
- * @param string $currentLang
- * @access public
- * @return void
- */
- public function cpuBrand($currentLang = '')
- {
- $this->setting('host', 'cpuBrand', 'cpuBrand', $currentLang);
- }
-
/**
* 管理主机系统版本信息。
* Manger OS options of host.
diff --git a/module/ops/lang/de.php b/module/ops/lang/de.php
index 710442e1d2..c5338d1dc3 100644
--- a/module/ops/lang/de.php
+++ b/module/ops/lang/de.php
@@ -3,9 +3,7 @@ $lang->ops->common = 'Devops Setting';
$lang->ops->setting = 'Settings';
$lang->ops->provider = 'IDC Provider';
$lang->ops->provider = 'IDC Provider';
-$lang->ops->cpuBrand = 'CPU Brand';
$lang->ops->city = 'IDC Location';
$lang->ops->os = 'OS Version';
-$lang->ops->account = 'Account';
$lang->ops->domain = 'Domain';
$lang->ops->serverroom = 'IDC';
\ No newline at end of file
diff --git a/module/ops/lang/en.php b/module/ops/lang/en.php
index 710442e1d2..c5338d1dc3 100644
--- a/module/ops/lang/en.php
+++ b/module/ops/lang/en.php
@@ -3,9 +3,7 @@ $lang->ops->common = 'Devops Setting';
$lang->ops->setting = 'Settings';
$lang->ops->provider = 'IDC Provider';
$lang->ops->provider = 'IDC Provider';
-$lang->ops->cpuBrand = 'CPU Brand';
$lang->ops->city = 'IDC Location';
$lang->ops->os = 'OS Version';
-$lang->ops->account = 'Account';
$lang->ops->domain = 'Domain';
$lang->ops->serverroom = 'IDC';
\ No newline at end of file
diff --git a/module/ops/lang/fr.php b/module/ops/lang/fr.php
index 710442e1d2..c5338d1dc3 100644
--- a/module/ops/lang/fr.php
+++ b/module/ops/lang/fr.php
@@ -3,9 +3,7 @@ $lang->ops->common = 'Devops Setting';
$lang->ops->setting = 'Settings';
$lang->ops->provider = 'IDC Provider';
$lang->ops->provider = 'IDC Provider';
-$lang->ops->cpuBrand = 'CPU Brand';
$lang->ops->city = 'IDC Location';
$lang->ops->os = 'OS Version';
-$lang->ops->account = 'Account';
$lang->ops->domain = 'Domain';
$lang->ops->serverroom = 'IDC';
\ No newline at end of file
diff --git a/module/ops/lang/zh-cn.php b/module/ops/lang/zh-cn.php
index 542fc346b0..40378ffeea 100644
--- a/module/ops/lang/zh-cn.php
+++ b/module/ops/lang/zh-cn.php
@@ -3,9 +3,7 @@ $lang->ops->common = 'DevOps设置';
$lang->ops->setting = '设置';
$lang->ops->provider = '服务商';
$lang->ops->provider = '服务商';
-$lang->ops->cpuBrand = 'CPU品牌';
$lang->ops->city = '城市';
$lang->ops->os = '系统版本';
-$lang->ops->account = '账号';
$lang->ops->domain = '域名';
$lang->ops->serverroom = '机房';
\ No newline at end of file
diff --git a/module/ops/lang/zh-tw.php b/module/ops/lang/zh-tw.php
index 542fc346b0..40378ffeea 100644
--- a/module/ops/lang/zh-tw.php
+++ b/module/ops/lang/zh-tw.php
@@ -3,9 +3,7 @@ $lang->ops->common = 'DevOps设置';
$lang->ops->setting = '设置';
$lang->ops->provider = '服务商';
$lang->ops->provider = '服务商';
-$lang->ops->cpuBrand = 'CPU品牌';
$lang->ops->city = '城市';
$lang->ops->os = '系统版本';
-$lang->ops->account = '账号';
$lang->ops->domain = '域名';
$lang->ops->serverroom = '机房';
\ No newline at end of file
diff --git a/module/pivot/model.php b/module/pivot/model.php
index c059274384..fdde4ea856 100644
--- a/module/pivot/model.php
+++ b/module/pivot/model.php
@@ -1869,9 +1869,10 @@ class pivotModel extends model
/* Calculate row span config. */
$records = $this->processRowSpan($records, $groups);
- $data->cols = $cols;
- $data->array = $this->processRecordsForDisplay($records);
- $data->drills = $this->getDrillsFromRecords($records, $groups);
+ $data->cols = $cols;
+ $data->array = $this->processRecordsForDisplay($records);
+ $data->drills = $this->getDrillsFromRecords($records, $groups);
+ $data->showAllTotal = $showAllTotal;
$configs = $this->getRowSpanConfig($records);
@@ -2447,7 +2448,34 @@ class pivotModel extends model
*/
public function buildPivotTable($data, $configs)
{
- $width = 128;
+ $width = 128;
+
+ $nowSpan = 1;
+ $inFlow = false;
+
+ /* 处理不需要展示的单元格，设置为0 */
+ $columnCount = count(current($configs));
+ $lineCount = count($configs);
+ for($i = 0; $i < $columnCount; $i ++)
+ {
+ for($j = 0; $j < $lineCount; $j ++)
+ {
+ if($configs[$j][$i] > 1 && !$inFlow)
+ {
+ $inFlow = true;
+ $nowSpan = $configs[$j][$i];
+ continue;
+ }
+
+ if($configs[$j][$i] > 1 && $inFlow)
+ {
+ $configs[$j][$i] = 0;
+
+ $nowSpan --;
+ if($nowSpan == 1) $inFlow = false;
+ }
+ }
+ }
/* Init table. */
$table = "";
@@ -2489,13 +2517,13 @@ class pivotModel extends model
$table .= "";
$rowCount = 0;
- $useColumnTotal = (!empty($data->columnTotal) and $data->columnTotal === 'sum');
+ $showAllTotal = $data->showAllTotal;
for($i = 0; $i < count($data->array); $i ++)
{
$rowCount ++;
- if($useColumnTotal and $rowCount == count($data->array)) continue;
+ if($showAllTotal and $rowCount == count($data->array)) continue;
$line = array_values($data->array[$i]);
$table .= "";
@@ -2503,7 +2531,7 @@ class pivotModel extends model
{
$isGroup = !empty($data->cols[0][$j]->isGroup) ? $data->cols[0][$j]->isGroup : false;
$rowspan = isset($configs[$i][$j]) ? $configs[$i][$j] : 1;
- $hidden = isset($configs[$i][$j]) ? false : (!$isGroup ? false : true);
+ $hidden = (isset($configs[$i][$j]) and $configs[$i][$j]) ? false : (!$isGroup ? false : true);
$showOrigin = $showOrigins[$j];
if($hasShowOrigin && !$isGroup && !$showOrigin)
@@ -2520,7 +2548,7 @@ class pivotModel extends model
$table .= "
";
}
- if($useColumnTotal and !empty($data->array))
+ if($showAllTotal and !empty($data->array))
{
$table .= "";
$table .= "| {$this->lang->pivot->stepDesign->total} | ";
diff --git a/module/product/model.php b/module/product/model.php
index 9b60ea8901..30131031df 100755
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -719,13 +719,19 @@ class productModel extends model
$searchConfig['actionURL'] = $actionURL;
/* Get product data. */
- $product = ($this->app->tab == 'project' && empty($productID)) ? $products : array();
+ if(empty($productID) && empty($products))
+ {
+ $products = $this->getPairs('all', 0, '', 'all');
+ $productID = key($products);
+ $showAll = true;
+ }
+ $product = ($this->app->tab == 'project' && empty($productID)) || !empty($showAll) ? $products : array();
if(empty($product) && isset($products[$productID])) $product = array($productID => $products[$productID]);
$searchConfig['params']['product']['values'] = array('' => '') + $product + array('all' => $this->lang->product->allProduct);
/* Get module data. */
$projectID = ($this->app->tab == 'project' && empty($projectID)) ? $this->session->project : $projectID;
- $searchConfig['params']['module']['values'] = $this->productTao->getModulesForSearchForm($productID, $products, $branch, (int)$projectID);
+ $searchConfig['params']['module']['values'] = empty($showAll) ? $this->productTao->getModulesForSearchForm($productID, $products, $branch, (int)$projectID) : $this->loadModel('tree')->getAllModulePairs('story');
$gradePairs = $this->loadModel('story')->getGradePairs($storyType, 'all');
@@ -757,12 +763,12 @@ class productModel extends model
if($this->config->edition == 'ipd') $searchConfig['params']['roadmap']['values'] = $this->loadModel('roadmap')->getPairs($productID);
/* Get product plan data. */
- $productIdList = ($this->app->tab == 'project' && empty($productID)) ? array_keys($products) : array($productID);
- $branchParam = ($this->app->tab == 'project' && empty($productID)) ? '' : $branch;
+ $productIdList = ($this->app->tab == 'project' && empty($productID)) || !empty($showAll) ? array_keys($products) : array($productID);
+ $branchParam = ($this->app->tab == 'project' && empty($productID)) || !empty($showAll) ? '' : $branch;
$searchConfig['params']['plan']['values'] = $this->loadModel('productplan')->getPairs($productIdList, (empty($branchParam) || $branchParam == 'all') ? '' : $branchParam);
/* Get branch data. */
- if($productID)
+ if($productID && empty($showAll))
{
$productInfo = $this->getByID($productID);
if(!empty($productInfo->shadow))
@@ -787,6 +793,13 @@ class productModel extends model
unset($searchConfig['params']['branch']);
}
+ /* Reset the stage list for epic and requirement. */
+ if($storyType != 'all')
+ {
+ $this->app->loadLang($storyType);
+ $searchConfig['params']['stage']['values'] = $this->lang->$storyType->stageList;
+ }
+
$this->loadModel('search')->setSearchParams($searchConfig);
}
@@ -2030,7 +2043,7 @@ class productModel extends model
if($this->config->edition != 'open')
{
$flow = $this->loadModel('workflow')->getByModule($module);
- if(in_array($flow->app, array('scrum', 'waterfall'))) $flow->app = 'project';
+ if($flow && in_array($flow->app, array('scrum', 'waterfall'))) $flow->app = 'project';
if(!empty($flow) && $flow->buildin == '0') return helper::createLink('flow', 'ajaxSwitchBelong', "objectID=%s&moduleName=$module") . "#app=$flow->app";
}
diff --git a/module/product/test/lib/kanban.ui.class.php b/module/product/test/lib/kanban.ui.class.php
new file mode 100644
index 0000000000..9b95993bba
--- /dev/null
+++ b/module/product/test/lib/kanban.ui.class.php
@@ -0,0 +1,33 @@
+initForm('product', 'kanban', array(), 'appIframe-product');
+ $form->wait(2);
+ $numDom = $type.'Num';
+ $num = $form->dom->$numDom->getText();
+ $message = [
+ 'plan' => '未过期计划数',
+ 'project' => '进行中的项目数',
+ 'execution' => '进行中的执行数',
+ 'release' => '正常发布数'
+ ];
+ if (isset($message[$type]))
+ {
+ return ($num == $expected)
+ ? $this->success($message[$type] . '正确')
+ : $this->failed($message[$type] . '不正确');
+ }
+ return $this->failed('页面中无该类型的数据');
+ }
+}
diff --git a/module/product/test/lib/project.ui.class.php b/module/product/test/lib/project.ui.class.php
new file mode 100644
index 0000000000..1107e90cbc
--- /dev/null
+++ b/module/product/test/lib/project.ui.class.php
@@ -0,0 +1,48 @@
+initForm('product', 'project', $projecturl, 'appIframe-product');
+ $projectPage->dom->$tabDom->click();//点击对应的tab
+ $projectPage->wait(1);
+ $num = $projectPage->dom->$tabNumDom->getText();//获取对应tab下项目数
+ return($num == $expected)
+ ? $this->success($tabName . '标签下项目数显示正确')
+ : $this->failed($tabName . '标签下项目数显示不正确');
+ }
+
+ /*
+ * 关联项目
+ * link project
+ *
+ * @param $projecturl url
+ * @param $expectedProject 项目名称
+ * @return mixed
+ */
+ public function linkProject($projecturl, $expectedProject)
+ {
+ $projectPage = $this->initForm('product', 'project', $projecturl, 'appIframe-product');
+ $projectPage->dom->linkBtn->click();
+ $projectPage->wait(1);
+ if (isset($expectedProject)) $projectPage->dom->project->picker($expectedProject);
+ $projectPage->wait(1);
+ $projectPage->dom->btn($this->lang->save)->click();
+ $projectPage->wait(1);
+ return ($projectPage->dom->firstProject->getText() == $expectedProject)
+ ? $this->success('产品关联项目成功')
+ : $this->failed('产品关联项目失败');
+ }
+}
diff --git a/module/product/test/lib/track.ui.class.php b/module/product/test/lib/track.ui.class.php
new file mode 100644
index 0000000000..fe2a1b0d4e
--- /dev/null
+++ b/module/product/test/lib/track.ui.class.php
@@ -0,0 +1,38 @@
+initForm('product', 'track', $trackurl, 'appIframe-product');
+ $form->wait(2);
+ $title = $form->dom->$type->getText();
+ $message = [
+ 'ER' => '业务需求',
+ 'UR' => '用户需求',
+ 'SR' => '研发需求',
+ 'sub_SR' => '子研发需求',
+ 'project' => '所属项目',
+ 'execution' => '所属执行',
+ 'task' => '相关任务',
+ 'bug' => '相关Bug',
+ 'case' => '相关用例'
+ ];
+ if (isset($message[$type]))
+ {
+ return ($title == $expected)
+ ? $this->success($message[$type] . '显示正确')
+ : $this->failed($message[$type] . '显示不正确');
+ }
+ return $this->failed('矩阵中无该类型的数据');
+ }
+}
diff --git a/module/product/test/ui/checkkanbandata.php b/module/product/test/ui/checkkanbandata.php
new file mode 100755
index 0000000000..defa2dd63c
--- /dev/null
+++ b/module/product/test/ui/checkkanbandata.php
@@ -0,0 +1,68 @@
+#!/usr/bin/env php
+id->range('1');
+$product->program->range('0');
+$product->name->range('产品1');
+$product->PO->range('admin');
+$product->status->range('normal');
+$product->type->range('normal');
+$product->gen(1);
+
+$project = zenData('project');
+$project->id->range('1-6');
+$project->project->range('0{3},1{3}');
+$project->model->range('scrum{3},[]{3}');
+$project->type->range('project{3},sprint{3}');
+$project->parent->range('0{3},1{3}');
+$project->auth->range('extend');
+$project->storytype->range('story');
+$project->path->range('`,1,`','`,2,`','`,3,`,`,1,4,`','`,1,5,`','`,1,6,`');
+$project->grade->range('1');
+$project->name->range('项目1,项目2,项目3,迭代1,迭代2,迭代3');
+$project->hasProduct->range('1');
+$project->status->range('doing{2},wait{1},doing{2},wait{1}');
+$project->gen(6);
+
+$projectProduct = zenData('projectproduct');
+$projectProduct->project->range('1-6');
+$projectProduct->product->range('1');
+$projectProduct->gen(6);
+
+$productplan = zenData('productplan');
+$productplan->id->range('1-7');
+$productplan->product->range(1);
+$productplan->title->range('计划1,计划2,计划3,计划4,计划5,计划6,计划7');
+$productplan->parent->range(0);
+$productplan->begin->range('(-10M)-(-7M):7D')->type('timestamp')->format('YYYY-MM-DD');
+$productplan->end->range('(-1M)-(+6M):10D')->type('timestamp')->format('YYYY-MM-DD');
+$productplan->status->range('wait{3},doing{2},done{1},closed{1}');
+$productplan->gen(7);
+
+$release = zenData('release');
+$release->id->range('1-5');
+$release->product->range('1');
+$release->name->range('发布1,发布2,发布3,发布4,发布5');
+$release->status->range('normal{4},closed{1}');
+$release->gen(5);
+
+$tester = new kanbanTester();
+$tester->login();
+
+r($tester->checkKanbanData('plan', '3')) && p('message,status') && e('未过期计划数正确,SUCCESS');//检查未过期计划数
+r($tester->checkKanbanData('project', '2')) && p('message,status') && e('进行中的项目数正确,SUCCESS');//检查进行中的项目数
+r($tester->checkKanbanData('execution', '1')) && p('message,status') && e('进行中的执行数正确,SUCCESS');//检查进行中的执行数
+r($tester->checkKanbanData('release', '4')) && p('message,status') && e('正常发布数正确,SUCCESS');//检查正常发布数
+
+$tester->closeBrowser();
diff --git a/module/product/test/ui/checktrack.php b/module/product/test/ui/checktrack.php
new file mode 100755
index 0000000000..5398d176a8
--- /dev/null
+++ b/module/product/test/ui/checktrack.php
@@ -0,0 +1,119 @@
+#!/usr/bin/env php
+id->range('1');
+$product->program->range('0');
+$product->name->range('产品1');
+$product->PO->range('admin');
+$product->status->range('normal');
+$product->type->range('normal');
+$product->gen(1);
+
+$project = zenData('project');
+$project->id->range('1-2');
+$project->project->range('0,1');
+$project->model->range('scrum,[]');
+$project->type->range('project,sprint');
+$project->parent->range('0,1');
+$project->auth->range('extend');
+$project->storytype->range('story');
+$project->path->range('`,1,`,`,1,2,`');
+$project->grade->range('1');
+$project->name->range('项目1,迭代1');
+$project->hasProduct->range('1');
+$project->status->range('doing');
+$project->gen(2);
+
+$projectProduct = zenData('projectproduct');
+$projectProduct->project->range('1-6');
+$projectProduct->product->range('1');
+$projectProduct->gen(6);
+
+$story = zenData('story');
+$story->id->range('1-4');
+$story->parent->range('0,1,2,3');
+$story->isParent->range('1{3},0{1}');
+$story->root->range('1');
+$story->path->range('`,1,`,`,1,2,`,`,1,2,3,`,`,1,2,3,4,`');
+$story->grade->range('1{3},2{1}');
+$story->product->range('1');
+$story->title->range('业需01,用需01,研需01,子需求01');
+$story->type->range('epic,requirement,story{2}');
+$story->status->range('active');
+$story->version->range('1');
+$story->gen(4);
+
+$storyspec = zenData('storyspec');
+$storyspec->story->range('1-4');
+$storyspec->version->range('1');
+$storyspec->title->range('业需01,用需01,研需01,子需求01');
+$storyspec->gen(4);
+
+$projectstory = zenData('projectstory');
+$projectstory->project->range('1{2},2{2}');
+$projectstory->product->range('1');
+$projectstory->story->range('3,4,3,4');
+$projectstory->order->range('1,2,1,2');
+$projectstory->gen(4);
+
+$task = zenData('task');
+$task->id->range('1');
+$task->project->range('1');
+$task->execution->range('2');
+$task->story->range('4');
+$task->name->range('任务1');
+$task->type->range('devel');
+$task->pri->range('1');
+$task->status->range('wait');
+$task->gen(1);
+
+$case = zenData('case');
+$case->id->range('1');
+$case->product->range('1');
+$case->execution->range('2');
+$case->story->range('4');
+$case->title->range('用例1');
+$case->type->range('feature');
+$case->pri->range('1');
+$case->gen(1);
+
+$casestep = zenData('casestep');
+$casestep->id->range('1');
+$casestep->case->range('1');
+$casestep->type->range('step');
+$casestep->gen(1);
+
+$bug = zenData('bug');
+$bug->id->range('1');
+$bug->product->range('1');
+$bug->execution->range('2');
+$bug->story->range('4');
+$bug->title->range('bug1');
+$bug->status->range('active');
+$bug->gen(1);
+
+$tester = new trackTester();
+$tester->login();
+$trackurl['productID'] = 1;
+
+r($tester->checkTrackData($trackurl, 'ER','业需01')) && p('message,status') && e('业务需求显示正确,SUCCESS');//检查业务需求的显示
+r($tester->checkTrackData($trackurl, 'UR','用需01')) && p('message,status') && e('用户需求显示正确,SUCCESS');//检查用户需求的显示
+r($tester->checkTrackData($trackurl, 'SR','研需01')) && p('message,status') && e('研发需求显示正确,SUCCESS');//检查研发需求的显示
+r($tester->checkTrackData($trackurl, 'sub_SR','子需求01')) && p('message,status') && e('子研发需求显示正确,SUCCESS');//检查子需求的显示
+r($tester->checkTrackData($trackurl, 'project','项目1')) && p('message,status') && e('所属项目显示正确,SUCCESS');//检查所属项目的显示
+r($tester->checkTrackData($trackurl, 'execution','迭代1')) && p('message,status') && e('所属执行显示正确,SUCCESS');//检查所属执行的显示
+r($tester->checkTrackData($trackurl, 'task','任务1')) && p('message,status') && e('相关任务显示正确,SUCCESS');//检查相关任务的显示
+r($tester->checkTrackData($trackurl, 'bug','bug1')) && p('message,status') && e('相关Bug显示正确,SUCCESS');//检查相关Bug的显示
+r($tester->checkTrackData($trackurl, 'case','用例1')) && p('message,status') && e('相关用例显示正确,SUCCESS');//检查相关用例的显示
+
+$tester->closeBrowser();
diff --git a/module/product/test/ui/linkproject.php b/module/product/test/ui/linkproject.php
new file mode 100755
index 0000000000..4006460cfe
--- /dev/null
+++ b/module/product/test/ui/linkproject.php
@@ -0,0 +1,47 @@
+#!/usr/bin/env php
+id->range('1-2');
+$product->program->range('0');
+$product->name->range('产品1,产品2');
+$product->PO->range('admin');
+$product->status->range('normal');
+$product->type->range('normal');
+$product->gen(2);
+
+$project = zenData('project');
+$project->id->range('1');
+$project->project->range('0');
+$project->model->range('scrum');
+$project->type->range('project');
+$project->parent->range('0');
+$project->auth->range('extend');
+$project->path->range('`,1,`');
+$project->grade->range('1');
+$project->name->range('项目1');
+$project->hasProduct->range('1');
+$project->status->range('wait');
+$project->gen(1);
+
+$projectProduct = zenData('projectproduct');
+$projectProduct->project->range('1');
+$projectProduct->product->range('2');
+$projectProduct->gen(1);
+
+$tester = new projectTester();
+$tester->login();
+$projecturl['status'] = 'all';
+$projecturl['productID'] = 1;
+
+r($tester->linkProject($projecturl, '项目1')) && p('message,status') && e('产品关联项目成功,SUCCESS');//产品关联项目
+$tester->closeBrowser();
diff --git a/module/product/test/ui/page/kanban.php b/module/product/test/ui/page/kanban.php
new file mode 100644
index 0000000000..7d3f0741bc
--- /dev/null
+++ b/module/product/test/ui/page/kanban.php
@@ -0,0 +1,15 @@
+ '//*[@id="mainContent"]/div/div/div[2]/div[1]/div[2]/div[1]/div/div/span[2]/div/span',
+ 'projectNum' => '//*[@id="mainContent"]/div/div/div[2]/div[1]/div[2]/div[2]/div[2]/div[1]/div/div/span[2]/div/span',
+ 'executionNum' => '//*[@id="mainContent"]/div/div/div[2]/div[1]/div[2]/div[2]/div[2]/div[2]/div/div/span[2]/div/span',
+ 'releaseNum' => '//*[@id="mainContent"]/div/div/div[2]/div[1]/div[2]/div[3]/div/div/span[2]/div/span'
+ );
+ $this->dom->xpath = array_merge($this->dom->xpath, $xpath);
+ }
+}
diff --git a/module/product/test/ui/page/project.php b/module/product/test/ui/page/project.php
new file mode 100644
index 0000000000..85a6257280
--- /dev/null
+++ b/module/product/test/ui/page/project.php
@@ -0,0 +1,27 @@
+ '//*[@id="actionBar"]/a[1]',
+ /*tab标签*/
+ 'allTab' => '//*[@id="featureBar"]/menu/li[1]/a',
+ 'unfinishedTab' => '//*[@id="featureBar"]/menu/li[2]/a',
+ 'waitingTab' => '//*[@id="featureBar"]/menu/li[3]/a',
+ 'doingTab' => '//*[@id="featureBar"]/menu/li[4]/a',
+ 'suspendedTab' => '//*[@id="featureBar"]/menu/li[5]/a',
+ 'closedTab' => '//*[@id="featureBar"]/menu/li[6]/a',
+ /*tab标签下项目数*/
+ 'allNum' => '//*[@id="featureBar"]/menu/li[1]/a/span[2]',
+ 'unfinishedNum' => '//*[@id="featureBar"]/menu/li[2]/a/span[2]',
+ 'waitingNum' => '//*[@id="featureBar"]/menu/li[3]/a/span[2]',
+ 'doingNum' => '//*[@id="featureBar"]/menu/li[4]/a/span[2]',
+ 'suspendedNum' => '//*[@id="featureBar"]/menu/li[5]/a/span[2]',
+ 'closedNum' => '//*[@id="featureBar"]/menu/li[6]/a/span[2]',
+ 'firstProject' => '//*[@id="table-product-project"]/div[2]/div[1]/div/div[3]/div/a'
+ );
+ $this->dom->xpath = array_merge($this->dom->xpath, $xpath);
+ }
+}
diff --git a/module/product/test/ui/page/track.php b/module/product/test/ui/page/track.php
new file mode 100644
index 0000000000..70d8109575
--- /dev/null
+++ b/module/product/test/ui/page/track.php
@@ -0,0 +1,20 @@
+ '//*[@id="track"]/div[1]/div/div/div[2]/div/div[2]/div[1]/div/div/div/div/div[1]/span/div/div/a',
+ 'UR' => '//*[@id="track"]/div[1]/div/div/div[2]/div/div[2]/div[2]/div/div/div/div/div[1]/span/div/div/a',
+ 'SR' => '//*[@id="track"]/div[1]/div/div/div[2]/div/div[2]/div[3]/div/div/div/div/div[1]/span/div/div/a',
+ 'sub_SR' => '//*[@id="track"]/div[1]/div/div/div[2]/div/div[2]/div[4]/div/div/div/div/div[1]/span/div/div/a',
+ 'project' => '//*[@id="track"]/div[1]/div/div/div[2]/div/div[2]/div[5]/div/div/div/div/div[1]/span/div[1]/div/a',
+ 'execution' => '//*[@id="track"]/div[1]/div/div/div[2]/div/div[2]/div[6]/div/div/div/div/div[1]/span/div[1]/div/a',
+ 'task' => '//*[@id="track"]/div[1]/div/div/div[2]/div/div[2]/div[9]/div/div/div/div/div[1]/span/div/div/a',
+ 'bug' => '//*[@id="track"]/div[1]/div/div/div[2]/div/div[2]/div[10]/div/div/div/div/div[1]/span/div/div/a',
+ 'case' => '//*[@id="track"]/div[1]/div/div/div[2]/div/div[2]/div[11]/div/div/div/div/div[1]/span/div/div/a'
+ );
+ $this->dom->xpath = array_merge($this->dom->xpath, $xpath);
+ }
+}
diff --git a/module/product/test/ui/projectlist.php b/module/product/test/ui/projectlist.php
new file mode 100755
index 0000000000..f6dcee60db
--- /dev/null
+++ b/module/product/test/ui/projectlist.php
@@ -0,0 +1,53 @@
+#!/usr/bin/env php
+id->range('1-2');
+$product->program->range('0');
+$product->name->range('产品1,产品2');
+$product->PO->range('admin');
+$product->status->range('normal');
+$product->type->range('normal');
+$product->gen(2);
+
+$project = zenData('project');
+$project->id->range('1-10');
+$project->project->range('0');
+$project->model->range('scrum{5},kanban{2},waterfall{3}');
+$project->type->range('project');
+$project->parent->range('0');
+$project->auth->range('extend');
+$project->path->range('`,1,`,`,2,`,`,3,`,`,4,`,`,5,`,`,6,`,`,7,`,`,8,`,`,9,`,`,10,`');
+$project->grade->range('1');
+$project->name->range('项目1,项目2,项目3,项目4,项目5,项目6,项目7,项目8,项目9,项目10');
+$project->hasProduct->range('1');
+$project->status->range('doing{1},suspended{3},closed{4},wait{2}');
+$project->gen(10);
+
+$projectProduct = zenData('projectproduct');
+$projectProduct->project->range('1-10');
+$projectProduct->product->range('1{9},2');
+$projectProduct->gen(10);
+
+$tester = new projectTester();
+$tester->login();
+$projecturl['status'] = 'all';
+$projecturl['productID'] = 1;
+
+r($tester->switchTab($projecturl, 'all', '9')) && p('message,status') && e('all标签下项目数显示正确,SUCCESS');//检查全部标签下项目数
+r($tester->switchTab($projecturl, 'unfinished', '2')) && p('message,status') && e('unfinished标签下项目数显示正确,SUCCESS');//检查未完成标签下项目数
+r($tester->switchTab($projecturl, 'waiting', '1')) && p('message,status') && e('waiting标签下项目数显示正确,SUCCESS');//检查未开始标签下项目数
+r($tester->switchTab($projecturl, 'doing', '1')) && p('message,status') && e('doing标签下项目数显示正确,SUCCESS');//检查进行中标签下项目数
+r($tester->switchTab($projecturl, 'suspended', '3')) && p('message,status') && e('suspended标签下项目数显示正确,SUCCESS');//检查已挂起标签下项目数
+r($tester->switchTab($projecturl, 'closed', '4')) && p('message,status') && e('closed标签下项目数显示正确,SUCCESS');//检查已关闭标签下项目数
+
+$tester->closeBrowser();
diff --git a/module/product/ui/ajaxgetdropmenu.html.php b/module/product/ui/ajaxgetdropmenu.html.php
index 8f00fe14a1..6fbd33c96e 100644
--- a/module/product/ui/ajaxgetdropmenu.html.php
+++ b/module/product/ui/ajaxgetdropmenu.html.php
@@ -67,6 +67,7 @@ foreach($products as $programID => $programProducts)
$item['active'] = $productID == $product->id;
$item['keys'] = zget(common::convert2Pinyin(array($product->name)), $product->name, '');
$item['data-app'] = $app->tab;
+ $item['isPO'] = $product->PO == $this->app->user->account;
if($config->systemMode == 'light' || $config->vision == 'or')
{
diff --git a/module/product/view/ajaxgetolddropmenu.html.php b/module/product/view/ajaxgetolddropmenu.html.php
index 72228f340a..da16eae223 100644
--- a/module/product/view/ajaxgetolddropmenu.html.php
+++ b/module/product/view/ajaxgetolddropmenu.html.php
@@ -89,7 +89,13 @@ foreach($products as $programID => $programProducts)
$myProducts ++;
}
- else if($product->status == 'normal' and !($product->PO == $this->app->user->account))
+ else if($product->status == 'closed')
+ {
+ $closedProductsHtml .= '' . html::a($linkHtml, $productName, '', "class='$selected clickable' title='$productName' class='closed' data-key='" . zget($productsPinYin, $product->name, '') . "' data-app='$app->tab'") . '';
+
+ if($selected == 'selected') $tabActive = 'closed';
+ }
+ else
{
$normalProductsHtml .= '' . html::a($linkHtml, $productName, '', "class='$selected clickable' title='{$productName}' data-key='" . zget($productsPinYin, $product->name, '') . "' data-app='$app->tab'") . '';
@@ -97,12 +103,6 @@ foreach($products as $programID => $programProducts)
$others ++;
}
- else if($product->status == 'closed')
- {
- $closedProductsHtml .= '' . html::a($linkHtml, $productName, '', "class='$selected clickable' title='$productName' class='closed' data-key='" . zget($productsPinYin, $product->name, '') . "' data-app='$app->tab'") . '';
-
- if($selected == 'selected') $tabActive = 'closed';
- }
/* If the programID is greater than 0, the product is the last one in the program, print the closed label. */
if($programID and !isset($programProducts[$index + 1]))
diff --git a/module/program/ui/kanban.html.php b/module/program/ui/kanban.html.php
index b1f05306b9..ca305e0f30 100644
--- a/module/program/ui/kanban.html.php
+++ b/module/program/ui/kanban.html.php
@@ -87,6 +87,7 @@ else
{
zui::kanbanList
(
+ set('$replace', false),
set::key('kanban'),
set::items($kanbanList),
set::height('calc(100vh - 120px)')
diff --git a/module/project/js/bug.ui.js b/module/project/js/bug.ui.js
index a4da6778db..ded2dd71ec 100644
--- a/module/project/js/bug.ui.js
+++ b/module/project/js/bug.ui.js
@@ -30,6 +30,14 @@ $(document).off('click', '.batch-btn').on('click', '.batch-btn', function()
window.onRenderCell = function(result, {row, col})
{
if(result && col.name == 'title' && row.data.color) result[0].props.style = 'color: ' + row.data.color;
+ if(col.name == 'deadline' && result[0])
+ {
+ const bug = row.data;
+ if(['resolved', 'closed'].includes(bug.status)) return result;
+
+ const yesterday = zui.formatDate(zui.createDate() - 24 * 60 * 60 * 1000, 'yyyy-MM-dd');
+ if(result[0] <= yesterday) result[0] = {html: '' + result[0] + ''};
+ }
return result;
}
diff --git a/module/project/model.php b/module/project/model.php
index cbd12ca75e..718ac668a5 100755
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -633,15 +633,16 @@ class projectModel extends model
/**
* Get project pairs.
*
+ * @param bool $ignoreVision
* @access public
* @return object
*/
- public function getPairs()
+ public function getPairs(bool $ignoreVision = false)
{
return $this->dao->select('id, name')->from(TABLE_PROJECT)
->where('type')->eq('project')
->andWhere('deleted')->eq(0)
- ->andWhere('vision')->eq($this->config->vision)
+ ->beginIF(!$ignoreVision)->andWhere('vision')->eq($this->config->vision)->fi()
->fetchPairs();
}
diff --git a/module/project/test/lib/bug.ui.class.php b/module/project/test/lib/bug.ui.class.php
index 35ddf8ba35..763c3de027 100644
--- a/module/project/test/lib/bug.ui.class.php
+++ b/module/project/test/lib/bug.ui.class.php
@@ -57,4 +57,76 @@ class bugTester extends tester
if($form->dom->firstAssign->getText() == $user) return $this->success('单个指派Bug成功');
return $this->failed('单个指派Bug失败');
}
+
+ /**
+ * 批量指派bug。
+ * Batch assign bug.
+ *
+ * @param string $user
+ * @access public
+ * @return object
+ */
+ public function batchAssignBug($user)
+ {
+ $form = $this->initForm('project', 'bug', array('project' => 1), 'appIframe-project');
+ $form->dom->secondCheckbox->click();
+ $form->dom->batchAssignTo->click();
+ $form->dom->assignToAdmin->click();
+ $form->wait(1);
+ if($form->dom->firstAssign->getText() == $user) return $this->success('批量指派Bug成功');
+ return $this->failed('批量指派Bug失败');
+ }
+
+ /**
+ * 确认bug。
+ * Confirm bug.
+ *
+ * @param string $user
+ * @access public
+ * @return object
+ */
+ public function confirmBug($user)
+ {
+ $form = $this->initForm('project', 'bug', array('project' => 1), 'appIframe-project');
+ $form->dom->confirmBtn->click();
+ $form->dom->confirmAssignTo->picker($user);
+ $form->dom->confirm->click();
+ $form->wait(1);
+ if($form->dom->firstConfirm->getText() == '已确认') return $this->success('确认Bug成功');
+ return $this->failed('确认Bug失败');
+ }
+
+ /**
+ * 解决bug。
+ * Resolve bug.
+ *
+ * @param array $bug
+ * @access public
+ * @return object
+ */
+ public function resolveBug(array $bug)
+ {
+ $form = $this->initForm('project', 'bug', array('project' => 1), 'appIframe-project');
+ $form->dom->resolveBtn->click();
+ $resolveForm = $this->loadPage('bug', 'bug');
+ $form->wait(1);
+ $title = $form->dom->resolveTitle->getText();
+ if(isset($bug['resolution']) && !empty($bug['resolution'])) $form->dom->resolution->picker($bug['resolution']);
+ if(isset($bug['build']) && !empty($bug['build'])) $form->dom->build->picker($bug['build']);
+ $form->dom->resolve->click();
+
+ /* 检查解决方案必填提示 */
+ if($resolveForm->dom->resolutionTip)
+ {
+ if($this->checkFormTips('bug')) return $this->success('解决Bug表单页提示信息正确');
+ return $this->failed('解决Bug表单页提示信息不正确');
+ }
+
+ $form->wait(1);
+ /* 搜索已解决的Bug,检查列表状态字段 */
+ $form->dom->search(array("{$this->lang->bug->name},=,{$title}"));
+ $form->wait(1);
+ if($form->dom->status->getText() == '已解决') return $this->success('解决Bug成功');
+ return $this->failed('解决Bug失败');
+ }
}
diff --git a/module/project/test/lib/createkanban.ui.class.php b/module/project/test/lib/createkanban.ui.class.php
new file mode 100644
index 0000000000..73e6c1d7bc
--- /dev/null
+++ b/module/project/test/lib/createkanban.ui.class.php
@@ -0,0 +1,101 @@
+initForm('project', 'create', array('model' => 'kanban'));
+ if(isset($kanban['parent'])) $form->dom->parent->picker($kanban['parent']);
+ $categoryLang = (array)$this->lang->project->projectTypeList;
+ if(isset($kanban['type'])) $form->dom->btn($categoryLang[$kanban['type']])->click();
+ if(isset($kanban['name'])) $form->dom->name->setValue($kanban['name']);
+ if(isset($kanban['end'])) $form->dom->end->datepicker($kanban['end']);
+ else $form->dom->longTime->click(); //如果设置了end时间就选择，没有设置就选择长期
+ if(isset($kanban['PM'])) $form->dom->PM->picker($kanban['PM']);
+
+ $form->dom->btn($this->lang->save)->click();
+ $form->wait(5);
+ return $this->checkResult($kanban);
+ }
+
+ /**
+ * 创建看板项目后结果检查。
+ * Check the result after creating the kanban project.
+ *
+ * @param string $kanban
+ * @access public
+ * @return object
+ */
+ public function checkResult($kanban = array())
+ {
+ /* 检查创建页面时的提示信息 */
+ if($this->response('method') != 'browse')
+ {
+ if($this->checkFormTips('project')) return $this->success('创建看板项目表单页提示信息正确');
+ if($form->dom->endTip)
+ {
+ /* 检查结束日期不能为空 */
+ $endTiptext = $form->dom->endTip->getText();
+ $endTip = sprintf($this->lang->copyProject->endTip,'');
+ return ($endTiptext == $endTip) ? $this->success('创建看板项目表单页提示信息正确') : $this->failed('创建看板项目表单页提示信息不正确');
+ form->wait(1);
+ }
+ return $this->failed('创建看板项目表单页提示信息不正确');
+ }
+ /* 检查创建成功后的提示信息 */
+ else
+ {
+ /* 跳转到项目列表页面，按照项目名称进行搜索 */
+ $browsePage = $this->loadPage('project', 'browse');
+ $browsePage->dom->search($searchList = array("项目名称,包含, {$kanban['name']}"));
+ $browsePage->wait(2);
+ $browsePage->dom->kanbanName->click();
+ // 进入项目概况页面
+ $browsePage->dom->settings->click();
+ $viewPage = $this->loadPage('project', 'view');
+ $viewPage->wait(2);
+
+ // 断言检查名称、项目类型是否正确
+ if($viewPage->dom->projectName->getText() != $kanban['name']) return $this->failed('名称错误');
+ $categoryLang = (array)$this->lang->project->projectTypeList;
+ if($viewPage->dom->category->getText() != $categoryLang[$kanban['type']]) return $this->failed('类型错误');
+ // 检查日期是否正确，如果是产品型项目，就使用hasprojectend元素，因为产品型项目比项目型项目多了一个关联产品区块，所以“计划完成”的元素不能通用
+ if($categoryLang[$kanban['type']] == '产品型')
+ {
+ if(isset($kanban['end']))
+ {
+ $endtext = $viewPage->dom->hasproductend->getText();
+ if($endtext != $kanban['end']) return $this->failed('日期错误');
+ }
+ else
+ {
+ $endtext = trim($viewPage->dom->hasproductend->getText());
+ if($endtext != '长期') return $this->failed('日期错误');
+ }
+ }
+ // 如果是项目型项目，就使用noproductend元素
+ else
+ {
+ if(isset($kanban['end']))
+ {
+ $endtext = $viewPage->dom->noproductend->getText();
+ if($endtext != $kanban['end']) return $this->failed('日期错误');
+ }
+ else
+ {
+ $endtext = trim($viewPage->dom->noproductend->getText());
+ if($endtext != '长期') return $this->failed('日期错误');
+ }
+ }
+
+ return $this->success();
+ }
+ }
+}
diff --git a/module/project/test/ui/bug.php b/module/project/test/ui/bug.php
index 270ac9482f..bbe0083b34 100644
--- a/module/project/test/ui/bug.php
+++ b/module/project/test/ui/bug.php
@@ -22,6 +22,12 @@ cid=1
- 执行tester模块的assignBug方法，参数是'admin'
- 最终测试状态 @SUCCESS
- 测试结果 @单个指派Bug成功
+ - 执行tester模块的batchAssignBug方法，参数是'admin'
+ - 最终测试状态 @SUCCESS
+ - 测试结果 @批量指派Bug成功
+- 执行tester模块的confirmBug方法，参数是'admin'
+ - 最终测试状态 @SUCCESS
+ - 测试结果 @确认Bug成功
*/
@@ -83,5 +89,9 @@ r($tester->switchProduct('firstProduct', '5')) && p('status,message') && e('SUCC
r($tester->switchProduct('secondProduct', '5')) && p('status,message') && e('SUCCESS,切换secondProduct查看数据成功');
/* 单个指派Bug */
r($tester->assignBug('admin')) && p('status,message') && e('SUCCESS,单个指派Bug成功');
+/* 批量指派Bug */
+r($tester->batchAssignBug('admin')) && p('status,message') && e('SUCCESS,批量指派Bug成功');
+#/* 确认Bug */
+r($tester->confirmBug('admin')) && p('status,message') && e('SUCCESS,确认Bug成功');
$tester->closeBrowser();
diff --git a/module/project/test/ui/createkanban.php b/module/project/test/ui/createkanban.php
new file mode 100755
index 0000000000..caaee4860d
--- /dev/null
+++ b/module/project/test/ui/createkanban.php
@@ -0,0 +1,42 @@
+#!/usr/bin/env php
+login();
+
+//设置看板项目数据
+$kanban = array(
+ array('name' => '', 'end' => date('Y-m-d', strtotime('+30 days'))),
+ array('name' => '一个产品型看板项目'.time(), 'end' => ''),
+ array('type' => 1, 'name' => '一个产品型看板项目'.time(), 'end' => date('Y-m-d', strtotime('+1 month')), 'PM' => 'admin'),
+ array('type' => 1, 'name' => '一个长期的产品型看板项目'.time(), 'PM' => 'admin'),
+ array('type' => 0, 'name' => '一个项目型看板项目'.time(), 'end' => date('Y-m-d', strtotime('+1 month')), 'PM' => 'admin'),
+);
+
+r($tester->checkInput($kanban['0'])) && p('message,status') && e('创建看板项目表单页提示信息正确,SUCCESS'); // 创建看板项目缺少项目名称
+r($tester->checkInput($kanban['1'])) && p('message,status') && e('创建看板项目表单页提示信息正确,SUCCESS'); // 创建看板项目计划完成时间置空
+r($tester->checkInput($kanban['2'])) && p('status') && e('SUCCESS'); // 创建有日期的产品型看板项目
+r($tester->checkInput($kanban['3'])) && p('status') && e('SUCCESS'); // 创建一个长期的产品型看板项目
+r($tester->checkInput($kanban['4'])) && p('status') && e('SUCCESS'); // 创建有日期的项目型看板项目
+
+$tester->closeBrowser();
diff --git a/module/project/test/ui/page/browse.php b/module/project/test/ui/page/browse.php
index c147ba8a9a..54d159f58a 100644
--- a/module/project/test/ui/page/browse.php
+++ b/module/project/test/ui/page/browse.php
@@ -48,7 +48,9 @@ class browsePage extends page
'moreTab' => "//*[@id='featureBar']/menu/li[5]/a/span[1]",
'suspended' => "//*[@id='more']/menu/menu/li[1]/a/div/div",
'closed' => "//*[@id='more']/menu/menu/li[2]/a/div/div",
- 'num' => "//*[@id='table-project-browse']/div[3]/div[2]/strong"
+ 'num' => "//*[@id='table-project-browse']/div[3]/div[2]/strong",
+ /*创建看板项目*/
+ 'kanbanName' => "//*[@id='mainContent']/div[2]/div/div/div[2]/div[1]/div/div[2]/div/a"
);
$this->dom->xpath = array_merge($this->dom->xpath, $xpath);
}
diff --git a/module/project/test/ui/page/bug.php b/module/project/test/ui/page/bug.php
old mode 100755
new mode 100644
index 0436ae3125..5159cc7a06
--- a/module/project/test/ui/page/bug.php
+++ b/module/project/test/ui/page/bug.php
@@ -6,26 +6,35 @@ class bugPage extends page
parent::__construct($webdriver);
$xpath = array(
/* 标签 */
- 'allTab' => "//*[@id='featureBar']/menu/li[1]/a",
- 'unresolvedTab' => "//*[@id='featureBar']/menu/li[2]/a",
- 'bugNum' => "//*[@id='table-project-bug']/div[3]/div[2]/strong",
+ 'allTab' => "//*[@id='featureBar']/menu/li[1]/a",
+ 'unresolvedTab' => "//*[@id='featureBar']/menu/li[2]/a",
+ 'bugNum' => "//*[@id='table-project-bug']/div[3]/div[2]/strong",
/* 1.5级产品导航 */
- 'dropMenu' => "//*[@id='pick-project-menu']",
- 'firstProduct' => "//*[@id='pick-pop-project-menu']/div[2]/div/div[1]/menu/li[2]/div",
- 'secondProduct' => "//*[@id='pick-pop-project-menu']/div[2]/div/div[1]/menu/li[3]/div",
+ 'dropMenu' => "//*[@id='pick-project-menu']",
+ 'firstProduct' => "//*[@id='pick-pop-project-menu']/div[2]/div/div[1]/menu/li[2]/div",
+ 'secondProduct' => "//*[@id='pick-pop-project-menu']/div[2]/div/div[1]/menu/li[3]/div",
/* 列表 */
- 'firstAssign' => "//*[@id='table-project-bug']/div[2]/div[2]/div/div[7]/div/a/span",
- 'secondCheckbox' => "//*[@id='table-project-bug']/div[2]/div[1]/div/div[3]/div/div/label",
- 'batchAssignTo' => "//*[@id='table-project-bug']/div[3]/nav[1]/button/span[2]",
- 'assignToAdmin' => "//*[@class='popover show fade dropdown in']/menu/menu/li[1]/a/div/div",
- 'confirmBtn' => "//*[@id='table-project-bug']/div[2]/div[3]/div/div[1]/div/nav/a[1]",
- 'firstConfirm' => "//*[@id='table-project-bug']/div[2]/div[2]/div/div[6]/div",
+ 'firstAssign' => "//*[@id='table-project-bug']/div[2]/div[2]/div/div[7]/div/a/span",
+ 'secondCheckbox' => "//*[@id='table-project-bug']/div[2]/div[1]/div/div[3]/div/div/label",
+ 'batchAssignTo' => "//*[@id='table-project-bug']/div[3]/nav[1]/button/span[2]",
+ 'assignToAdmin' => "//*[@class='popover show fade dropdown in']/menu/menu/li[1]/a/div/div",
+ 'confirmBtn' => "//*[@id='table-project-bug']/div[2]/div[3]/div/div[1]/div/nav/a[1]",
+ 'firstConfirm' => "//*[@id='table-project-bug']/div[2]/div[2]/div/div[6]/div",
+ 'resolveBtn' => "//*[@id='table-project-bug']/div[2]/div[3]/div/div[2]/div/nav/a[1]/i",
+ 'secondStatus' => "//*[@id='table-project-bug']/div[2]/div[2]/div/div[11]/div/span",
/* 指派页面 */
- 'assignTo' => "//*[@id='assignedTo']/div/input",
- 'submitBtn' => "//*[@class='form load-indicator form-ajax no-morph form-horz']/div[4]/div/button/span",
+ 'assignTo' => "//*[@id='assignedTo']/div/input",
+ 'submitBtn' => "//*[@class='form load-indicator form-ajax no-morph form-horz']/div[4]/div/button/span",
/* 确认页面 */
'confirmAssignTo' => "//*[@name='assignedTo']",
'confirm' => "//*[@class='form load-indicator form-ajax no-morph form-horz']/div[8]/div/button/span",
+ /* 解决页面 */
+ 'resolution' => "//*[@name='resolution']",
+ 'build' => "//*[@name='resolvedBuild']",
+ 'resolve' => "//*[@class='toolbar form-actions form-group no-label']/button/span",
+ 'resolveTitle' => "//*[@class='modal modal-async load-indicator modal-trans show in']/div/div/div[1]/div/div[2]/span[1]",
+ /* 搜索列表 */
+ 'status' => "//*[@id='table-project-bug']/div[2]/div[2]/div/div[3]/div/span",
);
$this->dom->xpath = array_merge($this->dom->xpath, $xpath);
}
diff --git a/module/project/test/ui/resolvebug.php b/module/project/test/ui/resolvebug.php
new file mode 100755
index 0000000000..7b94b0f4e5
--- /dev/null
+++ b/module/project/test/ui/resolvebug.php
@@ -0,0 +1,77 @@
+#!/usr/bin/env php
+id->range('1-2');
+$product->name->range('产品1, 产品2');
+$product->type->range('normal');
+$product->gen(2);
+
+$project = zenData('project');
+$project->id->range('1');
+$project->project->range('0');
+$project->model->range('scrum');
+$project->type->range('project');
+$project->auth->range('extend');
+$project->storytype->range('`story,epic,requirement`');
+$project->path->range('`,1,`');
+$project->grade->range('1');
+$project->name->range('敏捷项目1');
+$project->hasProduct->range('1');
+$project->status->range('wait');
+$project->acl->range('open');
+$project->gen(1);
+
+$projectProduct = zenData('projectproduct');
+$projectProduct->project->range('1');
+$projectProduct->product->range('1{1}, 2{1}');
+$projectProduct->gen(2);
+
+$bug = zenData('bug');
+$bug->id->range('1-10');
+$bug->project->range('1');
+$bug->product->range('1{5}, 2{5}');
+$bug->execution->range('0');
+$bug->title->range('Bug1, Bug2, Bug3, Bug4, Bug5, Bug6, Bug7, Bug8, Bug9, Bug10');
+$bug->status->range('active{2}, resolved{2}, closed{1}, active{2}, resolved{2}, closed{1}');
+$bug->assignedTo->range('[]');
+$bug->gen(10);
+
+$team = zendata('team');
+$team->id->range('1');
+$team->root->range('1');
+$team->type->range('project');
+$team->account->range('admin');
+$team->join->range('(-2M)-(-M):1D')->type('timestamp')->format('YY/MM/DD');
+$team->gen(1);
+
+$tester = new bugTester();
+$tester->login();
+
+$bug = array(
+ array('resolution' => '', 'build' => ''),
+ array('resolution' => '已解决', 'build' => '主干'),
+);
+
+r($tester->resolveBug($bug[0])) && p('status,message') && e('SUCCESS,解决Bug表单页提示信息正确');
+r($tester->resolveBug($bug[1])) && p('status,message') && e('SUCCESS,解决Bug成功');
+
+$tester->closeBrowser();
diff --git a/module/project/ui/ajaxgetdropmenu.html.php b/module/project/ui/ajaxgetdropmenu.html.php
index ccc8f57b03..0369a50880 100644
--- a/module/project/ui/ajaxgetdropmenu.html.php
+++ b/module/project/ui/ajaxgetdropmenu.html.php
@@ -61,11 +61,12 @@ foreach($projects as $programID => $programProjects)
$group = $getProjectGroup($project);
$item = array();
- $item['id'] = $project->id;
- $item['text'] = $project->name;
- $item['icon'] = $project->model == 'scrum' ? 'sprint' : $project->model;
- $item['keys'] = zget(common::convert2Pinyin(array($project->name)), $project->name, '');
- $item['url'] = sprintf($link, $project->id);
+ $item['id'] = $project->id;
+ $item['text'] = $project->name;
+ $item['icon'] = $project->model == 'scrum' ? 'sprint' : $project->model;
+ $item['keys'] = zget(common::convert2Pinyin(array($project->name)), $project->name, '');
+ $item['url'] = sprintf($link, $project->id);
+ $item['involved'] = isset($involvedProjects[$project->id]);
if((empty($project->multiple) || $project->type == 'kanban' || $project->model == 'kanban') && strpos($link, 'ajaxSwitchBelong') === false) $item['url'] = helper::createLink('project', 'index', "projectID={$project->id}");
diff --git a/module/project/ui/execution.html.php b/module/project/ui/execution.html.php
index 32ce79149f..c0bafcc61b 100644
--- a/module/project/ui/execution.html.php
+++ b/module/project/ui/execution.html.php
@@ -62,17 +62,12 @@ $fnGenerateCols = function() use ($config, $project)
$fieldList['actions']['actionsMap']['edit']['data-size'] = 'md';
$fieldList['actions']['actionsMap']['edit']['url'] = createLink('programplan', 'edit', "stageID={rawID}&projectID={projectID}");
}
- if(!$this->cookie->showStage)
+ if(!$this->cookie->showStage && !$this->cookie->showTask)
{
$fieldList['name']['type'] = 'title';
if(!in_array($project->model, array('waterfall', 'waterfallplus', 'ipd'))) unset($fieldList['name']['nestedToggle']);
}
- if(!$this->cookie->showTask)
- {
- $fieldList['name']['type'] = 'title';
- if(!in_array($project->model, array('waterfall', 'waterfallplus', 'ipd'))) unset($fieldList['name']['nestedToggle']);
- }
if(!$project->hasProduct) unset($fieldList['productName']);
return array_values($fieldList);
diff --git a/module/project/zen.php b/module/project/zen.php
index 08c341feaf..f4fa31c008 100755
--- a/module/project/zen.php
+++ b/module/project/zen.php
@@ -1736,22 +1736,22 @@ class projectZen extends project
$cardList = !empty($laneData[$columnKey]) ? $laneData[$columnKey] : array();
foreach($cardList as $card)
{
- $columnKey = $columnKey == 'doing' ? 'doingProjects' : $columnKey;
- $items["lane$laneKey"][$columnKey][] = array('id' => $card->id, 'name' => $card->id, 'title' => $card->name, 'status' => $card->status, 'cardType' => 'project', 'delay' => !empty($card->delay) ? $card->delay : 0, 'progress' => $card->progress);
+ $cardColumnKey = $columnKey == 'doing' ? 'doingProjects' : $columnKey;
+ $items["lane$laneKey"][$cardColumnKey][] = array('id' => $card->id, 'name' => $card->id, 'title' => $card->name, 'status' => $card->status, 'cardType' => 'project', 'delay' => !empty($card->delay) ? $card->delay : 0, 'progress' => $card->progress);
- if(!isset($columnCards[$columnKey])) $columnCards[$columnKey] = 0;
- $columnCards[$columnKey] ++;
+ if(!isset($columnCards[$cardColumnKey])) $columnCards[$cardColumnKey] = 0;
+ $columnCards[$cardColumnKey] ++;
- if($columnKey == 'doingProjects')
+ if($cardColumnKey == 'doingProjects')
{
if(!empty($latestExecutions[$card->id]))
{
- $columnKey = 'doingExecutions';
+ $cardColumnKey = 'doingExecutions';
$execution = $latestExecutions[$card->id];
- $items["lane$laneKey"][$columnKey][] = array('id' => $execution->id, 'name' => $execution->id, 'title' => $execution->name, 'status' => $execution->status, 'cardType' => 'execution', 'delay' => !empty($execution->delay) ? $execution->delay : 0, 'progress' => $execution->progress);
+ $items["lane$laneKey"][$cardColumnKey][] = array('id' => $execution->id, 'name' => $execution->id, 'title' => $execution->name, 'status' => $execution->status, 'cardType' => 'execution', 'delay' => !empty($execution->delay) ? $execution->delay : 0, 'progress' => $execution->progress);
- if(!isset($columnCards[$columnKey])) $columnCards[$columnKey] = 0;
- $columnCards[$columnKey] ++;
+ if(!isset($columnCards[$cardColumnKey])) $columnCards[$cardColumnKey] = 0;
+ $columnCards[$cardColumnKey] ++;
}
}
}
diff --git a/module/projectbuild/test/lib/browse.ui.class.php b/module/projectbuild/test/lib/browse.ui.class.php
new file mode 100644
index 0000000000..22b8037f64
--- /dev/null
+++ b/module/projectbuild/test/lib/browse.ui.class.php
@@ -0,0 +1,43 @@
+initForm('projectbuild', 'browse', array('projectID' => '1' ), 'appIframe-project');
+ $form->wait(2);
+ if($product != '') $form->dom->product->picker($product);
+ $form->wait(1);
+ $string = $form->dom->num->getText();
+ $num = preg_replace('/\D/', '', $string);
+ if($num == $expectNum) return $this->success('版本显示正确');
+ return $this->failed('版本显示错误');
+ }
+
+ /**
+ * 搜索项目版本。
+ * Search projectbuild.
+ *
+ * @param array $build
+ * @access public
+ */
+ public function searchBuild($build)
+ {
+ $form = $this->initForm('projectbuild', 'browse', array('projectID' => '1' ), 'appIframe-project');
+ $form->dom->search($searchList = array("名称,=, {$build}"));
+ $form->wait(2);
+
+ //断言检查搜索是否成功
+ if($form->dom->buildNameBrowse->getText() != $build) return $this->failed('项目版本搜索失败');
+ return $this->success('项目版本搜索成功');
+ }
+}
diff --git a/module/projectbuild/test/lib/view.ui.class.php b/module/projectbuild/test/lib/view.ui.class.php
new file mode 100644
index 0000000000..cbb6d3e63e
--- /dev/null
+++ b/module/projectbuild/test/lib/view.ui.class.php
@@ -0,0 +1,34 @@
+initForm('projectbuild', 'browse', array('projectID' => 1), 'appIframe-project');
+ $buildNameBrowse = $browsePage->dom->buildNameBrowse->getText();
+ $productBrowse = $browsePage->dom->productBrowse->getText();
+ $executionBrowse = $browsePage->dom->executionBrowse->getText();
+ $browsePage->dom->buildNameBrowse->click();
+
+ //在详情页面，获取项目版本字段信息
+ $viewPage = $this->loadPage('projectbuild', 'view');
+ $viewPage->wait(2);
+ $viewPage->dom->basic->click();
+ $viewPage->wait(2);
+ $basicbuildName = $viewPage->dom->basicBuildName->getText();
+ $basicProduct = $viewPage->dom->basicProduct->getText();
+ $basicExecution = $viewPage->dom->basicExecution->getText();
+
+ //断言检查版本详情页显示是否正确
+ if($buildNameBrowse != $basicbuildName) return $this->failed('项目版本详情页名称显示不正确');
+ if($productBrowse != $basicProduct) return $this->failed('项目版本详情页所属产品显示不正确');
+ if($executionBrowse != $basicExecution) return $this->failed('项目版本详情页所属执行显示不正确');
+ return $this->success('项目版本详情查看成功');
+ }
+}
diff --git a/module/projectbuild/test/ui/browse.php b/module/projectbuild/test/ui/browse.php
new file mode 100755
index 0000000000..d583eadbdc
--- /dev/null
+++ b/module/projectbuild/test/ui/browse.php
@@ -0,0 +1,91 @@
+#!/usr/bin/env php
+id->range('1,2');
+$product->name->range('产品1,产品2');
+$product->type->range('normal');
+$product->gen(2);
+
+$project = zenData('project');
+$project->id->range('1');
+$project->project->range('0');
+$project->model->range('scrum');
+$project->type->range('project');
+$project->attribute->range('[]');
+$project->auth->range('[]');
+$project->parent->range('0');
+$project->grade->range('1');
+$project->name->range('敏捷项目1');
+$project->path->range('`,1,`');
+$project->begin->range('(-3w)-(-2w):1D')->type('timestamp')->format('YY/MM/DD');
+$project->end->range('(+5w)-(+6w):1D')->type('timestamp')->format('YY/MM/DD');
+$project->acl->range('open');
+$project->status->range('wait');
+$project->gen(1);
+
+$execution = zenData('project');
+$execution->id->range('2-3');
+$execution->project->range('1');
+$execution->type->range('sprint');
+$execution->attribute->range('[]');
+$execution->auth->range('[]');
+$execution->parent->range('1');
+$execution->grade->range('1');
+$execution->name->range('项目1迭代1, 项目1迭代2');
+$execution->path->range('`,1,2,`, `,1,3,`');
+$execution->begin->range('(-3w)-(-2w):1D')->type('timestamp')->format('YY/MM/DD');
+$execution->end->range('(+5w)-(+6w):1D')->type('timestamp')->format('YY/MM/DD');
+$execution->acl->range('open');
+$execution->status->range('wait');
+$execution->gen(2, false);
+
+$projectProduct = zenData('projectproduct');
+$projectProduct->project->range('1{2},2{2}');
+$projectProduct->product->range('1,2');
+$projectProduct->gen(4);
+
+$build = zenData('build');
+$build->id->range('1-6');
+$build->project->range('1');
+$build->product->range('1{1},2{5}');
+$build->branch->range('0');
+$build->execution->range('2');
+$build->name->range('版本1,版本2,版本3,版本4,版本5,版本6');
+$build->stories->range('[]');
+$build->bugs->range('[]');
+$build->scmPath->range('[]');
+$build->filePath->range('[]');
+$build->desc->range('描述111');
+$build->builder->range('admin');
+$build->deleted->range('0');
+$build->gen(6);
+
+$tester = new browseTester();
+$tester->login();
+
+r($tester->switchProduct('产品1', '1')) && p('status,message') && e('SUCCESS,版本显示正确'); //查看产品1下的版本
+r($tester->switchProduct('产品2', '5')) && p('status,message') && e('SUCCESS,版本显示正确'); //切换产品，查看产品2下版本
+r($tester->searchBuild('版本2')) && p('status,message') && e('SUCCESS,项目版本搜索成功'); //项目版本列表搜索版本
+
+$tester->closeBrowser();
diff --git a/module/projectbuild/test/ui/page/browse.php b/module/projectbuild/test/ui/page/browse.php
new file mode 100755
index 0000000000..23dbf27138
--- /dev/null
+++ b/module/projectbuild/test/ui/page/browse.php
@@ -0,0 +1,26 @@
+ "//*[@id='table-projectbuild-browse']/div[2]/div[3]/div/div/div/nav/a[4]/i",
+ 'waitTab' => "//*[@id='featureBar']/menu/li[2]/a/span[1]",
+ 'builddTab' => "//*[@id='featureBar']/menu/li[3]/a/span[1]",
+ 'terminatedTab' => "//*[@id='featureBar']/menu/li[4]/a/span[1]",
+ 'buildBtn' => "//*[@id='table-projectbuild-browse']/div[2]/div[3]/div/div/div/nav/a[3]/i",
+ 'buildSubmit' => "//*[@id='zin_projectbuild_publish_form']/div[4]/div/button/span",
+ 'terminateBtn' => "//*[@class='dtable-cell-content']/nav/a[3]/i",
+ 'terminateConfirm' => "//*[@class='modal-footer']/nav/button/span",
+ 'activeBtn' => "//*[@class='toolbar']/a[3]/i",
+ 'activeConfirm' => "//*[@class='modal-footer']/nav/button/span",
+ 'buildName' => "//*[@class='dtable-cells-container']/div[2]/div/a",
+ 'buildNameBrowse' => "//*[@id='mainContent']/div/div/div[2]/div[1]/div/div[2]/div/a",
+ 'productBrowse' => "//*[@id='table-projectbuild-browse']/div[2]/div[2]/div/div[1]/div",
+ 'executionBrowse' => "//*[@id='table-projectbuild-browse']/div[2]/div[2]/div/div[2]/div",
+ 'num' => "//*[@id='table-projectbuild-browse']/div[3]/nav/div[1]",
+ );
+ $this->dom->xpath = array_merge($this->dom->xpath, $xpath);
+ }
+}
diff --git a/module/projectbuild/test/ui/page/view.php b/module/projectbuild/test/ui/page/view.php
index 4b023e8f17..f641596859 100644
--- a/module/projectbuild/test/ui/page/view.php
+++ b/module/projectbuild/test/ui/page/view.php
@@ -8,6 +8,7 @@ class viewPage extends page
$xpath = array(
'basic' => "//*[@id='mainContent']/div[2]/div/div/div/div/ul/li[4]/a/span",
'basicBuildName' => "//*[@class='section']/table/tbody[1]/tr[2]/td",
+ 'basicProduct' => "//*[@class='section']/table/tbody[1]/tr[1]/td",
'basicExecution' => "//*[@class='section']/table/tbody[1]/tr[3]/td",
/* 版本关联研发需求的元素 */
'linkStoryBtn' => "//*[@id='mainContent']/div[2]/div/div/div/div[2]/div/div/button/span",
diff --git a/module/projectbuild/test/ui/view.php b/module/projectbuild/test/ui/view.php
new file mode 100644
index 0000000000..e5e5e6c8a7
--- /dev/null
+++ b/module/projectbuild/test/ui/view.php
@@ -0,0 +1,83 @@
+#!/usr/bin/env php
+id->range('1');
+$product->name->range('产品1');
+$product->type->range('normal');
+$product->gen(1);
+
+$project = zenData('project');
+$project->id->range('1');
+$project->project->range('0');
+$project->model->range('scrum');
+$project->type->range('project');
+$project->attribute->range('[]');
+$project->auth->range('[]');
+$project->parent->range('0');
+$project->grade->range('1');
+$project->name->range('敏捷项目1');
+$project->path->range('`,1,`');
+$project->begin->range('(-3w)-(-2w):1D')->type('timestamp')->format('YY/MM/DD');
+$project->end->range('(+5w)-(+6w):1D')->type('timestamp')->format('YY/MM/DD');
+$project->acl->range('open');
+$project->status->range('wait');
+$project->gen(1);
+
+$execution = zenData('project');
+$execution->id->range('2-3');
+$execution->project->range('1');
+$execution->type->range('sprint');
+$execution->attribute->range('[]');
+$execution->auth->range('[]');
+$execution->parent->range('1');
+$execution->grade->range('1');
+$execution->name->range('项目1迭代1, 项目1迭代2');
+$execution->path->range('`,1,2,`, `,1,3,`');
+$execution->begin->range('(-3w)-(-2w):1D')->type('timestamp')->format('YY/MM/DD');
+$execution->end->range('(+5w)-(+6w):1D')->type('timestamp')->format('YY/MM/DD');
+$execution->acl->range('open');
+$execution->status->range('wait');
+$execution->gen(2, false);
+
+$projectProduct = zenData('projectproduct');
+$projectProduct->project->range('1,2,3');
+$projectProduct->product->range('1');
+$projectProduct->gen(3);
+
+$build = zenData('build');
+$build->id->range('1');
+$build->project->range('1');
+$build->product->range('1');
+$build->branch->range('0');
+$build->execution->range('2');
+$build->name->range('版本1');
+$build->stories->range('[]');
+$build->bugs->range('[]');
+$build->scmPath->range('[]');
+$build->filePath->range('[]');
+$build->desc->range('描述111');
+$build->deleted->range('0');
+$build->gen(1);
+
+
+$tester = new buildViewTester();
+$tester->login();
+
+r($tester->checkBuildView()) && p('message,status') && e('项目版本详情查看成功,SUCCESS'); //项目版本详情检查
+
+$tester->closeBrowser();
diff --git a/module/repo/config/dtable.php b/module/repo/config/dtable.php
index b6ab5f048a..50ffa52a48 100644
--- a/module/repo/config/dtable.php
+++ b/module/repo/config/dtable.php
@@ -132,12 +132,14 @@ $config->repo->commentDtable->fieldList['commit']['hint'] = true;
$config->repo->commentDtable->fieldList['time'] = $config->repo->repoDtable->fieldList['time'];
$config->repo->commentDtable->fieldList['time']['name'] = 'time';
-$config->repo->commentDtable->fieldList['committer'] = $config->repo->repoDtable->fieldList['committer'];
-$config->repo->commentDtable->fieldList['comment'] = $config->repo->repoDtable->fieldList['comment'];
+$config->repo->commentDtable->fieldList['time']['type'] = 'datetime';
-$config->repo->commentDtable->fieldList['comment']['name'] = 'originalComment';
+$config->repo->commentDtable->fieldList['committer'] = $config->repo->repoDtable->fieldList['committer'];
$config->repo->commentDtable->fieldList['committer']['name'] = 'committer';
+$config->repo->commentDtable->fieldList['comment'] = $config->repo->repoDtable->fieldList['comment'];
+$config->repo->commentDtable->fieldList['comment']['name'] = 'originalComment';
+
$config->repo->logDtable = new stdclass();
$config->repo->logDtable->fieldList['id']['hidden'] = true;
diff --git a/module/serverroom/control.php b/module/serverroom/control.php
index 6e6043d4d3..36f32ae811 100644
--- a/module/serverroom/control.php
+++ b/module/serverroom/control.php
@@ -101,7 +101,8 @@ class serverroom extends control
$this->action->logHistory($actionID, $changes);
}
- return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'load' => $this->createLink('serverroom', 'view', "room=$roomID")));
+ $loadUrl = $this->app->tab == 'devops' ? true : $this->createLink('serverroom', 'view', "room=$roomID");
+ return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'load' => $loadUrl));
}
$this->view->title = $this->lang->serverroom->edit;
diff --git a/module/serverroom/model.php b/module/serverroom/model.php
index 2ba954a4e2..4518bd3676 100644
--- a/module/serverroom/model.php
+++ b/module/serverroom/model.php
@@ -81,7 +81,6 @@ class serverroomModel extends model
$rooms[$roomID] = $name;
}
- $rooms[0] = '';
return $rooms;
}
diff --git a/module/serverroom/ui/edit.html.php b/module/serverroom/ui/edit.html.php
index feee2da796..9cb7a684f5 100644
--- a/module/serverroom/ui/edit.html.php
+++ b/module/serverroom/ui/edit.html.php
@@ -16,6 +16,7 @@ formPanel
(
set::id('serverroomCreateForm'),
set::title($lang->serverroom->edit),
+ set::submitBtnText($lang->save),
formRow
(
formGroup
diff --git a/module/serverroom/ui/view.html.php b/module/serverroom/ui/view.html.php
index 9313939504..5522c932ea 100644
--- a/module/serverroom/ui/view.html.php
+++ b/module/serverroom/ui/view.html.php
@@ -76,6 +76,7 @@ detailBody
),
history
(
+ set::objectID($serverRoom->id),
set::commentUrl(createLink('action', 'comment', array('objectType' => 'serverroom', 'objectID' => $serverRoom->id)))
),
floatToolbar
diff --git a/module/story/config/dtable.php b/module/story/config/dtable.php
index 8ca8e9526d..68ce4212d4 100644
--- a/module/story/config/dtable.php
+++ b/module/story/config/dtable.php
@@ -207,6 +207,22 @@ $config->story->dtable->fieldList['caseCount']['link'] = "RAWJSstory->dtable->fieldList['caseCount']['data-toggle'] = 'modal';
$config->story->dtable->fieldList['caseCount']['group'] = 7;
+if($config->edition != 'open')
+{
+ $config->story->dtable->fieldList['relatedObject']['name'] = 'relatedObject';
+ $config->story->dtable->fieldList['relatedObject']['title'] = $lang->custom->relateObject;
+ $config->story->dtable->fieldList['relatedObject']['sortType'] = false;
+ $config->story->dtable->fieldList['relatedObject']['width'] = '70';
+ $config->story->dtable->fieldList['relatedObject']['type'] = 'text';
+ $config->story->dtable->fieldList['relatedObject']['link'] = common::hasPriv('custom', 'showRelationGraph') ? "RAWJSRAWJS" : null;
+ $config->story->dtable->fieldList['relatedObject']['data-toggle'] = 'modal';
+ $config->story->dtable->fieldList['relatedObject']['data-size'] = 'lg';
+ $config->story->dtable->fieldList['relatedObject']['show'] = true;
+ $config->story->dtable->fieldList['relatedObject']['group'] = 7;
+ $config->story->dtable->fieldList['relatedObject']['flex'] = false;
+ $config->story->dtable->fieldList['relatedObject']['align'] = 'center';
+}
+
$config->story->dtable->fieldList['childItem']['name'] = 'childItem';
$config->story->dtable->fieldList['childItem']['title'] = $lang->story->childItem;
$config->story->dtable->fieldList['childItem']['sortType'] = false;
diff --git a/module/story/control.php b/module/story/control.php
index 0fd72b89cb..c22a94fa14 100755
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -514,7 +514,7 @@ class story extends control
$story = $this->story->getById($storyID, $version, true);
$product = $this->product->getByID((int)$story->product);
- if($tab == 'product' and !empty($product->shadow)) return $this->send(array('result' => 'success', 'open' => array('url' => $uri, 'app' => 'project')));
+ if(!isInModal() && $tab == 'product' && !empty($product->shadow)) return $this->send(array('result' => 'success', 'open' => array('url' => $uri, 'app' => 'project')));
if(!$story || (isset($story->type) && $story->type != $storyType))
{
diff --git a/module/story/model.php b/module/story/model.php
index baef3e9e8c..d31d64eff1 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -571,7 +571,8 @@ class storyModel extends model
$this->loadModel('score')->create('story', 'create',$storyID);
/* Create actions. Record submit review action. */
- $action = $bugID == 0 ? (empty($storyFrom) ? 'Opened' : 'From' . ucfirst($storyFrom)) : 'Frombug';
+ $bugAction = empty($storyFrom) ? 'Opened' : 'From' . ucfirst($storyFrom);
+ $action = $bugID == 0 ? $bugAction : 'Frombug';
$this->action->create('story', $storyID, $action, '', $extra);
if($story->status == 'reviewing') $this->action->create('story', $storyID, 'submitReview');
if(!empty($story->assignedTo)) $this->action->create('story', $storyID, 'Assigned', '', $story->assignedTo);
@@ -906,7 +907,7 @@ class storyModel extends model
unset($oldStory->parent, $story->parent);
if($this->config->edition != 'open' && $oldStory->feedback) $this->loadModel('feedback')->updateStatus('story', $oldStory->feedback, $story->status, $oldStory->status);
- if(isset($story->reviewer))
+ if(!empty($story->reviewer))
{
$oldReviewer = $this->getReviewerPairs($storyID, $oldStory->version);
$oldStory->reviewers = implode(',', array_keys($oldReviewer));
@@ -1440,8 +1441,9 @@ class storyModel extends model
*/
public function subdivide(int $storyID, array $SRList): void
{
- $now = helper::now();
- $oldStory = $this->dao->findById($storyID)->from(TABLE_STORY)->fetch();
+ $now = helper::now();
+ $oldStory = $this->dao->findById($storyID)->from(TABLE_STORY)->fetch();
+ $storyType = $this->dao->select('id,type')->from(TABLE_STORY)->where('id')->in($SRList)->fetchPairs('id');
/* Set parent to child story. */
foreach($SRList as $childStoryID)
@@ -1454,6 +1456,17 @@ class storyModel extends model
->set('path')->eq($path)
->where('id')->eq($childStoryID)
->exec();
+
+ if($this->config->edition != 'open')
+ {
+ $relation = new stdClass();
+ $relation->AID = $storyID;
+ $relation->AType = $oldStory->type;
+ $relation->relation = 'subdivideinto';
+ $relation->BID = $childStoryID;
+ $relation->BType = $storyType[$childStoryID];
+ $this->dao->replace(TABLE_RELATION)->data($relation)->exec();
+ }
}
$this->computeEstimate($storyID);
@@ -1483,6 +1496,8 @@ class storyModel extends model
$oldStory = $this->dao->findById($storyID)->from(TABLE_STORY)->fetch();
$story = $postData;
+ $this->loadModel($oldStory->type);
+
if(!empty($story->duplicateStory))
{
$duplicateStoryID = $this->dao->select('id')->from(TABLE_STORY)->where('id')->eq($story->duplicateStory)->fetch();
@@ -2056,7 +2071,20 @@ class storyModel extends model
$this->dao->insert(TABLE_TASKSPEC)->data($taskSpec)->autoCheck()->exec();
if(dao::isError()) return false;
- if($task->story) $this->setStage($task->story);
+ if($task->story)
+ {
+ $this->setStage($task->story);
+ if($this->config->edition != 'open')
+ {
+ $relation = new stdClass();
+ $relation->relation = 'generated';
+ $relation->AID = $task->story;
+ $relation->AType = 'story';
+ $relation->BID = $taskID;
+ $relation->BType = 'task';
+ $this->dao->replace(TABLE_RELATION)->data($relation)->exec();
+ }
+ }
$this->action->create('task', $taskID, 'Opened', '');
}
@@ -2159,6 +2187,14 @@ class storyModel extends model
{
$this->loadModel('demand')->changeDemandStatus($oldStory->demand, '0', true);
$this->loadModel('action')->create('demand', $oldStory->demand, 'restored', '', $storyID);
+
+ $relation = new stdClass();
+ $relation->AID = $oldStory->demand;
+ $relation->AType = 'demand';
+ $relation->relation = 'subdivideinto';
+ $relation->BID = $storyID;
+ $relation->BType = $oldStory->type;
+ $this->dao->replace(TABLE_RELATION)->data($relation)->exec();
}
return $changes;
}
@@ -4495,7 +4531,8 @@ class storyModel extends model
{
/* When the review result of the changed story is clarify, the status should be changing. */
$isChanged = $oldStory->changedBy ? true : false;
- $story->status = $isChanged ? 'changing' : 'draft';
+ $story->status = $isChanged ? 'changing' : 'draft';
+ $story->reviewedBy = '';
}
if($result == 'revert')
diff --git a/module/story/tao.php b/module/story/tao.php
index 42399e7761..8ea56a955e 100644
--- a/module/story/tao.php
+++ b/module/story/tao.php
@@ -826,6 +826,17 @@ class storyTao extends storyModel
$changes = common::createChanges($oldParentStory, $newParentStory);
if(!empty($changes)) $this->action->logHistory($actionID, $changes);
$this->updateLane($oldParentStory->id, $oldParentStory->type);
+
+ if($this->config->edition != 'open')
+ {
+ $this->dao->delete()->from(TABLE_RELATION)
+ ->where('relation')->eq('subdivideinto')
+ ->andWhere('AID')->eq($oldStory->parent)
+ ->andWhere('AType')->eq($oldParentStory->type)
+ ->andWhere('BID')->eq($oldStory->id)
+ ->andWhere('BType')->eq($oldStory->type)
+ ->exec();
+ }
}
if($story->parent > 0)
@@ -848,6 +859,17 @@ class storyTao extends storyModel
$changes = common::createChanges($parentStory, $newParentStory);
if(!empty($changes)) $this->action->logHistory($actionID, $changes);
$this->updateLane($parentStory->id, $parentStory->type);
+
+ if($this->config->edition != 'open')
+ {
+ $relation = new stdClass();
+ $relation->AID = $story->parent;
+ $relation->AType = $parentStory->type;
+ $relation->relation = 'subdivideinto';
+ $relation->BID = $oldStory->id;
+ $relation->BType = $oldStory->type;
+ $this->dao->replace(TABLE_RELATION)->data($relation)->exec();
+ }
}
else
{
@@ -981,6 +1003,17 @@ class storyTao extends storyModel
$changes = common::createChanges($oldBug, $bug, 'bug');
$this->action->logHistory($actionID, $changes);
+ if($this->config->edition != 'open')
+ {
+ $relation = new stdClass();
+ $relation->AID = $bugID;
+ $relation->AType = 'bug';
+ $relation->relation = 'transferredto';
+ $relation->BID = $storyID;
+ $relation->BType = 'story';
+ $this->dao->replace(TABLE_RELATION)->data($relation)->exec();
+ }
+
/* add files to story from bug. */
$files = $this->dao->select('*')->from(TABLE_FILE)->where('objectType')->eq('bug')->andWhere('objectID')->eq($bugID)->fetchAll();
if(empty($files)) return;
diff --git a/module/story/test/lib/changestory.ui.class.php b/module/story/test/lib/changestory.ui.class.php
index 7cc9cfbf96..e5d1a76224 100755
--- a/module/story/test/lib/changestory.ui.class.php
+++ b/module/story/test/lib/changestory.ui.class.php
@@ -19,15 +19,21 @@ class changeStoryTester extends tester
* @access public
* @return object
*/
- public function changeStory($storyName)
+ public function changeStory($storyName, $reviewer)
{
$form = $this->initForm('story', 'change', array('id' => 1), 'appIframe-product');
$form->dom->title->setValue($storyName);
- $form->dom->reviewer->multiPicker(array('admin'));
+ $form->dom->reviewer->multiPicker($reviewer);
$form->dom->btn($this->lang->save)->click();
$form->wait(1);
- if($this->response('method') != 'view')
+ if($this->response('method') != 'view' and $reviewer == array())
+ {
+ if($form->dom->alertmodal('text') == '『评审人员』不能为空。') return $this->success('变更需求表单页面提示信息正确');
+ return $this->failed('变更需求表单页面提示信息不正确');
+ }
+
+ if($this->response('method') != 'view' and $storyName == null)
{
if($form->dom->alertmodal('text') == '『研发需求名称』不能为空。') return $this->success('变更需求表单页面提示信息正确');
return $this->failed('变更需求表单页面提示信息不正确');
@@ -39,6 +45,42 @@ class changeStoryTester extends tester
if($viewPage->dom->storyName->getText() != $storyName) return $this->failed('需求名称不正确');
if($viewPage->dom->status->getText() != '评审中') return $this->failed('需求状态不正确');
+ return $this->success('变更需求成功');
+ }
+
+ /**
+ * change an epic.
+ *
+ * @param string $storyName
+ * @param array $reviewer
+ * @access public
+ * @return object
+ */
+ public function changeEpic($storyName, $reviewer)
+ {
+ $form = $this->initForm('epic', 'change', array('id' => 3), 'appIframe-product');
+ $form->dom->title->setValue($storyName);
+ $form->dom->reviewer->multiPicker($reviewer);
+ $form->dom->btn($this->lang->save)->click();
+ $form->wait(1);
+
+ if($this->response('method') != 'view' and $reviewer == array())
+ {
+ if($form->dom->alertmodal('text') == '『评审人员』不能为空。') return $this->success('变更需求表单页面提示信息正确');
+ return $this->failed('变更需求表单页面提示信息不正确');
+ }
+ if($this->response('method') != 'view' and $storyName == null)
+ {
+ if($form->dom->alertmodal('text') == '『业务需求名称』不能为空。') return $this->success('变更需求表单页面提示信息正确');
+ return $this->failed('变更需求表单页面提示信息不正确');
+ }
+
+ /* 跳转到需求列表页面搜索创建需求并进入该需求详情页。 */
+
+ $viewPage = $this->loadPage('epic', 'view');
+ if($viewPage->dom->storyName->getText() != $storyName) return $this->failed('需求名称不正确');
+ if($viewPage->dom->status->getText() != '评审中') return $this->failed('需求状态不正确');
+
return $this->success('变更需求成功');
}
}
diff --git a/module/story/test/lib/editstory.ui.class.php b/module/story/test/lib/editstory.ui.class.php
index b3a4b24ae6..2ea7343c5d 100755
--- a/module/story/test/lib/editstory.ui.class.php
+++ b/module/story/test/lib/editstory.ui.class.php
@@ -14,30 +14,41 @@ class editStoryTester extends tester
{
/**
* Edit a story.
- * @param string $storyFrom
+ * @param string $storyID, $storyType, $storyFrom
* @access public
* @return object
*/
- public function editStory($storyFrom)
+ public function editStory($storyID, $storyType, $storyFrom)
{
$editStoryParam = array(
- 'storyID' => '1',
+ 'storyID' => $storyID,
'kanbanGroup' => 'default',
- 'storyType' => 'story'
+ 'storyType' => $storyType,
);
/* 提交表单 */
- $form = $this->initForm('story', 'edit', $editStoryParam, 'appIframe-product');
+ $form = $this->initForm($storyType, 'edit', $editStoryParam, 'appIframe-product');
$form->dom->source->picker($storyFrom);
$form->dom->assignedTo->picker('admin');
$form->dom->btn($this->lang->save)->click();
$form->wait(1);
- $browsePage = $this->loadPage('story', 'view', '1');
+ $browsePage = $this->loadPage('story', 'view', $storyID);
$viewPage = $this->loadPage('story', 'view');
- if($viewPage->dom->storyFrom->getText() != '客户') return $this->failed('需求来源不正确');
+ if($viewPage->dom->storyFrom->getText() != $storyFrom) return $this->failed('需求来源不正确');
- return $this->success('编辑研发需求成功');
+ if($storyType == 'requirement')
+ {
+ return $this->success('编辑用户需求成功');
+ }
+ if($storyType == 'story')
+ {
+ return $this->success('编辑研发需求成功');
+ }
+ else
+ {
+ return $this->success('编辑业务需求成功');
+ }
}
/**
diff --git a/module/story/test/lib/reviewstory.ui.class.php b/module/story/test/lib/reviewstory.ui.class.php
index a8d53c43dc..70e2befc59 100644
--- a/module/story/test/lib/reviewstory.ui.class.php
+++ b/module/story/test/lib/reviewstory.ui.class.php
@@ -17,12 +17,12 @@ class reviewStoryTester extends tester
* @access public
* @return object
*/
- public function reviewStory($result, $status)
+ public function reviewStory($storyType, $storyID, $result, $status)
{
- $form = $this->initForm('story', 'review', array('id' => 1), 'appIframe-product'); //进入研发评审页面
+ $form = $this->initForm($storyType, 'review', array('id' => $storyID), 'appIframe-product'); //进入研发评审页面
$form->dom->result->picker($result); //选择研发评审结果
- $form->dom->assignedTo->picker('admin'); //指派人选择admin
+ if($result != '拒绝') $form->dom->assignedTo->picker('admin'); //指派人选择admin
$form->dom->btn($this->lang->save)->click();
$form->wait(1);
@@ -33,7 +33,7 @@ class reviewStoryTester extends tester
$viewPage->dom->btn($this->lang->story->legendLifeTime)->click();
if($viewPage->dom->reviewer->getText() != 'admin') return $this->fail('需求评审人错误');
- return $this->success('评审研发需求成功');
+ return $this->success('评审需求成功');
}
/**
@@ -48,8 +48,7 @@ class reviewStoryTester extends tester
$form->dom->btn($this->lang->story->submitReview)->click();
$form->wait(1);
- $form->dom->subReviewerBtn->click();
- $form->dom->subReviewer->clickByMouse();
+ $form->dom->subReviewer->multiPicker(array('admin'));
$form->dom->submitReviewSave->click();
$form->wait(1);
diff --git a/module/story/test/ui/activatestory.php b/module/story/test/ui/activatestory.php
old mode 100644
new mode 100755
index 99f6644b9d..e58c26b455
--- a/module/story/test/ui/activatestory.php
+++ b/module/story/test/ui/activatestory.php
@@ -1,19 +1,14 @@
#!/usr/bin/env php
version->range('1');
$storyspec->title->range('激活研发需求,激活用户需求,激活业务需求');
$storyspec->gen(3);
+$storyreview = zenData('storyreview');
+$storyreview->gen(0);
+
$action = zenData('action');
$action->id->range('1-4');
$action->objectType->range('product,story,story,story');
@@ -75,7 +74,16 @@ $storys = array();
$storys['null'] = '';
$storys['default'] = '变更后需求';
-r($tester->changeStory($storys['null'])) && p('message,status') && e('变更需求表单页面提示信息正确,SUCCESS'); // 缺少需求名称，变更失败
-r($tester->changeStory($storys['default'])) && p('message,status') && e('变更需求成功,SUCCESS'); // 使用默认选项变更需求,详情页信息对应
+$reviewer = array();
+$reviewer['null'] = array();
+$reviewer['default'] = array('admin');
+
+r($tester->changeStory($storys['default'], $reviewer['null'])) && p('message,status') && e('变更需求表单页面提示信息正确,SUCCESS'); // 缺少评审人，变更失败
+r($tester->changeStory($storys['null'], $reviewer['default'])) && p('message,status') && e('变更需求表单页面提示信息正确,SUCCESS'); // 缺少需求名称，变更失败
+r($tester->changeStory($storys['default'], $reviewer['default'])) && p('message,status') && e('变更需求成功,SUCCESS'); // 使用默认选项变更需求，详情页信息对应
+
+r($tester->changeEpic($storys['default'], $reviewer['null'])) && p('message,status') && e('变更需求表单页面提示信息正确,SUCCESS'); // 缺少评审人，变更失败
+r($tester->changeEpic($storys['null'], $reviewer['default'])) && p('message,status') && e('变更需求表单页面提示信息正确,SUCCESS'); // 缺少需求名称，变更失败
+r($tester->changeEpic($storys['default'], $reviewer['default'])) && p('message,status') && e('变更需求成功,SUCCESS'); // 使用默认选项变更需求,详情页信息对应
$tester->closeBrowser();
diff --git a/module/story/test/ui/closestory.php b/module/story/test/ui/closestory.php
old mode 100644
new mode 100755
index 2022b8c2a9..226ad3771a
--- a/module/story/test/ui/closestory.php
+++ b/module/story/test/ui/closestory.php
@@ -1,20 +1,12 @@
#!/usr/bin/env php
login();
$storyFrom = '客户';
-r($tester->editStory($storyFrom)) && p('module,method') && e('story,view'); // 编辑需求后跳转页面检查
-r($tester->editStory($storyFrom)) && p('message,status') && e('编辑研发需求成功,SUCCESS'); // 编辑需求成功
+$storyID = array();
+$storyID[1] = 1;
+$storyID[2] = 2;
+$storyID[3] = 3;
+
+$storyType = array();
+$storyType['story'] = 'story';
+$storyType['requirement'] = 'requirement';
+$storyType['epic'] = 'epic';
+
+r($tester->editStory($storyID[1], $storyType['story'], $storyFrom)) && p('module,method') && e('story,view'); // 编辑需求后跳转页面检查
+r($tester->editStory($storyID[1], $storyType['story'], $storyFrom)) && p('message,status') && e('编辑研发需求成功,SUCCESS'); // 编辑需求成功
+
+r($tester->editStory($storyID[3], $storyType['epic'], $storyFrom)) && p('module,method') && e('epic,view'); // 编辑需求后跳转页面检查
+r($tester->editStory($storyID[3], $storyType['epic'], $storyFrom)) && p('message,status') && e('编辑业务需求成功,SUCCESS'); // 编辑需求成功
r($tester->batchEditStory($storyFrom)) && p('message,status') && e('批量编辑研发需求成功,SUCCESS'); // 批量编辑需求成功
$tester->closeBrowser();
diff --git a/module/story/test/ui/linkstory.php b/module/story/test/ui/linkstory.php
old mode 100644
new mode 100755
index 6908feeaf7..0be02c6cfa
--- a/module/story/test/ui/linkstory.php
+++ b/module/story/test/ui/linkstory.php
@@ -1,10 +1,13 @@
#!/usr/bin/env php
"/html/body/div[1]/div/div/div[2]/div/form/div[2]/div/div/div"
);
$this->dom->xpath = array_merge($this->dom->xpath, $xpath);
}
diff --git a/module/story/test/ui/page/view.php b/module/story/test/ui/page/view.php
index 0b1280ea96..6c0918126c 100755
--- a/module/story/test/ui/page/view.php
+++ b/module/story/test/ui/page/view.php
@@ -15,9 +15,9 @@ class viewPage extends page
'closeReason' => "/html/body/div[1]/div/div/div/div[2]/div[2]/div[1]/div[2]/div[2]/div/div[6]/div[2]",
'activate' => "//*[@type='submit']",
'assignToBtn' => "//*[@type='submit']",
+ /*提交评审弹窗*/
'submitReviewSave' => "//*[@type='submit']",
- 'subReviewerBtn' => "//*[@id='reviewer']",
- 'subReviewer' => "/html/body/div[3]/div/menu/menu/li[2]/a/div",
+ 'subReviewer' => "//*[@id='reviewer']",
/*关联的业需和用需*/
'firLinkStories' => "//*[@id='mainContainer']/div/div/div[2]/div[2]/div[2]/div[2]/div/ul/li[2]/div/div",
'secLinkStories' => "//*[@id='mainContainer']/div/div/div[2]/div[2]/div[2]/div[2]/div/ul/li[4]/div/div",
diff --git a/module/story/test/ui/processstorychange.php b/module/story/test/ui/processstorychange.php
old mode 100644
new mode 100755
index d86be474e3..7f10033a98
--- a/module/story/test/ui/processstorychange.php
+++ b/module/story/test/ui/processstorychange.php
@@ -1,12 +1,13 @@
#!/usr/bin/env php
vision->range('rnd');
$product->gen(1);
$story = zenData('story');
-$story->id->range('1-2');
-$story->root->range('1-2');
-$story->path->range('`,1,`, `,2,`');
+$story->id->range('1-6');
+$story->root->range('1-6');
+$story->path->range('1-6')->prefix(',')->postfix(',');
$story->grade->range('1');
$story->product->range('1');
$story->module->range('0');
-$story->title->range('激活研发需求,草稿研发需求');
-$story->type->range('story');
+$story->title->range('1-6')->prefix('草稿需求');
+$story->type->range('story{3}, epic{3}');
$story->stage->range('wait');
$story->status->range('reviewing');
$story->openedBy->range('admin');
@@ -40,27 +41,54 @@ $story->reviewedBy->range('[]');
$story->reviewedDate->range('`NULL`');
$story->closedBy->range('[]');
$story->closedReason->range('[]');
-$story->gen(2);
+$story->gen(6);
$storyspec = zenData('storyspec');
-$storyspec->story->range('1-2');
+$storyspec->story->range('1-6');
$storyspec->version->range('1');
-$storyspec->title->range('激活研发需求,草稿研发需求');
-$storyspec->gen(1);
+$storyspec->title->range('1-6')->prefix('草稿需求');
+$storyspec->gen(6);
$storyreview = zenData('storyreview');
-$storyreview->story->range('1-2');
+$storyreview->story->range('1-6');
$storyreview->reviewer->range('admin');
$storyreview->result->range('[]');
$storyreview->version->range('1');
-$storyreview->gen(2);
+$storyreview->gen(6);
$tester = new reviewStoryTester();
$tester->login();
-$result = array('确认通过', '有待明确');
-$status = array('激活', '草稿');
+$storyType = array();
+$storyType['story'] = 'story';
+$storyType['requirement'] = 'requirement';
+$storyType['epic'] = 'epic';
+
+$storyID = array();
+$storyID['1'] = 1;
+$storyID['2'] = 2;
+$storyID['3'] = 3;
+$storyID['4'] = 4;
+$storyID['5'] = 5;
+$storyID['6'] = 6;
+
+$result = array();
+$result['pass'] = '确认通过';
+$result['clarify'] = '有待明确';
+$result['reject'] = '拒绝';
+$result['revert'] = '撤销变更';
+
+$status = array();
+$status['active'] = '激活';
+$status['draft'] = '草稿';
+$status['closed'] = '已关闭';
+
+r($tester->reviewStory($storyType['story'], $storyID['1'], $result['pass'], $status['active'])) && p('message') && e('评审需求成功'); //评审需求通过，研发需求状态为激活
+r($tester->reviewStory($storyType['story'], $storyID['2'], $result['clarify'], $status['draft'])) && p('message') && e('评审需求成功'); //评审需求有待明确，研发需求状态为草稿
+r($tester->reviewStory($storyType['story'], $storyID['3'], $result['reject'], $status['closed'])) && p('message') && e('评审需求成功'); //评审需求拒绝，研发需求状态为已关闭
+
+r($tester->reviewStory($storyType['epic'], $storyID['4'], $result['pass'], $status['active'])) && p('message') && e('评审需求成功'); //评审需求通过，业务需求状态为激活
+r($tester->reviewStory($storyType['epic'], $storyID['5'], $result['clarify'], $status['draft'])) && p('message') && e('评审需求成功'); //评审需求有待明确，业务需求状态为草稿
+r($tester->reviewStory($storyType['epic'], $storyID['6'], $result['reject'], $status['closed'])) && p('message') && e('评审需求成功'); //评审需求拒绝，业务需求状态为已关闭
-r($tester->reviewStory($result[0], $status[0])) && p('message') && e('评审研发需求成功');
-r($tester->reviewStory($result[1], $status[1])) && p('message') && e('评审研发需求成功');
$tester->closeBrowser();
diff --git a/module/story/test/ui/submitreview.php b/module/story/test/ui/submitreview.php
old mode 100644
new mode 100755
index 4ae9258925..c26ce93217
--- a/module/story/test/ui/submitreview.php
+++ b/module/story/test/ui/submitreview.php
@@ -1,13 +1,14 @@
#!/usr/bin/env php
read->range('0');
$action->vision->range('rnd');
$action->gen(2);
+$storyreview = zenData('storyreview');
+$storyreview->gen(0);
+
$tester = new reviewStoryTester();
$tester->login();
diff --git a/module/story/ui/view.html.php b/module/story/ui/view.html.php
index 245e363c51..a4bd501dce 100644
--- a/module/story/ui/view.html.php
+++ b/module/story/ui/view.html.php
@@ -41,7 +41,7 @@ if($app->tab == 'product') setPageData('activeMenuID', $story->type);
/* 初始化头部右上方工具栏。Init detail toolbar. */
$toolbar = array();
-if(!$isInModal && hasPriv('story', 'create'))
+if(!$isInModal && hasPriv($story->type, 'create'))
{
$otherParam = 'storyID=&projectID=';
if($app->rawModule == 'projectstory' || $app->tab == 'project') $otherParam = "storyID=&projectID={$this->session->project}";
@@ -147,7 +147,7 @@ if($twins)
if(!in_array($config->vision, array('lite', 'or')))
{
- $tabs[] = setting()
+ $tabs['linkStories'] = setting()
->group('relatives')
->title($lang->story->linkStories)
->control('linkedStoryList')
@@ -167,7 +167,7 @@ if($isStoryType && hasPriv('story', 'tasks'))
/* 相关信息。 Related info. */
if($config->vision != 'lite')
{
- $tabs[] = setting()
+ $tabs['storyRelatedList'] = setting()
->group('relatives')
->title($lang->story->legendRelated)
->control('storyRelatedList');
diff --git a/module/task/config/dtable.php b/module/task/config/dtable.php
index 1ad851699e..5ef23108a4 100644
--- a/module/task/config/dtable.php
+++ b/module/task/config/dtable.php
@@ -115,6 +115,22 @@ $config->task->dtable->fieldList['progress']['show'] = true;
$config->task->dtable->fieldList['progress']['sortType'] = false;
$config->task->dtable->fieldList['progress']['group'] = 5;
+if($config->edition != 'open')
+{
+ $config->task->dtable->fieldList['relatedObject']['name'] = 'relatedObject';
+ $config->task->dtable->fieldList['relatedObject']['title'] = $lang->custom->relateObject;
+ $config->task->dtable->fieldList['relatedObject']['sortType'] = false;
+ $config->task->dtable->fieldList['relatedObject']['width'] = '70';
+ $config->task->dtable->fieldList['relatedObject']['type'] = 'text';
+ $config->task->dtable->fieldList['relatedObject']['link'] = common::hasPriv('custom', 'showRelationGraph') ? "RAWJSRAWJS" : null;
+ $config->task->dtable->fieldList['relatedObject']['data-toggle'] = 'modal';
+ $config->task->dtable->fieldList['relatedObject']['data-size'] = 'lg';
+ $config->task->dtable->fieldList['relatedObject']['show'] = true;
+ $config->task->dtable->fieldList['relatedObject']['group'] = 5;
+ $config->task->dtable->fieldList['relatedObject']['flex'] = false;
+ $config->task->dtable->fieldList['relatedObject']['align'] = 'center';
+}
+
$config->task->dtable->fieldList['closedBy']['type'] = 'user';
$config->task->dtable->fieldList['closedBy']['sortType'] = true;
$config->task->dtable->fieldList['closedBy']['group'] = 6;
@@ -164,16 +180,18 @@ $config->task->dtable->fieldList['module']['control'] = 'select';
$config->task->dtable->fieldList['module']['dataSource'] = array('module' => 'tree', 'method' => 'getTaskOptionMenu', 'params' => ['rootID' => '$executionID', 'startModule' => (int)0, 'extra' => 'allModule']);
$config->task->dtable->fieldList['module']['display'] = false;
-$config->task->dtable->fieldList['execution']['title'] = 'execution';
+$config->task->dtable->fieldList['execution']['name'] = 'execution';
+$config->task->dtable->fieldList['execution']['title'] = $lang->task->execution;
$config->task->dtable->fieldList['execution']['control'] = 'hidden';
$config->task->dtable->fieldList['execution']['type'] = 'html';
$config->task->dtable->fieldList['execution']['dataSource'] = array('module' => 'execution', 'method' => 'getPairs', 'params' => ['projectID' => 0]);
$config->task->dtable->fieldList['execution']['display'] = false;
-$config->task->dtable->fieldList['project']['title'] = 'project';
+$config->task->dtable->fieldList['project']['name'] = 'project';
+$config->task->dtable->fieldList['project']['title'] = $lang->task->project;
$config->task->dtable->fieldList['project']['control'] = 'hidden';
$config->task->dtable->fieldList['project']['type'] = 'html';
-$config->task->dtable->fieldList['project']['dataSource'] = array('module' => 'project', 'method' => 'getPairs');
+$config->task->dtable->fieldList['project']['dataSource'] = array('module' => 'project', 'method' => 'getPairs', 'params' => ['ignoreVision' => false]);
$config->task->dtable->fieldList['project']['display'] = false;
$config->task->dtable->fieldList['mode']['title'] = 'mode';
diff --git a/module/task/model.php b/module/task/model.php
index b912eeac09..19b7702df0 100755
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -510,7 +510,21 @@ class taskModel extends model
if(!$taskID) return false;
/* Update Kanban and story stage. */
- if(!empty($task->story)) $this->story->setStage($task->story);
+ if(!empty($task->story))
+ {
+ $this->story->setStage($task->story);
+
+ if($this->config->edition != 'open')
+ {
+ $relation = new stdClass();
+ $relation->relation = 'generated';
+ $relation->AID = $task->story;
+ $relation->AType = 'story';
+ $relation->BID = $taskID;
+ $relation->BType = 'task';
+ $this->dao->replace(TABLE_RELATION)->data($relation)->exec();
+ }
+ }
$this->updateKanbanForBatchCreate($taskID, $executionID, $laneID, (int)$columnID);
$taskIdList[$taskID] = $taskID;
diff --git a/module/task/ui/view.html.php b/module/task/ui/view.html.php
index bbb2ee8474..7e5cde6fe2 100644
--- a/module/task/ui/view.html.php
+++ b/module/task/ui/view.html.php
@@ -95,7 +95,7 @@ if(!$task->fromBug && $task->story)
'toolbar' => $task->needConfirm ? array
(
array('text' => $lang->task->storyChange, 'class' => 'ghost pointer-events-none'),
- array('text' => $lang->confirm, 'type' => 'primary', 'url' => createLink('task', 'confirmStoryChange', "taskID={$task->id}"))
+ array('text' => $lang->confirm, 'type' => 'primary', 'class' => 'ajax-submit', 'url' => createLink('task', 'confirmStoryChange', "taskID={$task->id}"))
) : null,
'sections' => array
(
@@ -168,7 +168,7 @@ $tabs[] = setting()
->group('related')
->title($lang->task->legendEffort)
->control('taskEffortInfo');
-$tabs[] = setting()
+$tabs['taskMiscInfo'] = setting()
->group('related')
->title($lang->task->legendMisc)
->control('taskMiscInfo');
diff --git a/module/task/zen.php b/module/task/zen.php
index 140d4c89f2..f1c3ffe53d 100644
--- a/module/task/zen.php
+++ b/module/task/zen.php
@@ -1431,6 +1431,24 @@ class taskZen extends task
}
}
+ /* Compute task progress. */
+ if(!isset($task->progress))
+ {
+ if($task->consumed == 0 && $task->left == 0)
+ {
+ $task->progress = 0;
+ }
+ elseif($task->consumed != 0 && $task->left == 0)
+ {
+ $task->progress = 100;
+ }
+ else
+ {
+ $task->progress = round($task->consumed / ($task->consumed + $task->left), 2) * 100;
+ }
+ $task->progress .= '%';
+ }
+
if($this->config->edition == 'open' && $task->parent > 0 && strpos($task->name, htmlentities('>')) !== 0) $task->name = '>' . $task->name;
if(!empty($task->team))
{
diff --git a/module/testcase/config/action.php b/module/testcase/config/action.php
index 003b99b767..975725d9fd 100644
--- a/module/testcase/config/action.php
+++ b/module/testcase/config/action.php
@@ -25,6 +25,7 @@ $config->testcase->actionList['ztfRun']['text'] = $lang->testtask->runCa
$config->testcase->actionList['ztfRun']['hint'] = $lang->testtask->runCase;
$config->testcase->actionList['ztfRun']['url'] = array('module' => 'testtask', 'method' => 'runCase', 'params' => 'runID={runID}&caseID={caseID}&version={version}');
$config->testcase->actionList['ztfRun']['notLoadModel'] = true;
+$config->testcase->actionList['ztfRun']['notInModal'] = true;
$config->testcase->actionList['ztfRun']['className'] = 'ztf-case';
$config->testcase->actionList['ztfRun']['data-toggle'] = 'modal';
$config->testcase->actionList['ztfRun']['data-size'] = 'lg';
diff --git a/module/testcase/config/table.php b/module/testcase/config/table.php
index 4e640d2a29..70cdc7ba01 100644
--- a/module/testcase/config/table.php
+++ b/module/testcase/config/table.php
@@ -131,6 +131,22 @@ $config->testcase->dtable->fieldList['stepNumber']['type'] = 'number';
$config->testcase->dtable->fieldList['stepNumber']['group'] = 5;
$config->testcase->dtable->fieldList['stepNumber']['sortType'] = false;
+if($config->edition != 'open')
+{
+ $config->testcase->dtable->fieldList['relatedObject']['name'] = 'relatedObject';
+ $config->testcase->dtable->fieldList['relatedObject']['title'] = $lang->custom->relateObject;
+ $config->testcase->dtable->fieldList['relatedObject']['sortType'] = false;
+ $config->testcase->dtable->fieldList['relatedObject']['width'] = '70';
+ $config->testcase->dtable->fieldList['relatedObject']['type'] = 'text';
+ $config->testcase->dtable->fieldList['relatedObject']['link'] = common::hasPriv('custom', 'showRelationGraph') ? "RAWJSRAWJS" : null;
+ $config->testcase->dtable->fieldList['relatedObject']['data-toggle'] = 'modal';
+ $config->testcase->dtable->fieldList['relatedObject']['data-size'] = 'lg';
+ $config->testcase->dtable->fieldList['relatedObject']['show'] = true;
+ $config->testcase->dtable->fieldList['relatedObject']['group'] = 5;
+ $config->testcase->dtable->fieldList['relatedObject']['flex'] = false;
+ $config->testcase->dtable->fieldList['relatedObject']['align'] = 'center';
+}
+
$config->testcase->dtable->fieldList['version']['title'] = $lang->testcase->version;
$config->testcase->dtable->fieldList['version']['type'] = 'text';
$config->testcase->dtable->fieldList['version']['group'] = 5;
@@ -148,7 +164,8 @@ $config->testcase->dtable->fieldList['lastEditedDate']['type'] = 'date';
$config->testcase->dtable->fieldList['lastEditedDate']['group'] = 6;
$config->testcase->dtable->fieldList['lastEditedDate']['sortType'] = true;
-$config->testcase->dtable->fieldList['product']['title'] = 'product';
+$config->testcase->dtable->fieldList['product']['title'] = $lang->testcase->product;
+$config->testcase->dtable->fieldList['product']['name'] = 'product';
$config->testcase->dtable->fieldList['product']['control'] = 'hidden';
$config->testcase->dtable->fieldList['product']['dataSource'] = array('module' => 'product', 'method' => 'getPairs', 'params' => ['mode' => '', 'programID' => 0, 'append' => '', 'shadow' => 'all']);
$config->testcase->dtable->fieldList['product']['display'] = false;
diff --git a/module/testcase/control.php b/module/testcase/control.php
index 92b65aaaf1..81b2fff156 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -462,10 +462,10 @@ class testcase extends control
$this->view->branchName = $product->type == 'normal' ? '' : zget($branches, $case->branch, '');
}
- $this->view->testcase = $case;
- $this->view->stepsType = $stepsType;
- $this->view->version = $version ? $version : $case->version;
- $this->view->isLibCase = $isLibCase;
+ $this->view->testcase = $case;
+ $this->view->stepsType = $stepsType;
+ $this->view->version = $version ? $version : $case->version;
+ $this->view->isLibCase = $isLibCase;
$this->display();
}
diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php
index 99098435a7..b89319c5d2 100644
--- a/module/testcase/lang/zh-cn.php
+++ b/module/testcase/lang/zh-cn.php
@@ -86,7 +86,7 @@ $lang->testcase->results = '执行结果数';
$lang->testcase->resultsAB = 'R';
$lang->testcase->stepNumber = '用例步骤数';
$lang->testcase->stepNumberAB = 'S';
-$lang->testcase->createBug = '转Bug';
+$lang->testcase->createBug = '提Bug';
$lang->testcase->fromModule = '来源模块';
$lang->testcase->fromCase = '来源用例';
$lang->testcase->sync = '同步';
diff --git a/module/testcase/model.php b/module/testcase/model.php
index 968c1aac97..d6aaa54d6a 100755
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -586,6 +586,7 @@ class testcaseModel extends model
->leftJoin(TABLE_TESTRUN)->alias('t2')->on('t1.run = t2.id')
->where('t1.`case`')->in($caseIdList)
->beginIF($taskID)->andWhere('t2.task')->eq($taskID)->fi()
+ ->beginIF($this->app->tab == 'devops')->andWhere('t1.deploy')->eq($this->session->deployID)->fi()
->orderBy('id_desc')
->query();
@@ -2710,4 +2711,101 @@ class testcaseModel extends model
return $canImportModules;
}
+
+ /**
+ * Build search form.
+ *
+ * @param int $productID
+ * @param array $products
+ * @param int $queryID
+ * @param string $actionURL
+ * @param int $projectID
+ * @param int $moduleID
+ * @param string $branch
+ * @access public
+ * @return void
+ */
+ public function buildSearchForm(int $productID, array $products, int $queryID, string $actionURL, int $projectID = 0, int $moduleID = 0, string $branch = 'all'): void
+ {
+ /* 获取产品列表。Get productList. */
+ if($this->app->tab == 'project' && !$productID)
+ {
+ if($projectID)
+ {
+ $products = $this->loadModel('product')->getProducts($projectID);
+ $productList = array(0 => '');
+ foreach($products as $product) $productList[$product->id] = $product->name;
+ $productList['all'] = $this->lang->product->allProductsOfProject;
+ }
+ else
+ {
+ $productList = $products;
+ }
+ $this->config->testcase->search['params']['story']['values'] = $this->loadModel('story')->getExecutionStoryPairs($projectID, 0, 'all', $moduleID, 'full', 'active');
+ }
+ else
+ {
+ $productList = array(0 => '');
+ $productList['all'] = $this->lang->all;
+ if(isset($products[$productID])) $productList[$productID] = $products[$productID];
+ if(empty($productID) && empty($products))
+ {
+ $products = $this->loadModel('product')->getPairs('', 0, '', 'all');
+ $productList += $products;
+ }
+ $this->config->testcase->search['params']['story']['values'] = $this->loadModel('story')->getProductStoryPairs($productID, $branch, array(), 'active,reviewing', 'id_desc', 0, '', 'story', false);
+ }
+
+ /* 获取模块列表。*/
+ /* Get moduleList. */
+ if($productID)
+ {
+ $modules = $this->loadModel('tree')->getOptionMenu($productID, 'case', 0, $branch);
+ }
+ else
+ {
+ $modules = array();
+ foreach($products as $id => $name) $modules += $this->loadModel('tree')->getOptionMenu($id, 'case', 0);
+ }
+
+ $this->config->testcase->search['params']['product']['values'] = $productList;
+ $this->config->testcase->search['params']['module']['values'] = $modules;
+ $this->config->testcase->search['params']['scene']['values'] = $this->getSceneMenu($productID, $moduleID, $branch, 0, 0, true);
+ $this->config->testcase->search['params']['lib']['values'] = $this->loadModel('caselib')->getLibraries();
+
+ $product = $this->loadModel('product')->getByID($productID ? $productID : key($products));
+ if((isset($product->type) && $product->type == 'normal') || $this->app->tab == 'project')
+ {
+ unset($this->config->testcase->search['fields']['branch']);
+ unset($this->config->testcase->search['params']['branch']);
+ }
+ else
+ {
+ $branches = $this->loadModel('branch')->getPairs($productID, '', $projectID);
+ $this->config->testcase->search['fields']['branch'] = sprintf($this->lang->product->branch, $this->lang->product->branchName[$product->type]);
+ $this->config->testcase->search['params']['branch']['values'] = array('' => '', BRANCH_MAIN => $this->lang->branch->main) + $branches + array('all' => $this->lang->branch->all);
+ }
+
+ if(!$this->config->testcase->needReview) unset($this->config->testcase->search['params']['status']['values']['wait']);
+
+ $this->config->testcase->search['actionURL'] = $actionURL;
+ $this->config->testcase->search['queryID'] = $queryID;
+ $this->config->testcase->search['module'] = 'testcase';
+
+ $this->loadModel('search')->setSearchParams($this->config->testcase->search);
+ }
+
+ /**
+ * 过滤自动测试用例的ID列表。
+ * Ignore auto testcase id list.
+ *
+ * @param array $caseIdList
+ * @access public
+ * @return array
+ */
+ public function ignoreAutoCaseIdList(array $caseIdList): array
+ {
+ if(empty($caseIdList)) return array();
+ return $this->dao->select('id')->from(TABLE_CASE)->where('id')->in($caseIdList)->andWhere('auto')->ne('auto')->fetchPairs('id', 'id');
+ }
}
diff --git a/module/testcase/tao.php b/module/testcase/tao.php
index 202a36a630..58e89db733 100644
--- a/module/testcase/tao.php
+++ b/module/testcase/tao.php
@@ -487,8 +487,36 @@ class testcaseTao extends testcaseModel
$newBugs = array_diff($toLinkBugs, $linkedBugs);
$removeBugs = array_diff($linkedBugs, $toLinkBugs);
- foreach($newBugs as $bugID) $this->dao->update(TABLE_BUG)->set('`case`')->eq($caseID)->set('caseVersion')->eq($case->version)->set('`story`')->eq($case->story)->set('storyVersion')->eq($case->storyVersion)->where('id')->eq($bugID)->exec();
- foreach($removeBugs as $bugID) $this->dao->update(TABLE_BUG)->set('`case`')->eq(0)->set('caseVersion')->eq(0)->set('`story`')->eq(0)->set('storyVersion')->eq(0)->where('id')->eq($bugID)->exec();
+ foreach($newBugs as $bugID)
+ {
+ $this->dao->update(TABLE_BUG)->set('`case`')->eq($caseID)->set('caseVersion')->eq($case->version)->set('`story`')->eq($case->story)->set('storyVersion')->eq($case->storyVersion)->where('id')->eq($bugID)->exec();
+
+ if($this->config->edition != 'open')
+ {
+ $relation = new stdClass();
+ $relation->relation = 'generated';
+ $relation->AID = $bugID;
+ $relation->AType = 'bug';
+ $relation->BID = $caseID;
+ $relation->BType = 'testcase';
+ $this->dao->replace(TABLE_RELATION)->data($relation)->exec();
+ }
+ }
+ foreach($removeBugs as $bugID)
+ {
+ $this->dao->update(TABLE_BUG)->set('`case`')->eq(0)->set('caseVersion')->eq(0)->set('`story`')->eq(0)->set('storyVersion')->eq(0)->where('id')->eq($bugID)->exec();
+
+ if($this->config->edition != 'open')
+ {
+ $this->dao->delete()->from(TABLE_RELATION)
+ ->where('relation')->eq('generated')
+ ->andWhere('AID')->eq($bugID)
+ ->andWhere('AType')->eq('bug')
+ ->andWhere('BID')->eq($caseID)
+ ->andWhere('BType')->eq('testcase')
+ ->exec();
+ }
+ }
return !dao::isError();
}
diff --git a/module/testcase/test/lib/testcase.ui.class.php b/module/testcase/test/lib/testcase.ui.class.php
old mode 100644
new mode 100755
index e8f52a5f7b..21ca4c91d6
--- a/module/testcase/test/lib/testcase.ui.class.php
+++ b/module/testcase/test/lib/testcase.ui.class.php
@@ -8,15 +8,15 @@ class testcase extends tester
* 添加测试用例
* create testcase
*
- * @param array $project
+ * @param array $product
* @param array $testcase
* @access public
* @return object
*/
- public function createTestCase($project = array(), $testcase = array())
+ public function createTestCase($product = array(), $testcase = array())
{
$this->login();
- $form = $this->initForm('testcase', 'create', $project, 'appIframe-qa');
+ $form = $this->initForm('testcase', 'create', $product, 'appIframe-qa');
if(isset($testcase['caseName'])) $form->dom->title->setValue($testcase['caseName']);
if(isset($testcase['type'])) $form->dom->type->picker($testcase['type']);
if(isset($testcase['stage'])) $form->dom->{'stage[]'}->multiPicker($testcase['stage']);
@@ -36,14 +36,14 @@ class testcase extends tester
* 测试用例列表。
* check testcase list.
*
- * @param array $project
+ * @param array $product
* @access public
* @return object
*/
- public function testcaseBrowse($project)
+ public function testcaseBrowse($product)
{
$this->login();
- $form = $this->initForm('testcase', 'browse', $project, 'appIframe-qa');
+ $form = $this->initForm('testcase', 'browse', $product, 'appIframe-qa');
if($form->dom->caseListID->getText()) return $this->success('测试用例列表验证成功');
return $this->failed('测试用例列表验证失败');
}
@@ -73,6 +73,81 @@ class testcase extends tester
return $this->failed('编辑测试用例失败');
}
+ /**
+ * 测试用例详情。
+ * testcase view.
+ *
+ * @param array $product
+ * @access public
+ * @return object
+ */
+ public function testcaseView($product)
+ {
+ $this->login();
+ $form = $this->initForm('testcase', 'browse', $product, 'appIframe-qa');
+ $caseName = $form->dom->caseName->getText();
+ $form->dom->caseName->click();
+ $this->webdriver->wait(1);
+ if($this->response('method') == 'view' && $form->dom->caseNameView->getText() == $caseName) return $this->success('测试用例详情页验证成功');
+ return $this->failed('测试用例详情页验证失败');
+ }
+
+ /**
+ * 批量创建测试用例。
+ * batch create testcase.
+ *
+ * @param array $product
+ * @access public
+ * @return object
+ */
+ public function batchCreate($product, $testcase)
+ {
+ $this->login();
+ $form = $this->initForm('testcase', 'batchCreate', $product, 'appIframe-qa');
+ if(isset($testcase['caseName']))
+ {
+ $count = 0;
+ foreach($testcase['caseName'] as $caseName)
+ {
+ $count++;
+ $form->dom->{"title[$count]"}->setValue($caseName);
+ }
+ }
+ $form->dom->saveButton->click();
+ $this->webdriver->wait(2);
+
+ $caseList = array_map(function($element){return $element->getText();}, $form->dom->getElementList($form->dom->xpath['caseNameList'])->element);
+ if(!in_array($testcase['caseName'], $caseList)) return $this->success('批量创建测试用例成功');
+ return $this->failed('批量创建测试用例成功');
+ }
+
+ /**
+ * 批量创建测试用例。
+ * batch create testcase.
+ *
+ * @param array $product
+ * @param array $testcase
+ * @access public
+ * @return object
+ */
+ public function testcaseReview($product, $testcase)
+ {
+ $this->login();
+ $form = $this->initForm('testcase', 'browse', $product, 'appIframe-qa');
+ $form->dom->review->click();
+ $this->webdriver->wait(1);
+
+ if(isset($testcase['reviewedDate'])) $form->dom->reviewedDate->datePicker($testcase['reviewedDate']);
+ if(isset($testcase['result'])) $form->dom->result->picker($testcase['result']);
+ if(isset($testcase['reviewedBy'])) $form->dom->{'reviewedBy[]'}->multiPicker($testcase['reviewedBy']);
+ if(isset($testcase['comment'])) $form->dom->comment->setValueInZenEditor($testcase['comment']);
+ $form->dom->needReview->click();
+ $this->webdriver->wait(1);
+
+ if($form->dom->review->attr('href')) return $this->success('测试用例评审通过');
+ return $this->failed('测试用例评审失败');
+ }
+
/**
* 添加测试用例步骤
* fill in case steps
diff --git a/module/testcase/test/model/ignoreautocaseidlist.php b/module/testcase/test/model/ignoreautocaseidlist.php
new file mode 100755
index 0000000000..e8ab6266d8
--- /dev/null
+++ b/module/testcase/test/model/ignoreautocaseidlist.php
@@ -0,0 +1,29 @@
+#!/usr/bin/env php
+ignoreAutoCaseIdList();
+cid=0
+
+- 传入空数组 @0
+- 传入不存在的用例 @0
+- 传入重复的用例 @1
+- 传入不重复非自动化用例 @1;2
+- 传入自动化的用例 @0
+- 传入既有自动化用例又有非自动化用例 @1;2
+
+*/
+
+zenData('case')->loadYaml('ignoreautocase')->gen('50');
+
+global $tester;
+$testcase = $tester->loadModel('testcase');
+r(count($testcase->ignoreAutoCaseIdList(array()))) && p() && e('0'); // 传入空数组
+r(count($testcase->ignoreAutoCaseIdList(array(100, 101)))) && p() && e('0'); // 传入不存在的用例
+r(implode(';', $testcase->ignoreAutoCaseIdList(array(1, 1)))) && p() && e('1'); // 传入重复的用例
+r(implode(';', $testcase->ignoreAutoCaseIdList(array(1, 2)))) && p() && e('1;2'); // 传入不重复非自动化用例
+r(count($testcase->ignoreAutoCaseIdList(array(3)))) && p() && e('0'); // 传入自动化的用例
+r(implode(';', $testcase->ignoreAutoCaseIdList(array(1, 2, 3)))) && p() && e('1;2'); // 传入既有自动化用例又有非自动化用例
diff --git a/module/testcase/test/ui/batchcreatetestcase.php b/module/testcase/test/ui/batchcreatetestcase.php
new file mode 100755
index 0000000000..3d0ddd8f09
--- /dev/null
+++ b/module/testcase/test/ui/batchcreatetestcase.php
@@ -0,0 +1,34 @@
+#!/usr/bin/env php
+loadYaml('product')->gen(1);
+$tester = new testcase();
+
+$testcase = array(
+ 'caseName' => array('testcase1' . time(), 'testcase2' . time(), 'testcase3' . time()),
+ 'type' => '安装部署',
+ 'stage' => array('单元测试阶段', '功能测试阶段', '集成测试阶段', '系统测试阶段', '冒烟测试阶段', '版本验证阶段'),
+ 'pri' => '2',
+ 'precondition' => '前置条件测试',
+);
+
+$product = array(
+ 'productID' => 1,
+ 'branch' => 0,
+ 'moduleID' => 0
+);
+
+r($tester->batchCreate($product, $testcase)) && p('message,status') && e('批量创建测试用例成功 ,SUCCESS'); //验证批量创建测试用例成功
diff --git a/module/testcase/test/ui/createtestcase.php b/module/testcase/test/ui/createtestcase.php
index 226c9b2ab1..4f6b68536d 100755
--- a/module/testcase/test/ui/createtestcase.php
+++ b/module/testcase/test/ui/createtestcase.php
@@ -39,10 +39,10 @@ $testcase = array(
)
);
-$project = array(
+$product = array(
'productID' => 1,
'branch' => 0,
'moduleID' => 0
);
-r($tester->createTestCase($project, $testcase)) && p('message,status') && e('创建多层级测试用例成功,SUCCESS'); //验证创建多层级测试用例
+r($tester->createTestCase($product, $testcase)) && p('message,status') && e('创建多层级测试用例成功,SUCCESS'); //验证创建多层级测试用例
diff --git a/module/testcase/test/ui/page/batchcreate.php b/module/testcase/test/ui/page/batchcreate.php
new file mode 100644
index 0000000000..bcc86e87cf
--- /dev/null
+++ b/module/testcase/test/ui/page/batchcreate.php
@@ -0,0 +1,14 @@
+ "//div[@id='table-testcase-browse_table']//div[@data-col='title']//a[@data-app='qa']",
+ 'saveButton' => "//button[@type = 'submit']"
+ );
+
+ $this->dom->xpath = array_merge($this->dom->xpath, $xpath);
+ }
+}
diff --git a/module/testcase/test/ui/page/browse.php b/module/testcase/test/ui/page/browse.php
index b049a5bd09..1830ac67cd 100755
--- a/module/testcase/test/ui/page/browse.php
+++ b/module/testcase/test/ui/page/browse.php
@@ -5,7 +5,12 @@ class browsePage extends page
{
parent::__construct($webdriver);
$xpath = array(
- 'caseListID' => "//a[text()='ID']"
+ 'caseListID' => "//a[text()='ID']",
+ 'caseName' => "(//div[@data-col='title']//a[@data-app='qa'])[1]",
+ 'caseNameView' => "(//div[@id='mainContent']//span[text()])[3]",
+ 'review' => "(//div[@data-row='case_1']//a[@data-toggle='modal'])[1]",
+ 'comment' => "//zen-editor[@menubar-mode='compact']",
+ 'needReview' => "(//form/div//button[@type='submit'])[2]"
);
$this->dom->xpath = array_merge($this->dom->xpath, $xpath);
diff --git a/module/testcase/test/ui/page/view.php b/module/testcase/test/ui/page/view.php
new file mode 100755
index 0000000000..7f904bed61
--- /dev/null
+++ b/module/testcase/test/ui/page/view.php
@@ -0,0 +1,13 @@
+ "(//div[@id='mainContent']//span[text()])[3]"
+ );
+
+ $this->dom->xpath = array_merge($this->dom->xpath, $xpath);
+ }
+}
diff --git a/module/testcase/test/ui/testcasebrowse.php b/module/testcase/test/ui/testcasebrowse.php
index f8044750f9..39d2d6ffbc 100755
--- a/module/testcase/test/ui/testcasebrowse.php
+++ b/module/testcase/test/ui/testcasebrowse.php
@@ -18,8 +18,8 @@ $data1 = zenData('product')->loadYaml('product')->gen(1);
$data2 = zenData('case')->loadYaml('case')->gen(1);
$tester = new testcase();
-$project = array(
+$product = array(
'productID' => 1,
);
-r($tester->testcaseBrowse($project)) && p('message,status') && e('测试用例列表验证成功,SUCCESS'); //测试用例列表验证成功
\ No newline at end of file
+r($tester->testcaseBrowse($product)) && p('message,status') && e('测试用例列表验证成功,SUCCESS'); //测试用例列表验证成功
diff --git a/module/testcase/test/ui/testcasereview.php b/module/testcase/test/ui/testcasereview.php
new file mode 100755
index 0000000000..853fcf49e1
--- /dev/null
+++ b/module/testcase/test/ui/testcasereview.php
@@ -0,0 +1,83 @@
+#!/usr/bin/env php
+loadYaml('product')->gen(1);
+$story = zenData('story');
+$story->id->setFields(array(array('range' => '2')));
+$story->version->setFields(array(array('range' => '1')));
+$story->gen(1);
+
+/* 修改zt_config表中控制用例评审的开关。value值为'1'则开启，'0'则关闭。 */
+$reviewData = new stdclass();
+$reviewData->open = new stdclass();
+$reviewData->open->forceReview = new stdclass();
+$reviewData->open->forceReview->id = zenData('setting')->dao->lastInsertID();
+$reviewData->open->forceReview->owner = 'system';
+$reviewData->open->forceReview->module = 'testcase';
+$reviewData->open->forceReview->key = 'forceReview';
+
+$reviewData->open->reviewCase = new stdClass();
+$reviewData->open->reviewCase->id = zenData('setting')->dao->lastInsertID();
+$reviewData->open->reviewCase->owner = 'system';
+$reviewData->open->reviewCase->module = 'testcase';
+$reviewData->open->reviewCase->key = 'reviewCase';
+$reviewData->open->reviewCase->value = '1';
+
+$reviewData->open->needReview = new stdClass();
+$reviewData->open->needReview->id = zenData('setting')->dao->lastInsertID();
+$reviewData->open->needReview->owner = 'system';
+$reviewData->open->needReview->module = 'testcase';
+$reviewData->open->needReview->key = 'needReview';
+$reviewData->open->needReview->value = '1';
+
+$reviewData->open->forceNotReview = new stdClass();
+$reviewData->open->forceNotReview->id = zenData('setting')->dao->lastInsertID();
+$reviewData->open->forceNotReview->owner = 'system';
+$reviewData->open->forceNotReview->module = 'testcase';
+$reviewData->open->forceNotReview->key = 'forceNotReview';
+
+zenData('setting')->dao->delete()->from(TABLE_CONFIG)->where('module')->eq('testcase')->andWhere('key')->in('forceReview, reviewCase, needReview, forceNotReview')->exec();
+zenData('setting')->dao->insert(TABLE_CONFIG)->data($reviewData->open->forceReview)->exec();
+zenData('setting')->dao->insert(TABLE_CONFIG)->data($reviewData->open->reviewCase)->exec();
+zenData('setting')->dao->insert(TABLE_CONFIG)->data($reviewData->open->needReview)->exec();
+zenData('setting')->dao->insert(TABLE_CONFIG)->data($reviewData->open->forceNotReview)->exec();
+
+$user = zenData('user');
+$user->id->setFields(array(array('range' => zenData('user')->dao->lastInsertID())));
+$user->account->setFields(array(array('range' => 'luxuyang')));
+$user->realname->setFields(array(array('range' => '研发')));
+$user->gen(1, $isClear = false);
+
+zenData('case')->loadYaml('case')->gen(1);
+
+$tester = new testcase();
+
+$product = array(
+ 'productID' => 1,
+);
+$testcase = array(
+ 'reviewedDate' => '2025-09-09',
+ 'result' => '确认通过',
+ 'reviewedBy' => array('admin', '研发'),
+ 'comment' => '备注一下'
+);
+
+r($tester->testcaseReview($product, $testcase)) && p('message,status') && e('测试用例评审通过,SUCCESS'); //测试用例评审通过。
+
+/* 还原zt_config、zt_user数据 */
+zenData('setting')->dao->delete()->from(TABLE_CONFIG)->where('module')->eq('testcase')->andWhere('key')->in('forceReview, reviewCase, needReview, forceNotReview')->exec();
+zenData('user')->dao->delete()->from(TABLE_USER)->where('account')->eq('luxuyang')->exec();
+$tester->closeBrowser();
diff --git a/module/testcase/test/ui/testcaseview.php b/module/testcase/test/ui/testcaseview.php
new file mode 100755
index 0000000000..5bc56a495a
--- /dev/null
+++ b/module/testcase/test/ui/testcaseview.php
@@ -0,0 +1,25 @@
+#!/usr/bin/env php
+loadYaml('product')->gen(1);
+zenData('case')->loadYaml('case')->gen(1);
+$tester = new testcase();
+
+$product = array(
+ 'productID' => 1,
+);
+
+r($tester->testcaseView($product)) && p('message,status') && e('测试用例详情页验证成功,SUCCESS'); //测试用例详情验证
\ No newline at end of file
diff --git a/module/testcase/test/yaml/ignoreautocase.yaml b/module/testcase/test/yaml/ignoreautocase.yaml
new file mode 100644
index 0000000000..d7d4c4345d
--- /dev/null
+++ b/module/testcase/test/yaml/ignoreautocase.yaml
@@ -0,0 +1,7 @@
+title: table zt_case
+desc: "用例"
+author: Mengyi Liu
+version: "1.0"
+fields:
+ - field: auto
+ range: no{2},auto
diff --git a/module/testcase/ui/edit.html.php b/module/testcase/ui/edit.html.php
index 347ed7d795..fbd7f4ca7d 100644
--- a/module/testcase/ui/edit.html.php
+++ b/module/testcase/ui/edit.html.php
@@ -336,7 +336,7 @@ detailBody
)
)
),
- (!$isLibCase && hasPriv('testcase', 'linkCases')) ? item
+ (!$isLibCase && hasPriv('testcase', 'linkCases') && $config->edition == 'open') ? item
(
set::name($lang->testcase->linkCase),
a
@@ -347,7 +347,7 @@ detailBody
$lang->testcase->linkCases
)
) : null,
- (!$isLibCase && hasPriv('testcase', 'linkCases')) ? item
+ (!$isLibCase && hasPriv('testcase', 'linkCases') && $config->edition == 'open') ? item
(
set::trClass(!isset($case->linkCaseTitles) ? 'hidden' : ''),
control
diff --git a/module/testcase/ui/view.html.php b/module/testcase/ui/view.html.php
index 5d855a0ad6..7900a27e01 100644
--- a/module/testcase/ui/view.html.php
+++ b/module/testcase/ui/view.html.php
@@ -209,7 +209,7 @@ $tabs[] = setting()
->title($lang->testcase->legendOpenAndEdit)
->control('caseTimeInfo');
-$tabs[] = setting()
+$tabs['caseRelatedList'] = setting()
->group('relatives')
->title($lang->testcase->legendOther)
->control('caseRelatedList');
diff --git a/module/testcase/zen.php b/module/testcase/zen.php
index 89b35e65e4..dda02db89d 100755
--- a/module/testcase/zen.php
+++ b/module/testcase/zen.php
@@ -184,7 +184,7 @@ class testcaseZen extends testcase
$actionURL = $this->createLink($currentModule, $currentMethod, $projectParam . "productID=$productID&branch=$branch&browseType=bySearch&queryID=myQueryID");
$searchProducts = $this->product->getPairs('', 0, '', 'all');
- $this->buildSearchForm($productID, $searchProducts, $queryID, $actionURL, $projectID);
+ $this->testcase->buildSearchForm($productID, $searchProducts, $queryID, $actionURL, $projectID);
}
/**
@@ -517,6 +517,12 @@ class testcaseZen extends testcase
$scenes = $this->preProcessScenesForBrowse($scenes);
$cases = $this->preProcessCasesForBrowse($cases);
+ if($this->config->edition != 'open')
+ {
+ $this->loadModel('custom');
+ foreach($cases as $caseID => $case) $case->relatedObject = $this->custom->getRelatedObjectList($caseID, 'testcase', 'byRelation', true);
+ }
+
$this->view->cases = array_merge($scenes, $cases);
$this->view->orderBy = $orderBy;
$this->view->pager = $pager;
@@ -2523,7 +2529,7 @@ class testcaseZen extends testcase
if($this->app->tab == 'execution') $objectID = $case->execution;
unset($this->config->testcase->search['fields']['product']);
- $this->buildSearchForm($case->product, $this->products, $queryID, $actionURL, $objectID);
+ $this->testcase->buildSearchForm($case->product, $this->products, $queryID, $actionURL, $objectID);
}
/**
@@ -2554,84 +2560,6 @@ class testcaseZen extends testcase
$this->loadModel('bug')->buildSearchForm($case->product, $this->products, $queryID, $actionURL, (string)$objectID);
}
- /**
- * Build search form.
- *
- * @param int $productID
- * @param array $products
- * @param int $queryID
- * @param string $actionURL
- * @param int $projectID
- * @param int $moduleID
- * @param string $branch
- * @access public
- * @return void
- */
- private function buildSearchForm(int $productID, array $products, int $queryID, string $actionURL, int $projectID = 0, int $moduleID = 0, string $branch = 'all'): void
- {
- /* 获取产品列表。Get productList. */
- if($this->app->tab == 'project' && !$productID)
- {
- if($projectID)
- {
- $products = $this->loadModel('product')->getProducts($projectID);
- $productList = array(0 => '');
- foreach($products as $product) $productList[$product->id] = $product->name;
- $productList['all'] = $this->lang->product->allProductsOfProject;
- }
- else
- {
- $productList = $products;
- }
- $this->config->testcase->search['params']['story']['values'] = $this->loadModel('story')->getExecutionStoryPairs($projectID, 0, 'all', $moduleID, 'full', 'active');
- }
- else
- {
- $productList = array(0 => '');
- $productList['all'] = $this->lang->all;
- if(isset($products[$productID])) $productList[$productID] = $products[$productID];
- $this->config->testcase->search['params']['story']['values'] = $this->loadModel('story')->getProductStoryPairs($productID, $branch, array(), 'active,reviewing', 'id_desc', 0, '', 'story', false);
- }
-
- /* 获取模块列表。*/
- /* Get moduleList. */
- if($productID)
- {
- $modules = $this->loadModel('tree')->getOptionMenu($productID, 'case', 0, $branch);
- }
- else
- {
- $modules = array();
- foreach($products as $id => $name) $modules += $this->loadModel('tree')->getOptionMenu($id, 'case', 0);
- }
-
- $this->config->testcase->search['params']['product']['values'] = $productList;
- $this->config->testcase->search['params']['module']['values'] = $modules;
- $this->config->testcase->search['params']['scene']['values'] = $this->testcase->getSceneMenu($productID, $moduleID, $branch, 0, 0, true);
- $this->config->testcase->search['params']['lib']['values'] = $this->loadModel('caselib')->getLibraries();
-
- $product = $this->loadModel('product')->getByID($productID);
- if((isset($product->type) && $product->type == 'normal') || $this->app->tab == 'project')
- {
- unset($this->config->testcase->search['fields']['branch']);
- unset($this->config->testcase->search['params']['branch']);
- }
- else
- {
- $branches = $this->loadModel('branch')->getPairs($productID, '', $projectID);
- $this->config->testcase->search['fields']['branch'] = sprintf($this->lang->product->branch, $this->lang->product->branchName[$product->type]);
- $this->config->testcase->search['params']['branch']['values'] = array('' => '', BRANCH_MAIN => $this->lang->branch->main) + $branches + array('all' => $this->lang->branch->all);
- }
-
- if(!$this->config->testcase->needReview) unset($this->config->testcase->search['params']['status']['values']['wait']);
-
- $this->config->testcase->search['actionURL'] = $actionURL;
- $this->config->testcase->search['queryID'] = $queryID;
- $this->config->testcase->search['module'] = 'testcase';
-
- $this->loadModel('search')->setSearchParams($this->config->testcase->search);
- }
-
/**
* 获取导出的字段列表。
* Get the export fields.
diff --git a/module/testtask/control.php b/module/testtask/control.php
index 1c44b98b86..a7d8cee319 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -918,15 +918,15 @@ class testtask extends control
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => $url));
}
- if(!$this->post->caseIdList) $this->locate($url);
-
/* 根据不同情况获取要批量执行的用例。*/
/* Get cases to run according to different situations. */
- $caseIdList = array_unique($this->post->caseIdList);
- $cases = $this->testtaskZen->prepareCasesForBatchRun($productID, $orderBy, $from, $taskID, $confirm, $caseIdList);
+ $caseIdList = $this->loadModel('testcase')->ignoreAutoCaseIdList((array)$this->post->caseIdList);
+ if(empty($caseIdList)) $this->locate($url);
+
+ $cases = $this->testtaskZen->prepareCasesForBatchRun($productID, $orderBy, $from, $taskID, $confirm, $caseIdList);
if(empty($cases)) return $this->send(array('result' => 'fail', 'load' => array('alert' => $this->lang->testtask->skipChangedCases, 'locate' => $url)));
- $steps = $this->loadModel('testcase')->getStepGroupByIdList($caseIdList);
+ $steps = $this->testcase->getStepGroupByIdList($caseIdList);
$emptyCases = '';
foreach($cases as $caseID => $case)
diff --git a/module/testtask/model.php b/module/testtask/model.php
index 102c159263..74da0229c9 100755
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -107,7 +107,7 @@ class testtaskModel extends model
{
$begin = '';
$end = '';
- $beginAndEnd = $this->loadModel('action')->computeBeginAndEnd($browseType);
+ $beginAndEnd = $this->loadModel('action')->computeBeginAndEnd($browseType, '', 'next');
if($browseType != 'all' and $browseType != 'newest' and !empty($beginAndEnd))
{
$begin = $beginAndEnd['begin'];
@@ -1684,7 +1684,7 @@ class testtaskModel extends model
if($action == 'activate') return ($testtask->status == 'blocked' || $testtask->status == 'done');
if($action == 'close') return $testtask->status != 'done';
if($action == 'ztfrun') return $testtask->auto == 'auto';
- if($action == 'runcase') return (empty($testtask->lib) || !empty($testtask->product)) && $testtask->auto == 'no' && $testtask->status != 'wait';
+ if($action == 'runcase') return (empty($testtask->lib) || !empty($testtask->product)) && $testtask->status != 'wait';
return true;
}
diff --git a/module/testtask/zen.php b/module/testtask/zen.php
index 6f7641547d..f36c6ce990 100644
--- a/module/testtask/zen.php
+++ b/module/testtask/zen.php
@@ -555,10 +555,7 @@ class testtaskZen extends testtask
/* 如果批量执行的用例来自测试单，检查这些用例的版本，如果不是最新版就移除它们。*/
/* If cases come from a testtask, check the version of these cases, if not the latest version, remove them. */
- $runs = $this->dao->select('`case`, version')->from(TABLE_TESTRUN)
- ->where('`case`')->in(array_keys($cases))
- ->andWhere('task')->eq($taskID)
- ->fetchPairs();
+ $runs = $this->dao->select('`case`, version')->from(TABLE_TESTRUN)->where('`case`')->in(array_keys($cases))->andWhere('task')->eq($taskID)->fetchPairs();
foreach($cases as $caseID => $case)
{
if(isset($runs[$caseID]) && $runs[$caseID] < $case->version) unset($cases[$caseID]);
diff --git a/module/tree/control.php b/module/tree/control.php
index aa0b57d77b..fbf518c380 100644
--- a/module/tree/control.php
+++ b/module/tree/control.php
@@ -78,6 +78,15 @@ class tree extends control
/* 获取产品的分支。 Get branches of product. */
$branches = ($root->rootType == 'product' && $root->type != 'normal') ? $this->loadModel('branch')->getPairs($root->id, 'withClosed') : array();
+ $isFlowModule = false;
+ if($this->config->edition != 'open')
+ {
+ $flow = $this->loadModel('workflow')->getByModule($from);
+ $isFlowModule = !empty($flow);
+ }
+
+ if($isFlowModule) $this->config->excludeDropmenuList[] = "{$from}-browse";
+
$this->view->title = $viewType == 'host' ? $this->lang->host->groupMaintenance : $this->lang->tree->manage;
$this->view->rootID = $root->id;
$this->view->root = $root;
@@ -93,6 +102,7 @@ class tree extends control
$this->view->from = $from;
$this->view->tree = $this->tree->getProductStructure($rootID, $viewType, $branch);
$this->view->canBeChanged = common::canModify($root->rootType, $root);
+ $this->view->isFlowModule = $isFlowModule;
$this->display();
}
diff --git a/module/tree/model.php b/module/tree/model.php
index f2e6a8c9cf..e22d1ec4b5 100644
--- a/module/tree/model.php
+++ b/module/tree/model.php
@@ -39,6 +39,8 @@ class treeModel extends model
->beginIF($type == 'task')->orWhere('type')->eq('task')->fi()
->beginIF($type == 'bug')->orWhere('type')->eq('bug')->fi()
->beginIF($type == 'case')->orWhere('type')->eq('case')->fi()
+ ->beginIF($type == 'ticket')->orWhere('type')->eq('ticket')->fi()
+ ->beginIF($type == 'feedback')->orWhere('type')->eq('feedback')->fi()
->markRight(1)
->andWhere('deleted')->eq('0')
->orderBy('grade asc')
diff --git a/module/tree/ui/browse.html.php b/module/tree/ui/browse.html.php
index 36228f6bd2..3150ff24ec 100644
--- a/module/tree/ui/browse.html.php
+++ b/module/tree/ui/browse.html.php
@@ -273,6 +273,7 @@ div
$moduleRows,
set::actionsClass('justify-start'),
set::submitBtnText($lang->save),
+ set::back($isFlowModule ? 'GLOBAL' : 'APP'),
input
(
set::type('hidden'),
diff --git a/module/upgrade/config.php b/module/upgrade/config.php
index 386bae25c4..e204945d45 100644
--- a/module/upgrade/config.php
+++ b/module/upgrade/config.php
@@ -58,7 +58,8 @@ $config->upgrade->maxVersion['max5_5'] = '20_6';
$config->upgrade->maxVersion['max5_6'] = '20_7';
$config->upgrade->maxVersion['max5_6_1'] = '20_7_1';
$config->upgrade->maxVersion['max5_7'] = '20_8';
-$config->upgrade->maxVersion['max6_0'] = '21_0'; // max insert position.
+$config->upgrade->maxVersion['max6_0'] = '21_0';
+$config->upgrade->maxVersion['max6_1'] = '21_1'; // max insert position.
$config->upgrade->bizVersion = array();
$config->upgrade->bizVersion['biz1_0'] = '9_5_1';
@@ -155,7 +156,8 @@ $config->upgrade->bizVersion['biz10_5'] = '20_6';
$config->upgrade->bizVersion['biz10_6'] = '20_7';
$config->upgrade->bizVersion['biz10_6_1'] = '20_7_1';
$config->upgrade->bizVersion['biz10_7'] = '20_8';
-$config->upgrade->bizVersion['biz11_0'] = '21_0'; // biz insert position.
+$config->upgrade->bizVersion['biz11_0'] = '21_0';
+$config->upgrade->bizVersion['biz11_1'] = '21_1'; // biz insert position.
$config->upgrade->proVersion = array();
$config->upgrade->proVersion['pro1_0'] = '3_1';
@@ -289,7 +291,8 @@ $config->upgrade->ipdVersion['ipd2_5'] = '20_6';
$config->upgrade->ipdVersion['ipd2_6'] = '20_7';
$config->upgrade->ipdVersion['ipd2_6_1'] = '20_7_1';
$config->upgrade->ipdVersion['ipd2_7'] = '20_8';
-$config->upgrade->ipdVersion['ipd3_0'] = '21_0'; // ipd insert position.
+$config->upgrade->ipdVersion['ipd3_0'] = '21_0';
+$config->upgrade->ipdVersion['ipd3_1'] = '21_1'; // ipd insert position.
$config->upgrade->lowerTables = array();
$config->upgrade->lowerTables[$config->db->prefix . 'caseStep'] = $config->db->prefix . 'casestep';
@@ -1362,9 +1365,6 @@ $config->delete['20_8'][] = 'extension/max/git';
$config->delete['20_8'][] = 'extension/ipd/git';
$config->delete['20_8'][] = 'extension/max/svn';
$config->delete['20_8'][] = 'extension/ipd/svn';
-$config->delete['20_8'][] = 'extension/biz/index/ext/config/repo.php';
-$config->delete['20_8'][] = 'extension/max/index/ext/config/repo.php';
-$config->delete['20_8'][] = 'extension/ipd/index/ext/config/repo.php';
$config->delete['20_8'][] = 'extension/biz/workflow/ext/model/flow.php';
$config->delete['20_8'][] = 'extension/biz/workflow/ext/model/class/flow.class.php';
$config->delete['20_8'][] = 'extension/max/workflow/ext/model/flow.php';
@@ -1374,6 +1374,40 @@ $config->delete['20_8'][] = 'extension/ipd/workflow/ext/model/class/flow.class.p
$config->delete['20_8'][] = 'extension/biz/workflow/ext/control/ajaxgetapps.php';
$config->delete['20_8'][] = 'extension/max/workflow/ext/control/ajaxgetapps.php';
$config->delete['20_8'][] = 'extension/ipd/workflow/ext/control/ajaxgetapps.php';
+$config->delete['20_9'][] = 'extension/biz/index/ext/config/repo.php';
+$config->delete['20_9'][] = 'extension/max/index/ext/config/repo.php';
+$config->delete['20_9'][] = 'extension/ipd/index/ext/config/repo.php';
+$config->delete['20_9'][] = 'extension/biz/common/ext/lang/zh-cn/ops.php';
+$config->delete['20_9'][] = 'extension/max/common/ext/lang/zh-cn/ops.php';
+$config->delete['20_9'][] = 'extension/ipd/common/ext/lang/zh-cn/ops.php';
+$config->delete['20_9'][] = 'extension/biz/common/ext/lang/zh-tw/ops.php';
+$config->delete['20_9'][] = 'extension/max/common/ext/lang/zh-tw/ops.php';
+$config->delete['20_9'][] = 'extension/ipd/common/ext/lang/zh-tw/ops.php';
+$config->delete['20_9'][] = 'extension/biz/common/ext/lang/en/ops.php';
+$config->delete['20_9'][] = 'extension/max/common/ext/lang/en/ops.php';
+$config->delete['20_9'][] = 'extension/ipd/common/ext/lang/en/ops.php';
+$config->delete['20_9'][] = 'extension/biz/common/ext/lang/de/ops.php';
+$config->delete['20_9'][] = 'extension/max/common/ext/lang/de/ops.php';
+$config->delete['20_9'][] = 'extension/ipd/common/ext/lang/de/ops.php';
+$config->delete['20_9'][] = 'extension/biz/common/ext/lang/fr/ops.php';
+$config->delete['20_9'][] = 'extension/max/common/ext/lang/fr/ops.php';
+$config->delete['20_9'][] = 'extension/ipd/common/ext/lang/fr/ops.php';
+$config->delete['20_9'][] = 'extension/biz/deploy/js/steps.ui.js';
+$config->delete['20_9'][] = 'extension/max/deploy/js/steps.ui.js';
+$config->delete['20_9'][] = 'extension/ipd/deploy/js/steps.ui.js';
+$config->delete['20_9'][] = 'extension/biz/deploy/ui/scope.html.php';
+$config->delete['20_9'][] = 'extension/max/deploy/ui/scope.html.php';
+$config->delete['20_9'][] = 'extension/ipd/deploy/ui/scope.html.php';
+$config->delete['20_9'][] = 'extension/biz/deploy/ui/scope.html.php';
+$config->delete['20_9'][] = 'extension/max/deploy/ui/managescope.html.php';
+$config->delete['20_9'][] = 'extension/ipd/deploy/ui/managescope.html.php';
+$config->delete['20_9'][] = 'extension/biz/deploy/js/managescope.ui.js';
+$config->delete['20_9'][] = 'extension/max/deploy/js/managescope.ui.js';
+$config->delete['20_9'][] = 'extension/ipd/deploy/js/managescope.ui.js';
+$config->delete['20_9'][] = 'extension/biz/deploy/js/finish.ui.js';
+$config->delete['20_9'][] = 'extension/max/deploy/js/finish.ui.js';
+$config->delete['20_9'][] = 'extension/ipd/deploy/js/finish.ui.js';
+$config->delete['20_9'][] = 'module/account/';
$config->upgrade->openModules = array('action', 'admin', 'ai', 'bi', 'aiapp', 'api', 'automation', 'backup', 'block', 'branch', 'budget', 'bug', 'build', 'caselib', 'chart', 'ci', 'client', 'common', 'company', 'compile', 'convert', 'cron', 'custom', 'datatable', 'dataview', 'dept', 'design', 'dev', 'dimension', 'doc', 'durationestimation', 'entry', 'execution', 'extension', 'file', 'git', 'gitlab', 'group', 'holiday', 'im', 'index', 'index.html', 'install', 'issue', 'jenkins', 'job', 'kanban', 'license', 'mail', 'message', 'metric', 'misc', 'mr', 'my', 'personnel', 'pipeline', 'product', 'productplan', 'productset', 'program', 'programplan', 'project', 'projectbuild', 'projectplan', 'projectrelease', 'projectstory', 'pivot', 'qa', 'release', 'repo', 'report', 'risk', 'score', 'screen', 'search', 'setting', 'sonarqube', 'sso', 'stage', 'stakeholder', 'story', 'subject', 'svn', 'task', 'testcase', 'testreport', 'testsuite', 'testtask', 'todo', 'tree', 'tutorial', 'upgrade', 'user', 'webhook', 'weekly', 'workestimation', 'gitea', 'gogs', 'transfer', 'zahost', 'zanode', 'editor', 'charter', 'roadmap', 'account', 'cne', 'host', 'instance', 'ops', 'serverroom', 'space', 'store', 'system', 'solution', 'demand', 'gitfox', 'epic', 'requirement');
$config->upgrade->unsetModules = array('design', 'program', 'programplan', 'projectbuild', 'projectrelease', 'stage', 'stakeholder', 'product', 'branch', 'productplan', 'release', 'build', 'qa', 'bug', 'testcase', 'testtask', 'testreport', 'testsuite', 'caselib', 'automation', 'repo', 'ci', 'compile', 'jenkins', 'job', 'svn', 'gitlab', 'sonarqube', 'mr', 'git', 'report', 'sqlbuilder', 'feedback', 'faq', 'attend', 'holiday', 'leave', 'makeup', 'overtime', 'lieu', 'ops', 'host', 'serverroom', 'account', 'domain', 'service', 'deploy', 'conference', 'traincourse', 'pssp', 'baseline', 'classify', 'cm', 'cmcl', 'auditcl', 'reviewcl', 'process', 'activity', 'zoutput', 'auditplan', 'nc', 'subject', 'weekly', 'workestimation', 'issue', 'durationestimation', 'risk', 'opportunity', 'trainplan', 'gapanalysis', 'researchplan', 'researchreport', 'meeting', 'meetingroom', 'budget', 'reviewissue', 'reviewsetting', 'review', 'milestone', 'measurement', 'measrecord', 'assetlib', 'setting', 'im', 'client', 'ldap', 'dev', 'api', 'gitea', 'gogs', 'zanode', 'zahost');
diff --git a/module/upgrade/config/upgradeflow.php b/module/upgrade/config/upgradeflow.php
index db26476b29..fcb21144d1 100644
--- a/module/upgrade/config/upgradeflow.php
+++ b/module/upgrade/config/upgradeflow.php
@@ -172,6 +172,7 @@ $config->upgrade->execFlow['biz6_4'] = array('functions' => 'importLiteMod
$config->upgrade->execFlow['biz8_12'] = array('functions' => 'AddFeedbackDatasource');
$config->upgrade->execFlow['biz10_0_0'] = array('functions' => 'importERURModules');
$config->upgrade->execFlow['biz10_5'] = array('functions' => 'processBuildinBrowseFields,importCaseLibModule,appendFlowFieldsForBelong');
+$config->upgrade->execFlow['biz11_0'] = array('functions' => 'processDeployStep');
if(!empty($config->isINT))
{
diff --git a/module/upgrade/control.php b/module/upgrade/control.php
index bc26e141d4..8ef7782406 100644
--- a/module/upgrade/control.php
+++ b/module/upgrade/control.php
@@ -820,4 +820,17 @@ class upgrade extends control
$check = $this->loadModel('bi')->checkDuckdbInstall();
echo(json_encode($check));
}
+
+
+ /**
+ * 定时任务：处理内置关联关系。
+ * AJAX: Process object relation.
+ *
+ * @access public
+ * @return void
+ */
+ public function ajaxProcessObjectRelation()
+ {
+ $this->upgrade->processObjectRelation();
+ }
}
diff --git a/module/upgrade/lang/version.php b/module/upgrade/lang/version.php
index bf6d6fc5e0..16ad2680a4 100644
--- a/module/upgrade/lang/version.php
+++ b/module/upgrade/lang/version.php
@@ -203,7 +203,8 @@ $lang->upgrade->fromVersions['20_6'] = '20.6';
$lang->upgrade->fromVersions['20_7'] = '20.7';
$lang->upgrade->fromVersions['20_7_1'] = '20.7.1';
$lang->upgrade->fromVersions['20_8'] = '20.8';
-$lang->upgrade->fromVersions['21_0'] = '21.0'; // pms insert position.
+$lang->upgrade->fromVersions['21_0'] = '21.0';
+$lang->upgrade->fromVersions['21_1'] = '21.1'; // pms insert position.
global $config;
/* Lite. */
@@ -407,7 +408,8 @@ $lang->upgrade->fromVersions['biz10_5'] = 'Biz10.5';
$lang->upgrade->fromVersions['biz10_6'] = 'Biz10.6';
$lang->upgrade->fromVersions['biz10_6_1'] = 'Biz10.6.1';
$lang->upgrade->fromVersions['biz10_7'] = 'Biz10.7';
-$lang->upgrade->fromVersions['biz11_0'] = 'Biz11.0'; // biz insert position.
+$lang->upgrade->fromVersions['biz11_0'] = 'Biz11.0';
+$lang->upgrade->fromVersions['biz11_1'] = 'Biz11.1'; // biz insert position.
/* Max. */
$lang->upgrade->fromVersions['max2_0_beta4'] = 'Max2.0.beta4';
@@ -469,7 +471,8 @@ $lang->upgrade->fromVersions['max5_5'] = 'Max5.5';
$lang->upgrade->fromVersions['max5_6'] = 'Max5.6';
$lang->upgrade->fromVersions['max5_6_1'] = 'Max5.6.1';
$lang->upgrade->fromVersions['max5_7'] = 'Max5.7';
-$lang->upgrade->fromVersions['max6_0'] = 'Max6.0'; // max insert position.
+$lang->upgrade->fromVersions['max6_0'] = 'Max6.0';
+$lang->upgrade->fromVersions['max6_1'] = 'Max6.1'; // max insert position.
/* Ipd */
$lang->upgrade->fromVersions['ipd1_0_beta1'] = 'Ipd1.0.beta1';
@@ -492,4 +495,5 @@ $lang->upgrade->fromVersions['ipd2_4'] = 'Ipd2.4';
$lang->upgrade->fromVersions['ipd2_5'] = 'Ipd2.5';
$lang->upgrade->fromVersions['ipd2_6'] = 'Ipd2.6';
$lang->upgrade->fromVersions['ipd2_6_1'] = 'Ipd2.6.1';
-$lang->upgrade->fromVersions['ipd2_7'] = 'Ipd2.7'; // ipd insert position.
+$lang->upgrade->fromVersions['ipd2_7'] = 'Ipd2.7';
+$lang->upgrade->fromVersions['ipd3_0'] = 'Ipd3.0'; // ipd insert position.
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 71fc4f04f1..a1b842ae0c 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -10009,7 +10009,7 @@ class upgradeModel extends model
}
/**
- * Upgrade demand files.
+ * Upgrade my doc space.
*
* @access public
* @return bool
@@ -10073,4 +10073,382 @@ class upgradeModel extends model
}
}
}
+
+ /**
+ * Process object relations.
+ * 将系统内原有关联关系合并到relation表中：需求关联需求、bug关联bug、用例关联用例、问题关联风险、风险关联问题.
+ *
+ * @access public
+ * @return bool
+ */
+ public function processObjectRelation()
+ {
+ if($this->config->edition == 'open') return true;
+
+ /* Process story link story. */
+ $linkedtoStories = $this->dao->select('*')->from(TABLE_RELATION)
+ ->where('AType')->in('story,requirement,epic')
+ ->andWhere('relation')->eq('linkedto')
+ ->andWhere('BType')->in('story,requirement,epic')
+ ->fetchAll('id');
+ foreach($linkedtoStories as $story)
+ {
+ $relation = new stdClass();
+ $relation->AType = $story->AType;
+ $relation->AID = $story->AID;
+ $relation->relation = 1;
+ $relation->BType = $story->BType;
+ $relation->BID = $story->BID;
+ $this->dao->replace(TABLE_RELATION)->data($relation)->exec();
+ }
+
+ /* Process bug link bug. */
+ $bugList = $this->dao->select('id,story,relatedBug,task,`case`')->from(TABLE_BUG)
+ ->where('relatedBug')->ne('')
+ ->orWhere('story')->ne(0)
+ ->orWhere('task')->ne(0)
+ ->orWhere('case')->ne(0)
+ ->fetchAll('id');
+ foreach($bugList as $bugID => $bug)
+ {
+ if(!empty($bug->relatedBug))
+ {
+ foreach(explode(',', ",{$bug->relatedBug},") as $relatedBugID)
+ {
+ if(empty($relatedBugID)) continue;
+ $relation = new stdClass();
+ $relation->AType = 'bug';
+ $relation->AID = $bugID;
+ $relation->relation = 1;
+ $relation->BType = 'bug';
+ $relation->BID = $relatedBugID;
+ $this->dao->replace(TABLE_RELATION)->data($relation)->exec();
+ }
+ }
+ if(!empty($bug->story))
+ {
+ $relation = new stdClass();
+ $relation->AType = 'story';
+ $relation->AID = $bug->story;
+ $relation->relation = 'generated';
+ $relation->BType = 'bug';
+ $relation->BID = $bugID;
+ $this->dao->replace(TABLE_RELATION)->data($relation)->exec();
+ }
+ if(!empty($bug->task))
+ {
+ $relation = new stdClass();
+ $relation->AType = 'task';
+ $relation->AID = $bug->task;
+ $relation->relation = 'generated';
+ $relation->BType = 'bug';
+ $relation->BID = $bugID;
+ $this->dao->replace(TABLE_RELATION)->data($relation)->exec();
+ }
+ if(!empty($bug->case))
+ {
+ $relation = new stdClass();
+ $relation->AType = 'testcase';
+ $relation->AID = $bug->case;
+ $relation->relation = 'generated';
+ $relation->BType = 'bug';
+ $relation->BID = $bugID;
+ $this->dao->replace(TABLE_RELATION)->data($relation)->exec();
+ }
+ }
+
+ /* Process case link case. */
+ $caseList = $this->dao->select('id,story,linkCase,fromBug')->from(TABLE_CASE)->where('linkCase')->ne('')->orWhere('story')->ne(0)->orWhere('fromBug')->ne(0)->fetchAll('id');
+ foreach($caseList as $caseID => $case)
+ {
+ foreach(explode(',', ",{$case->linkCase},") as $relatedCaseID)
+ {
+ if(empty($relatedCaseID)) continue;
+ $relation = new stdClass();
+ $relation->AType = 'testcase';
+ $relation->AID = $caseID;
+ $relation->relation = 1;
+ $relation->BType = 'testcase';
+ $relation->BID = $relatedCaseID;
+ $this->dao->replace(TABLE_RELATION)->data($relation)->exec();
+ }
+ if(!empty($case->story))
+ {
+ $relation = new stdClass();
+ $relation->AType = 'story';
+ $relation->AID = $case->story;
+ $relation->relation = 'generated';
+ $relation->BType = 'testcase';
+ $relation->BID = $caseID;
+ $this->dao->replace(TABLE_RELATION)->data($relation)->exec();
+ }
+ if(!empty($case->fromBug))
+ {
+ $relation = new stdClass();
+ $relation->AType = 'bug';
+ $relation->AID = $case->fromBug;
+ $relation->relation = 'generated';
+ $relation->BType = 'testcase';
+ $relation->BID = $caseID;
+ $this->dao->replace(TABLE_RELATION)->data($relation)->exec();
+ }
+ }
+
+ /* Process bug transferred to task. */
+ $taskList = $this->dao->select('id,story,fromBug,design')->from(TABLE_TASK)->where('fromBug')->ne(0)->orWhere('story')->ne(0)->orWhere('design')->ne(0)->fetchAll('id');
+ foreach($taskList as $taskID => $task)
+ {
+ $relation = new stdClass();
+ $relation->BType = 'task';
+ $relation->BID = $taskID;
+ if(!empty($task->fromBug))
+ {
+ $relation->relation = 'transferredto';
+ $relation->AType = 'bug';
+ $relation->AID = $task->fromBug;
+ $this->dao->replace(TABLE_RELATION)->data($relation)->exec();
+ }
+ if(!empty($task->story))
+ {
+ $relation->relation = 'generated';
+ $relation->AType = 'story';
+ $relation->AID = $task->story;
+ $this->dao->replace(TABLE_RELATION)->data($relation)->exec();
+ }
+ if(!empty($task->design))
+ {
+ $relation->relation = 'generated';
+ $relation->AType = 'design';
+ $relation->AID = $task->design;
+ $this->dao->replace(TABLE_RELATION)->data($relation)->exec();
+ }
+ }
+
+ /* Process bug transferred to story. */
+ $bugTransferredToStory = $this->dao->select('id,fromBug')->from(TABLE_STORY)->where('fromBug')->ne(0)->fetchPairs('id');
+ foreach($bugTransferredToStory as $storyID => $bugID)
+ {
+ $relation = new stdClass();
+ $relation->AType = 'bug';
+ $relation->AID = $bugID;
+ $relation->relation = 'transferredto';
+ $relation->BType = 'story';
+ $relation->BID = $storyID;
+ $this->dao->replace(TABLE_RELATION)->data($relation)->exec();
+ }
+
+ /* Process release. */
+ $releaseLinkedStories = $this->dao->select('id,stories')->from(TABLE_RELEASE)->where('stories')->ne('')->fetchPairs('id');
+ foreach($releaseLinkedStories as $releaseID => $storyIdList)
+ {
+ foreach(explode(',', trim($storyIdList, ',')) as $storyID)
+ {
+ if(empty($storyID)) continue;
+ $relation = new stdClass();
+ $relation->AType = 'story';
+ $relation->AID = $storyID;
+ $relation->relation = 'interrated';
+ $relation->BType = 'release';
+ $relation->BID = $releaseID;
+ $this->dao->replace(TABLE_RELATION)->data($relation)->exec();
+ }
+ }
+
+ /* Process build. */
+ $buildLinkedStories = $this->dao->select('id,stories')->from(TABLE_BUILD)->where('stories')->ne('')->fetchPairs('id');
+ foreach($buildLinkedStories as $buildID => $storyIdList)
+ {
+ foreach(explode(',', trim($storyIdList, ',')) as $storyID)
+ {
+ if(empty($storyID)) continue;
+ $relation = new stdClass();
+ $relation->AType = 'story';
+ $relation->AID = $storyID;
+ $relation->relation = 'interrated';
+ $relation->BType = 'build';
+ $relation->BID = $buildID;
+ $this->dao->replace(TABLE_RELATION)->data($relation)->exec();
+ }
+ }
+
+ /* Process story generated design. */
+ $designStories = $this->dao->select('id,story')->from(TABLE_DESIGN)->where('story')->ne(0)->fetchPairs('id');
+ $storyTypeList = $this->dao->select('id,type')->from(TABLE_STORY)->where('id')->in(array_values($designStories))->fetchPairs('id');
+ foreach($designStories as $designID => $storyID)
+ {
+ $relation = new stdClass();
+ $relation->AType = $storyTypeList[$storyID];
+ $relation->AID = $storyID;
+ $relation->relation = 'generated';
+ $relation->BType = 'design';
+ $relation->BID = $designID;
+ $this->dao->replace(TABLE_RELATION)->data($relation)->exec();
+ }
+
+ /* Process feedback transferred to story. */
+ $feedbackTransferredToStories = $this->dao->select('id,type,feedback')->from(TABLE_STORY)->where('feedback')->ne(0)->fetchAll('id');
+ foreach($feedbackTransferredToStories as $story)
+ {
+ $relation = new stdClass();
+ $relation->AType = 'feedback';
+ $relation->AID = $story->feedback;
+ $relation->relation = 'transferredto';
+ $relation->BType = $story->type;
+ $relation->BID = $story->id;
+ $this->dao->replace(TABLE_RELATION)->data($relation)->exec();
+ }
+
+ /* Process feedback transferredto to bug, task, ticket, demand. */
+ foreach(array('bug', 'task', 'ticket', 'demand') as $feedbackTransferredToType)
+ {
+ $feedbackTransferredTo = $this->dao->select('id,feedback')->from($this->config->objectTables[$feedbackTransferredToType])->where('feedback')->ne(0)->fetchPairs('id');
+ foreach($feedbackTransferredTo as $id => $feedbackID)
+ {
+ $relation = new stdClass();
+ $relation->AType = 'feedback';
+ $relation->AID = $feedbackID;
+ $relation->relation = 'transferredto';
+ $relation->BType = $feedbackTransferredToType;
+ $relation->BID = $id;
+ $this->dao->replace(TABLE_RELATION)->data($relation)->exec();
+ }
+ }
+
+ /* Process ticket transferred to story and bug. */
+ $ticketTransferred = $this->dao->select('*')->from(TABLE_TICKETRELATION)->fetchAll('id');
+ foreach($ticketTransferred as $transferredObject)
+ {
+ $relation = new stdClass();
+ $relation->AType = 'ticket';
+ $relation->AID = $transferredObject->ticketId;
+ $relation->relation = 'transferredto';
+ $relation->BType = $transferredObject->objectType;
+ $relation->BID = $transferredObject->objectId;
+ $this->dao->replace(TABLE_RELATION)->data($relation)->exec();
+ }
+
+ /* Process twins. */
+ $twins = $this->dao->select('id,twins')->from(TABLE_STORY)->where('twins')->ne('')->fetchPairs('id');
+ foreach($twins as $storyID => $twinsID)
+ {
+ foreach(explode(',', trim($twinsID, ',')) as $twinID)
+ {
+ if(empty($twinID)) continue;
+ $relation = new stdClass();
+ $relation->AType = 'story';
+ $relation->AID = $storyID;
+ $relation->relation = 'twin';
+ $relation->BType = 'story';
+ $relation->BID = $twinID;
+ $this->dao->replace(TABLE_RELATION)->data($relation)->exec();
+ }
+ }
+
+ /* Process child story. */
+ $parentStories = array();
+ $childStories = $this->dao->select('id,type,parent,demand')->from(TABLE_STORY)->where('parent')->gt(0)->orWhere('demand')->gt(0)->fetchAll('id');
+ foreach($childStories as $childStory) $parentStories[$childStory->parent] = $childStory->parent;
+ $parentStoryType = $this->dao->select('id,type')->from(TABLE_STORY)->where('id')->in($parentStories)->fetchPairs('id');
+ foreach($childStories as $childStory)
+ {
+ $relation = new stdClass();
+ $relation->relation = 'subdivideinto';
+ $relation->BType = $childStory->type;
+ $relation->BID = $childStory->id;
+ if(!empty($childStory->parent))
+ {
+ $relation->AType = $parentStoryType[$childStory->parent];
+ $relation->AID = $childStory->parent;
+ $this->dao->replace(TABLE_RELATION)->data($relation)->exec();
+ }
+ if(!empty($childStory->demand))
+ {
+ $relation->AType = 'demand';
+ $relation->AID = $childStory->demand;
+ $this->dao->replace(TABLE_RELATION)->data($relation)->exec();
+ }
+ }
+
+ /* Process issue link risk. */
+ $riskIssues = $this->dao->select('*')->from(TABLE_RISKISSUE)->fetchAll();
+ foreach($riskIssues as $riskIssueList)
+ {
+ $relation = new stdClass();
+ $relation->AType = 'issue';
+ $relation->AID = $riskIssueList->issue;
+ $relation->relation = 1;
+ $relation->BType = 'risk';
+ $relation->BID = $riskIssueList->risk;
+ $this->dao->replace(TABLE_RELATION)->data($relation)->exec();
+ }
+
+ /* Process child demand. */
+ $childDemands = $this->dao->select('id,parent')->from(TABLE_DEMAND)->where('parent')->gt(0)->fetchPairs('id');
+ foreach($childDemands as $childDemandID => $parentDemandID)
+ {
+ $relation = new stdClass();
+ $relation->AType = 'demand';
+ $relation->AID = $parentDemandID;
+ $relation->relation = 'subdivideinto';
+ $relation->BType = 'demand';
+ $relation->BID = $childDemandID;
+ $this->dao->replace(TABLE_RELATION)->data($relation)->exec();
+ }
+
+ if(!dao::isError())
+ {
+ $this->dao->delete()->from(TABLE_CRON)
+ ->where('`command`')->eq('moduleName=upgrade&methodName=ajaxProcessObjectRelation')
+ ->andWhere('type')->eq('zentao')
+ ->andWhere('status')->eq('normal')
+ ->exec();
+ }
+ return true;
+ }
+
+ /**
+ * 处理上线步骤数据。
+ * Process deploy step.
+ *
+ * @access public
+ * @return void
+ */
+ public function processDeployStep()
+ {
+ $this->app->loadLang('deploy');
+ if(empty($this->lang->deploy->stageList)) return;
+
+ $deploySteps = $this->dao->select('*')->from(TABLE_DEPLOYSTEP)->fetchGroup('deploy');
+
+ $deployData = array();
+ foreach($deploySteps as $deployID => $steps)
+ {
+ foreach($steps as $step)
+ {
+ if($step->parent || $step->stage == '') return;
+
+ $deployData[$deployID][$step->stage][] = $step->id;
+ }
+ }
+
+ $this->loadModel('action');
+ foreach($deployData as $deployID => $steps)
+ {
+ foreach($steps as $stage => $childs)
+ {
+ $parent = new stdclass();
+ $parent->title = zget($this->lang->deploy->stageList, $stage, '');
+ $parent->status = 'wait';
+ $parent->deploy = $deployID;
+ $parent->createdBy = $this->app->user->account;
+ $parent->createdDate = helper::now();
+ $this->dao->insert(TABLE_DEPLOYSTEP)->data($parent)->autoCheck()->exec();
+
+ $parentID = $this->dao->lastInsertID();
+ $this->action->create('deploystep', $parentID, 'created');
+
+ $this->dao->update(TABLE_DEPLOYSTEP)->set('parent')->eq($parentID)->where('id')->in($childs)->exec();
+ }
+ }
+ }
}
diff --git a/module/user/model.php b/module/user/model.php
index ee330be0d4..2dc131d1bf 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -1088,7 +1088,7 @@ class userModel extends model
if(empty($acl['products'])) $productAllow = true;
if(empty($acl['sprints'])) $sprintAllow = true;
if(empty($acl['views'])) $viewAllow = true;
- if(empty($acl['actions'])) $actionAllow = true;
+ if(!isset($acl['actions'])) $actionAllow = true;
/* 将所有权限分组的视图访问限制合并。 */
if(!$programAllow && !empty($acl['programs'])) $acls['programs'] = array_merge($acls['programs'], $acl['programs']);
@@ -1106,7 +1106,7 @@ class userModel extends model
if($sprintAllow) $acls['sprints'] = array();
if($viewAllow) $acls['views'] = array();
if($actionAllow) $acls['actions'] = array();
- if(empty($acls['actions'])) unset($acls['actions']);
+ if($actionAllow && empty($acls['actions'])) unset($acls['actions']);
return $acls;
}
diff --git a/module/user/ui/edit.html.php b/module/user/ui/edit.html.php
index c4537c667e..adcebc84f4 100644
--- a/module/user/ui/edit.html.php
+++ b/module/user/ui/edit.html.php
@@ -27,6 +27,8 @@ if(!empty($config->user->contactField))
if($i % 2 == 1) $contacts[] = formRow($contactGroup);
}
+
+ if($i % 2 == 0) $contacts[] = formRow($contactGroup);
}
formPanel
diff --git a/module/zanode/control.php b/module/zanode/control.php
index d4a5fd843b..035723c9e9 100644
--- a/module/zanode/control.php
+++ b/module/zanode/control.php
@@ -613,17 +613,18 @@ class zanode extends control
{
if($_POST)
{
- $caseIDList = $_POST['caseIDList'];
- $runIDList = empty($_POST['runIDList']) ? array() : $_POST['runIDList'];
+ $caseIdList = $_POST['caseIdList'];
+ $runIdList = empty($_POST['runIDList']) ? array() : $_POST['runIDList'];
$script = $this->zanode->getAutomationByID($scriptID);
- $cases = $this->loadModel('testcase')->getByList($caseIDList);
+ $cases = $this->loadModel('testcase')->getByList($caseIdList);
$case2RunMap = array();
- foreach($caseIDList as $index => $caseID) $case2RunMap[$caseID] = empty($runIDList[$index]) ? 0 : $runIDList[$index];
+ foreach($caseIdList as $index => $caseID) $case2RunMap[$caseID] = empty($runIDList[$index]) ? 0 : $runIDList[$index];
foreach($cases as $id => $case)
{
if($case->auto != 'auto') continue;
+ if(empty($script->node)) continue;
$resultID = $this->loadModel('testtask')->initResult($case2RunMap[$id], $id, $case->version, $script->node);
if(!dao::isError()) $this->zanode->runZTFScript($script->id, $id, $resultID);
}
diff --git a/test/data/workflowfield.yaml b/test/data/workflowfield.yaml
index 6a8b1476c8..c23032915f 100644
--- a/test/data/workflowfield.yaml
+++ b/test/data/workflowfield.yaml
@@ -94,13 +94,6 @@ fields:
loop: 0
loopfix: ""
format: ""
- - field: isKey
- note: ""
- prefix: ""
- postfix: ""
- loop: 0
- loopfix: ""
- format: ""
- field: isValue
note: ""
prefix: ""
diff --git a/www/dev.php b/www/dev.php
index 7cc20f86f3..b7aff2e791 100644
--- a/www/dev.php
+++ b/www/dev.php
@@ -176,8 +176,8 @@ function initTable(data)
footer: [function(result, layout) {
return [
{html: `Total ${layout.allRows.length}`, className: 'text-gray mr-4'},
- metricsStats.danger ? {html: `BLOCK ${metricsStats.danger}
`, className: 'text-danger mr-4'} : null,
- metricsStats.warning ? {html: `WARN ${metricsStats.warning}
`, className: 'text-warning mr-4'} : null,
+ metricsStats.danger ? {html: `BLOCK ${metricsStats.danger}
`, className: 'text-danger mr-4'} : null,
+ metricsStats.warning ? {html: `WARN ${metricsStats.warning}
`, className: 'text-warning mr-4'} : null,
];
}],
cols: cols,
@@ -231,7 +231,7 @@ function initTable(data)
console.log('> clicked', info.rowInfo.data);
}
});
- console.log('> table', table);
+ window.table = table;
}
function initData(data)
@@ -244,7 +244,7 @@ function initData(data)
row['metrics.backend.totalTime'] = row.metrics.backend.totalTime;
row['metrics.backend.sqlCount'] = row.metrics.backend.sqlCount;
row['metrics.backend.sqlTime'] = row.metrics.backend.sqlTime * ((!row.dataVer || row.dataVer < 2) ? 1000 : 1);
- row['metrics.backend.requestMemory'] = row.metrics.backend.requestMemory;
+ row['metrics.backend.requestMemory'] = row.metrics.backend.requestMemory * 1024;
row['metrics.backend.phpFileLoaded'] = row.metrics.backend.phpFileLoaded;
row['metrics.frontend.renderTime'] = row.metrics.frontend.renderTime;
row['metrics.frontend.downloadSize'] = row.metrics.frontend.downloadSize;
diff --git a/www/js/zui3/graph/g6.min.js b/www/js/zui3/graph/g6.min.js
new file mode 100644
index 0000000000..4a0d20e478
--- /dev/null
+++ b/www/js/zui3/graph/g6.min.js
@@ -0,0 +1,4 @@
+/*! antvis/G6 4.8.21 - MIT | https://github.com/antvis/G6.git */
+!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.G6=e():t.G6=e()}(this,(function(){return function(t){var e={};function n(r){if(e[r])return e[r].exports;var i=e[r]={i:r,l:!1,exports:{}};return t[r].call(i.exports,i,i.exports,n),i.l=!0,i.exports}return n.m=t,n.c=e,n.d=function(t,e,r){n.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:r})},n.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},n.t=function(t,e){if(1&e&&(t=n(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var i in t)n.d(r,i,function(e){return t[e]}.bind(null,i));return r},n.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return n.d(e,"a",e),e},n.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},n.p="",n(n.s=212)}([function(t,e,n){"use strict";n.r(e),n.d(e,"contains",(function(){return i})),n.d(e,"includes",(function(){return i})),n.d(e,"difference",(function(){return a})),n.d(e,"find",(function(){return x})),n.d(e,"findIndex",(function(){return w})),n.d(e,"firstValue",(function(){return _})),n.d(e,"flatten",(function(){return E})),n.d(e,"flattenDeep",(function(){return S})),n.d(e,"getRange",(function(){return k})),n.d(e,"pull",(function(){return I})),n.d(e,"pullAt",(function(){return N})),n.d(e,"reduce",(function(){return P})),n.d(e,"remove",(function(){return D})),n.d(e,"sortBy",(function(){return R})),n.d(e,"union",(function(){return F})),n.d(e,"uniq",(function(){return B})),n.d(e,"valuesOfKey",(function(){return z})),n.d(e,"head",(function(){return G})),n.d(e,"last",(function(){return Y})),n.d(e,"startsWith",(function(){return U})),n.d(e,"endsWith",(function(){return X})),n.d(e,"filter",(function(){return o})),n.d(e,"every",(function(){return W})),n.d(e,"some",(function(){return V})),n.d(e,"group",(function(){return K})),n.d(e,"groupBy",(function(){return q})),n.d(e,"groupToMap",(function(){return Z})),n.d(e,"getWrapBehavior",(function(){return Q})),n.d(e,"wrapBehavior",(function(){return $})),n.d(e,"number2color",(function(){return tt})),n.d(e,"parseRadius",(function(){return et})),n.d(e,"clamp",(function(){return nt})),n.d(e,"fixedBase",(function(){return rt})),n.d(e,"isDecimal",(function(){return ot})),n.d(e,"isEven",(function(){return at})),n.d(e,"isInteger",(function(){return st})),n.d(e,"isNegative",(function(){return ut})),n.d(e,"isNumberEqual",(function(){return ct})),n.d(e,"isOdd",(function(){return lt})),n.d(e,"isPositive",(function(){return ft})),n.d(e,"max",(function(){return M})),n.d(e,"maxBy",(function(){return ht})),n.d(e,"min",(function(){return O})),n.d(e,"minBy",(function(){return dt})),n.d(e,"mod",(function(){return pt})),n.d(e,"toDegree",(function(){return vt})),n.d(e,"toInteger",(function(){return yt})),n.d(e,"toRadian",(function(){return bt})),n.d(e,"forIn",(function(){return xt})),n.d(e,"has",(function(){return wt})),n.d(e,"hasKey",(function(){return _t})),n.d(e,"hasValue",(function(){return St})),n.d(e,"keys",(function(){return g})),n.d(e,"isMatch",(function(){return v})),n.d(e,"values",(function(){return Et})),n.d(e,"lowerCase",(function(){return Ot})),n.d(e,"lowerFirst",(function(){return kt})),n.d(e,"substitute",(function(){return At})),n.d(e,"upperCase",(function(){return Ct})),n.d(e,"upperFirst",(function(){return jt})),n.d(e,"getType",(function(){return Tt})),n.d(e,"isArguments",(function(){return Nt})),n.d(e,"isArray",(function(){return f})),n.d(e,"isArrayLike",(function(){return r})),n.d(e,"isBoolean",(function(){return Pt})),n.d(e,"isDate",(function(){return Dt})),n.d(e,"isError",(function(){return Lt})),n.d(e,"isFunction",(function(){return c})),n.d(e,"isFinite",(function(){return Rt})),n.d(e,"isNil",(function(){return l})),n.d(e,"isNull",(function(){return Bt})),n.d(e,"isNumber",(function(){return it})),n.d(e,"isObject",(function(){return d})),n.d(e,"isObjectLike",(function(){return m})),n.d(e,"isPlainObject",(function(){return b})),n.d(e,"isPrototype",(function(){return zt})),n.d(e,"isRegExp",(function(){return Gt})),n.d(e,"isString",(function(){return L})),n.d(e,"isType",(function(){return u})),n.d(e,"isUndefined",(function(){return Yt})),n.d(e,"isElement",(function(){return Ut})),n.d(e,"requestAnimationFrame",(function(){return Xt})),n.d(e,"clearAnimationFrame",(function(){return Wt})),n.d(e,"augment",(function(){return qt})),n.d(e,"clone",(function(){return Kt})),n.d(e,"debounce",(function(){return Qt})),n.d(e,"memoize",(function(){return $t})),n.d(e,"deepMix",(function(){return te})),n.d(e,"each",(function(){return p})),n.d(e,"extend",(function(){return ee})),n.d(e,"indexOf",(function(){return ne})),n.d(e,"isEmpty",(function(){return ie})),n.d(e,"isEqual",(function(){return oe})),n.d(e,"isEqualWith",(function(){return ae})),n.d(e,"map",(function(){return se})),n.d(e,"mapValues",(function(){return ce})),n.d(e,"mix",(function(){return Ht})),n.d(e,"assign",(function(){return Ht})),n.d(e,"get",(function(){return le})),n.d(e,"set",(function(){return fe})),n.d(e,"pick",(function(){return de})),n.d(e,"omit",(function(){return pe})),n.d(e,"throttle",(function(){return ge})),n.d(e,"toArray",(function(){return ve})),n.d(e,"toString",(function(){return Mt})),n.d(e,"uniqueId",(function(){return me})),n.d(e,"noop",(function(){return be})),n.d(e,"identity",(function(){return xe})),n.d(e,"size",(function(){return we})),n.d(e,"measureTextWidth",(function(){return Se})),n.d(e,"getEllipsisText",(function(){return Me})),n.d(e,"Cache",(function(){return Oe}));var r=function(t){return null!==t&&"function"!=typeof t&&isFinite(t.length)},i=function(t,e){return!!r(t)&&t.indexOf(e)>-1},o=function(t,e){if(!r(t))return t;for(var n=[],i=0;i-1;)C.call(t,o,1);return t},T=Array.prototype.splice,N=function(t,e){if(!r(t))return[];for(var n=t?e.length:0,i=n-1;n--;){var o=void 0,a=e[n];n!==i&&a===o||(o=a,T.call(t,a,1))}return t},P=function(t,e,n){if(!f(t)&&!b(t))return t;var r=n;return p(t,(function(t,n){r=e(r,t,n)})),r},D=function(t,e){var n=[];if(!r(t))return n;for(var i=-1,o=[],a=t.length;++ie[i])return 1;if(t[i]n?n:t},rt=function(t,e){var n=e.toString(),r=n.indexOf(".");if(-1===r)return Math.round(t);var i=n.substr(r+1).length;return i>20&&(i=20),parseFloat(t.toFixed(i))},it=function(t){return u(t,"Number")},ot=function(t){return it(t)&&t%1!=0},at=function(t){return it(t)&&t%2==0},st=Number.isInteger?Number.isInteger:function(t){return it(t)&&t%1==0},ut=function(t){return it(t)&&t<0};function ct(t,e,n){return void 0===n&&(n=1e-5),Math.abs(t-e)0},ht=function(t,e){if(f(t)){for(var n,r=-1/0,i=0;ir&&(n=o,r=a)}return n}},dt=function(t,e){if(f(t)){for(var n,r=1/0,i=0;ie?(r&&(clearTimeout(r),r=null),s=c,a=t.apply(i,o),r||(i=o=null)):r||!1===n.trailing||(r=setTimeout(u,l)),a};return c.cancel=function(){clearTimeout(r),s=0,r=i=o=null},c},ve=function(t){return r(t)?Array.prototype.slice.call(t):[]},ye={},me=function(t){return ye[t=t||"g"]?ye[t]+=1:ye[t]=1,t+ye[t]},be=function(){},xe=function(t){return t};function we(t){return l(t)?0:r(t)?t.length:Object.keys(t).length}var _e,Ee=n(1),Se=$t((function(t,e){void 0===e&&(e={});var n=e.fontSize,r=e.fontFamily,i=e.fontWeight,o=e.fontStyle,a=e.fontVariant;return _e||(_e=document.createElement("canvas").getContext("2d")),_e.font=[o,a,i,n+"px",r].join(" "),_e.measureText(L(t)?t:"").width}),(function(t,e){return void 0===e&&(e={}),Object(Ee.__spreadArrays)([t],Et(e)).join("")})),Me=function(t,e,n,r){void 0===r&&(r="...");var i,o,a=Se(r,n),s=L(t)?t:Mt(t),u=e,c=[];if(Se(t,n)<=e)return t;for(;i=s.substr(0,16),!((o=Se(i,n))+a>u&&o>u);)if(c.push(i),u-=o,!(s=s.substr(16)))return c.join("");for(;i=s.substr(0,1),!((o=Se(i,n))+a>u);)if(c.push(i),u-=o,!(s=s.substr(1)))return c.join("");return""+c.join("")+r},Oe=function(){function t(){this.map={}}return t.prototype.has=function(t){return void 0!==this.map[t]},t.prototype.get=function(t,e){var n=this.map[t];return void 0===n?e:n},t.prototype.set=function(t,e){this.map[t]=e},t.prototype.clear=function(){this.map={}},t.prototype.delete=function(t){delete this.map[t]},t.prototype.size=function(){return Object.keys(this.map).length},t}()},function(t,e,n){"use strict";function r(t){return(r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}n.r(e),n.d(e,"__extends",(function(){return o})),n.d(e,"__assign",(function(){return a})),n.d(e,"__rest",(function(){return s})),n.d(e,"__decorate",(function(){return u})),n.d(e,"__param",(function(){return c})),n.d(e,"__esDecorate",(function(){return l})),n.d(e,"__runInitializers",(function(){return f})),n.d(e,"__propKey",(function(){return h})),n.d(e,"__setFunctionName",(function(){return d})),n.d(e,"__metadata",(function(){return p})),n.d(e,"__awaiter",(function(){return g})),n.d(e,"__generator",(function(){return v})),n.d(e,"__createBinding",(function(){return y})),n.d(e,"__exportStar",(function(){return m})),n.d(e,"__values",(function(){return b})),n.d(e,"__read",(function(){return x})),n.d(e,"__spread",(function(){return w})),n.d(e,"__spreadArrays",(function(){return _})),n.d(e,"__spreadArray",(function(){return E})),n.d(e,"__await",(function(){return S})),n.d(e,"__asyncGenerator",(function(){return M})),n.d(e,"__asyncDelegator",(function(){return O})),n.d(e,"__asyncValues",(function(){return k})),n.d(e,"__makeTemplateObject",(function(){return A})),n.d(e,"__importStar",(function(){return j})),n.d(e,"__importDefault",(function(){return I})),n.d(e,"__classPrivateFieldGet",(function(){return T})),n.d(e,"__classPrivateFieldSet",(function(){return N})),n.d(e,"__classPrivateFieldIn",(function(){return P})),n.d(e,"__addDisposableResource",(function(){return D})),n.d(e,"__disposeResources",(function(){return R}));var i=function(t,e){return(i=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n])})(t,e)};function o(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Class extends value "+String(e)+" is not a constructor or null");function n(){this.constructor=t}i(t,e),t.prototype=null===e?Object.create(e):(n.prototype=e.prototype,new n)}var a=function(){return(a=Object.assign||function(t){for(var e,n=1,r=arguments.length;n=0;u--)(o=t[u])&&(s=(a<3?o(s):a>3?o(e,n,s):o(e,n))||s);return a>3&&s&&Object.defineProperty(e,n,s),s}function c(t,e){return function(n,r){e(n,r,t)}}function l(t,e,n,i,o,a){function s(t){if(void 0!==t&&"function"!=typeof t)throw new TypeError("Function expected");return t}for(var u,c=i.kind,l="getter"===c?"get":"setter"===c?"set":"value",f=!e&&t?i.static?t:t.prototype:null,h=e||(f?Object.getOwnPropertyDescriptor(f,i.name):{}),d=!1,p=n.length-1;p>=0;p--){var g={};for(var v in i)g[v]="access"===v?{}:i[v];for(var v in i.access)g.access[v]=i.access[v];g.addInitializer=function(t){if(d)throw new TypeError("Cannot add initializers after decoration has completed");a.push(s(t||null))};var y=(0,n[p])("accessor"===c?{get:h.get,set:h.set}:h[l],g);if("accessor"===c){if(void 0===y)continue;if(null===y||"object"!==r(y))throw new TypeError("Object expected");(u=s(y.get))&&(h.get=u),(u=s(y.set))&&(h.set=u),(u=s(y.init))&&o.unshift(u)}else(u=s(y))&&("field"===c?o.unshift(u):h[l]=u)}f&&Object.defineProperty(f,i.name,h),d=!0}function f(t,e,n){for(var r=arguments.length>2,i=0;i0&&i[i.length-1])||6!==s[0]&&2!==s[0])){a=0;continue}if(3===s[0]&&(!i||s[1]>i[0]&&s[1]=t.length&&(t=void 0),{value:t&&t[r++],done:!t}}};throw new TypeError(e?"Object is not iterable.":"Symbol.iterator is not defined.")}function x(t,e){var n="function"==typeof Symbol&&t[Symbol.iterator];if(!n)return t;var r,i,o=n.call(t),a=[];try{for(;(void 0===e||e-- >0)&&!(r=o.next()).done;)a.push(r.value)}catch(t){i={error:t}}finally{try{r&&!r.done&&(n=o.return)&&n.call(o)}finally{if(i)throw i.error}}return a}function w(){for(var t=[],e=0;e1||s(t,e)}))})}function s(t,e){try{(n=i[t](e)).value instanceof S?Promise.resolve(n.value.v).then(u,c):l(o[0][2],n)}catch(t){l(o[0][3],t)}var n}function u(t){s("next",t)}function c(t){s("throw",t)}function l(t,e){t(e),o.shift(),o.length&&s(o[0][0],o[0][1])}}function O(t){var e,n;return e={},r("next"),r("throw",(function(t){throw t})),r("return"),e[Symbol.iterator]=function(){return this},e;function r(r,i){e[r]=t[r]?function(e){return(n=!n)?{value:S(t[r](e)),done:!1}:i?i(e):e}:i}}function k(t){if(!Symbol.asyncIterator)throw new TypeError("Symbol.asyncIterator is not defined.");var e,n=t[Symbol.asyncIterator];return n?n.call(t):(t=b(t),e={},r("next"),r("throw"),r("return"),e[Symbol.asyncIterator]=function(){return this},e);function r(n){e[n]=t[n]&&function(e){return new Promise((function(r,i){(function(t,e,n,r){Promise.resolve(r).then((function(e){t({value:e,done:n})}),e)})(r,i,(e=t[n](e)).done,e.value)}))}}}function A(t,e){return Object.defineProperty?Object.defineProperty(t,"raw",{value:e}):t.raw=e,t}var C=Object.create?function(t,e){Object.defineProperty(t,"default",{enumerable:!0,value:e})}:function(t,e){t.default=e};function j(t){if(t&&t.__esModule)return t;var e={};if(null!=t)for(var n in t)"default"!==n&&Object.prototype.hasOwnProperty.call(t,n)&&y(e,t,n);return C(e,t),e}function I(t){return t&&t.__esModule?t:{default:t}}function T(t,e,n,r){if("a"===n&&!r)throw new TypeError("Private accessor was defined without a getter");if("function"==typeof e?t!==e||!r:!e.has(t))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===n?r:"a"===n?r.call(t):r?r.value:e.get(t)}function N(t,e,n,r,i){if("m"===r)throw new TypeError("Private method is not writable");if("a"===r&&!i)throw new TypeError("Private accessor was defined without a setter");if("function"==typeof e?t!==e||!i:!e.has(t))throw new TypeError("Cannot write private member to an object whose class did not declare it");return"a"===r?i.call(t,n):i?i.value=n:e.set(t,n),n}function P(t,e){if(null===e||"object"!==r(e)&&"function"!=typeof e)throw new TypeError("Cannot use 'in' operator on non-object");return"function"==typeof t?e===t:t.has(e)}function D(t,e,n){if(null!=e){if("object"!==r(e)&&"function"!=typeof e)throw new TypeError("Object expected.");var i;if(n){if(!Symbol.asyncDispose)throw new TypeError("Symbol.asyncDispose is not defined.");i=e[Symbol.asyncDispose]}if(void 0===i){if(!Symbol.dispose)throw new TypeError("Symbol.dispose is not defined.");i=e[Symbol.dispose]}if("function"!=typeof i)throw new TypeError("Object not disposable.");t.stack.push({value:e,dispose:i,async:n})}else n&&t.stack.push({async:!0});return e}var L="function"==typeof SuppressedError?SuppressedError:function(t,e,n){var r=new Error(n);return r.name="SuppressedError",r.error=t,r.suppressed=e,r};function R(t){function e(e){t.error=t.hasError?new L(e,t.error,"An error was suppressed during disposal."):e,t.hasError=!0}return function n(){for(;t.stack.length;){var r=t.stack.pop();try{var i=r.dispose&&r.dispose.call(r.value);if(r.async)return Promise.resolve(i).then(n,(function(t){return e(t),n()}))}catch(t){e(t)}}if(t.hasError)throw t.error}()}e.default={__extends:o,__assign:a,__rest:s,__decorate:u,__param:c,__metadata:p,__awaiter:g,__generator:v,__createBinding:y,__exportStar:m,__values:b,__read:x,__spread:w,__spreadArrays:_,__spreadArray:E,__await:S,__asyncGenerator:M,__asyncDelegator:O,__asyncValues:k,__makeTemplateObject:A,__importStar:j,__importDefault:I,__classPrivateFieldGet:T,__classPrivateFieldSet:N,__classPrivateFieldIn:P,__addDisposableResource:D,__disposeResources:R}},function(t,e,n){"use strict";n.r(e),n.d(e,"EPSILON",(function(){return r})),n.d(e,"ARRAY_TYPE",(function(){return i})),n.d(e,"RANDOM",(function(){return o})),n.d(e,"setMatrixArrayType",(function(){return a})),n.d(e,"toRadian",(function(){return u})),n.d(e,"equals",(function(){return c}));var r=1e-6,i="undefined"!=typeof Float32Array?Float32Array:Array,o=Math.random;function a(t){i=t}var s=Math.PI/180;function u(t){return t*s}function c(t,e){return Math.abs(t-e)<=r*Math.max(1,Math.abs(t),Math.abs(e))}Math.hypot||(Math.hypot=function(){for(var t=0,e=arguments.length;e--;)t+=arguments[e]*arguments[e];return Math.sqrt(t)})},function(t,e,n){var r=n(97);t.exports=function(t,e,n){return(e=r(e))in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t},t.exports.__esModule=!0,t.exports.default=t.exports},function(t,e,n){"use strict";n.d(e,"b",(function(){return i.mat3})),n.d(e,"c",(function(){return i.vec2})),n.d(e,"d",(function(){return i.vec3})),n.d(e,"a",(function(){return r}));var r={};n.r(r),n.d(r,"leftTranslate",(function(){return o})),n.d(r,"leftRotate",(function(){return a})),n.d(r,"leftScale",(function(){return s})),n.d(r,"transform",(function(){return u})),n.d(r,"direction",(function(){return c})),n.d(r,"angleTo",(function(){return l})),n.d(r,"vertical",(function(){return f}));var i=n(8);function o(t,e,n){var r=[0,0,0,0,0,0,0,0,0];return i.mat3.fromTranslation(r,n),i.mat3.multiply(t,r,e)}function a(t,e,n){var r=[0,0,0,0,0,0,0,0,0];return i.mat3.fromRotation(r,n),i.mat3.multiply(t,r,e)}function s(t,e,n){var r=[0,0,0,0,0,0,0,0,0];return i.mat3.fromScaling(r,n),i.mat3.multiply(t,r,e)}function u(t,e){for(var n,r,u,c=t?[].concat(t):[1,0,0,0,1,0,0,0,1],l=0,f=e.length;l=0;return n?o?2*Math.PI-r:r:o?r:2*Math.PI-r}function f(t,e,n){return n?(t[0]=e[1],t[1]=-1*e[0]):(t[0]=-1*e[1],t[1]=e[0]),t}},function(t,e,n){"use strict";n.d(e,"d",(function(){return i})),n.d(e,"b",(function(){return o})),n.d(e,"e",(function(){return a})),n.d(e,"f",(function(){return s})),n.d(e,"l",(function(){return u})),n.d(e,"j",(function(){return c}));var r=n(0);function i(){return window?window.devicePixelRatio:1}function o(t,e,n,r){var i=t-n,o=e-r;return Math.sqrt(i*i+o*o)}function a(t,e,n,r,i,o){return i>=t&&i<=t+n&&o>=e&&o<=e+r}function s(t,e){return!(e.minX>t.maxX||e.maxXt.maxY||e.maxY0?(n[0]=2*(s*a+f*r+u*o-c*i)/h,n[1]=2*(u*a+f*i+c*r-s*o)/h,n[2]=2*(c*a+f*o+s*i-u*r)/h):(n[0]=2*(s*a+f*r+u*o-c*i),n[1]=2*(u*a+f*i+c*r-s*o),n[2]=2*(c*a+f*o+s*i-u*r)),ce(t,e,n),t}function fe(t,e){return t[0]=e[12],t[1]=e[13],t[2]=e[14],t}function he(t,e){var n=e[0],r=e[1],i=e[2],o=e[4],a=e[5],s=e[6],u=e[8],c=e[9],l=e[10];return t[0]=Math.hypot(n,r,i),t[1]=Math.hypot(o,a,s),t[2]=Math.hypot(u,c,l),t}function de(t,e){var n=new l.ARRAY_TYPE(3);he(n,e);var r=1/n[0],i=1/n[1],o=1/n[2],a=e[0]*r,s=e[1]*i,u=e[2]*o,c=e[4]*r,f=e[5]*i,h=e[6]*o,d=e[8]*r,p=e[9]*i,g=e[10]*o,v=a+f+g,y=0;return v>0?(y=2*Math.sqrt(v+1),t[3]=.25*y,t[0]=(h-p)/y,t[1]=(d-u)/y,t[2]=(s-c)/y):a>f&&a>g?(y=2*Math.sqrt(1+a-f-g),t[3]=(h-p)/y,t[0]=.25*y,t[1]=(s+c)/y,t[2]=(d+u)/y):f>g?(y=2*Math.sqrt(1+f-a-g),t[3]=(d-u)/y,t[0]=(s+c)/y,t[1]=.25*y,t[2]=(h+p)/y):(y=2*Math.sqrt(1+g-a-f),t[3]=(s-c)/y,t[0]=(d+u)/y,t[1]=(h+p)/y,t[2]=.25*y),t}function pe(t,e,n,r){var i=e[0],o=e[1],a=e[2],s=e[3],u=i+i,c=o+o,l=a+a,f=i*u,h=i*c,d=i*l,p=o*c,g=o*l,v=a*l,y=s*u,m=s*c,b=s*l,x=r[0],w=r[1],_=r[2];return t[0]=(1-(p+v))*x,t[1]=(h+b)*x,t[2]=(d-m)*x,t[3]=0,t[4]=(h-b)*w,t[5]=(1-(f+v))*w,t[6]=(g+y)*w,t[7]=0,t[8]=(d+m)*_,t[9]=(g-y)*_,t[10]=(1-(f+p))*_,t[11]=0,t[12]=n[0],t[13]=n[1],t[14]=n[2],t[15]=1,t}function ge(t,e,n,r,i){var o=e[0],a=e[1],s=e[2],u=e[3],c=o+o,l=a+a,f=s+s,h=o*c,d=o*l,p=o*f,g=a*l,v=a*f,y=s*f,m=u*c,b=u*l,x=u*f,w=r[0],_=r[1],E=r[2],S=i[0],M=i[1],O=i[2],k=(1-(g+y))*w,A=(d+x)*w,C=(p-b)*w,j=(d-x)*_,I=(1-(h+y))*_,T=(v+m)*_,N=(p+b)*E,P=(v-m)*E,D=(1-(h+g))*E;return t[0]=k,t[1]=A,t[2]=C,t[3]=0,t[4]=j,t[5]=I,t[6]=T,t[7]=0,t[8]=N,t[9]=P,t[10]=D,t[11]=0,t[12]=n[0]+S-(k*S+j*M+N*O),t[13]=n[1]+M-(A*S+I*M+P*O),t[14]=n[2]+O-(C*S+T*M+D*O),t[15]=1,t}function ve(t,e){var n=e[0],r=e[1],i=e[2],o=e[3],a=n+n,s=r+r,u=i+i,c=n*a,l=r*a,f=r*s,h=i*a,d=i*s,p=i*u,g=o*a,v=o*s,y=o*u;return t[0]=1-f-p,t[1]=l+y,t[2]=h-v,t[3]=0,t[4]=l-y,t[5]=1-c-p,t[6]=d+g,t[7]=0,t[8]=h+v,t[9]=d-g,t[10]=1-c-f,t[11]=0,t[12]=0,t[13]=0,t[14]=0,t[15]=1,t}function ye(t,e,n,r,i,o,a){var s=1/(n-e),u=1/(i-r),c=1/(o-a);return t[0]=2*o*s,t[1]=0,t[2]=0,t[3]=0,t[4]=0,t[5]=2*o*u,t[6]=0,t[7]=0,t[8]=(n+e)*s,t[9]=(i+r)*u,t[10]=(a+o)*c,t[11]=-1,t[12]=0,t[13]=0,t[14]=a*o*2*c,t[15]=0,t}function me(t,e,n,r,i){var o,a=1/Math.tan(e/2);return t[0]=a/n,t[1]=0,t[2]=0,t[3]=0,t[4]=0,t[5]=a,t[6]=0,t[7]=0,t[8]=0,t[9]=0,t[11]=-1,t[12]=0,t[13]=0,t[15]=0,null!=i&&i!==1/0?(o=1/(r-i),t[10]=(i+r)*o,t[14]=2*i*r*o):(t[10]=-1,t[14]=-2*r),t}var be=me;function xe(t,e,n,r,i){var o,a=1/Math.tan(e/2);return t[0]=a/n,t[1]=0,t[2]=0,t[3]=0,t[4]=0,t[5]=a,t[6]=0,t[7]=0,t[8]=0,t[9]=0,t[11]=-1,t[12]=0,t[13]=0,t[15]=0,null!=i&&i!==1/0?(o=1/(r-i),t[10]=i*o,t[14]=i*r*o):(t[10]=-1,t[14]=-r),t}function we(t,e,n,r){var i=Math.tan(e.upDegrees*Math.PI/180),o=Math.tan(e.downDegrees*Math.PI/180),a=Math.tan(e.leftDegrees*Math.PI/180),s=Math.tan(e.rightDegrees*Math.PI/180),u=2/(a+s),c=2/(i+o);return t[0]=u,t[1]=0,t[2]=0,t[3]=0,t[4]=0,t[5]=c,t[6]=0,t[7]=0,t[8]=-(a-s)*u*.5,t[9]=(i-o)*c*.5,t[10]=r/(n-r),t[11]=-1,t[12]=0,t[13]=0,t[14]=r*n/(n-r),t[15]=0,t}function _e(t,e,n,r,i,o,a){var s=1/(e-n),u=1/(r-i),c=1/(o-a);return t[0]=-2*s,t[1]=0,t[2]=0,t[3]=0,t[4]=0,t[5]=-2*u,t[6]=0,t[7]=0,t[8]=0,t[9]=0,t[10]=2*c,t[11]=0,t[12]=(e+n)*s,t[13]=(i+r)*u,t[14]=(a+o)*c,t[15]=1,t}var Ee=_e;function Se(t,e,n,r,i,o,a){var s=1/(e-n),u=1/(r-i),c=1/(o-a);return t[0]=-2*s,t[1]=0,t[2]=0,t[3]=0,t[4]=0,t[5]=-2*u,t[6]=0,t[7]=0,t[8]=0,t[9]=0,t[10]=c,t[11]=0,t[12]=(e+n)*s,t[13]=(i+r)*u,t[14]=o*c,t[15]=1,t}function Me(t,e,n,r){var i,o,a,s,u,c,f,h,d,p,g=e[0],v=e[1],y=e[2],m=r[0],b=r[1],x=r[2],w=n[0],_=n[1],E=n[2];return Math.abs(g-w)0&&(l*=d=1/Math.sqrt(d),f*=d,h*=d);var p=u*h-c*f,g=c*l-s*h,v=s*f-u*l;return(d=p*p+g*g+v*v)>0&&(p*=d=1/Math.sqrt(d),g*=d,v*=d),t[0]=p,t[1]=g,t[2]=v,t[3]=0,t[4]=f*v-h*g,t[5]=h*p-l*v,t[6]=l*g-f*p,t[7]=0,t[8]=l,t[9]=f,t[10]=h,t[11]=0,t[12]=i,t[13]=o,t[14]=a,t[15]=1,t}function ke(t){return"mat4("+t[0]+", "+t[1]+", "+t[2]+", "+t[3]+", "+t[4]+", "+t[5]+", "+t[6]+", "+t[7]+", "+t[8]+", "+t[9]+", "+t[10]+", "+t[11]+", "+t[12]+", "+t[13]+", "+t[14]+", "+t[15]+")"}function Ae(t){return Math.hypot(t[0],t[1],t[2],t[3],t[4],t[5],t[6],t[7],t[8],t[9],t[10],t[11],t[12],t[13],t[14],t[15])}function Ce(t,e,n){return t[0]=e[0]+n[0],t[1]=e[1]+n[1],t[2]=e[2]+n[2],t[3]=e[3]+n[3],t[4]=e[4]+n[4],t[5]=e[5]+n[5],t[6]=e[6]+n[6],t[7]=e[7]+n[7],t[8]=e[8]+n[8],t[9]=e[9]+n[9],t[10]=e[10]+n[10],t[11]=e[11]+n[11],t[12]=e[12]+n[12],t[13]=e[13]+n[13],t[14]=e[14]+n[14],t[15]=e[15]+n[15],t}function je(t,e,n){return t[0]=e[0]-n[0],t[1]=e[1]-n[1],t[2]=e[2]-n[2],t[3]=e[3]-n[3],t[4]=e[4]-n[4],t[5]=e[5]-n[5],t[6]=e[6]-n[6],t[7]=e[7]-n[7],t[8]=e[8]-n[8],t[9]=e[9]-n[9],t[10]=e[10]-n[10],t[11]=e[11]-n[11],t[12]=e[12]-n[12],t[13]=e[13]-n[13],t[14]=e[14]-n[14],t[15]=e[15]-n[15],t}function Ie(t,e,n){return t[0]=e[0]*n,t[1]=e[1]*n,t[2]=e[2]*n,t[3]=e[3]*n,t[4]=e[4]*n,t[5]=e[5]*n,t[6]=e[6]*n,t[7]=e[7]*n,t[8]=e[8]*n,t[9]=e[9]*n,t[10]=e[10]*n,t[11]=e[11]*n,t[12]=e[12]*n,t[13]=e[13]*n,t[14]=e[14]*n,t[15]=e[15]*n,t}function Te(t,e,n,r){return t[0]=e[0]+n[0]*r,t[1]=e[1]+n[1]*r,t[2]=e[2]+n[2]*r,t[3]=e[3]+n[3]*r,t[4]=e[4]+n[4]*r,t[5]=e[5]+n[5]*r,t[6]=e[6]+n[6]*r,t[7]=e[7]+n[7]*r,t[8]=e[8]+n[8]*r,t[9]=e[9]+n[9]*r,t[10]=e[10]+n[10]*r,t[11]=e[11]+n[11]*r,t[12]=e[12]+n[12]*r,t[13]=e[13]+n[13]*r,t[14]=e[14]+n[14]*r,t[15]=e[15]+n[15]*r,t}function Ne(t,e){return t[0]===e[0]&&t[1]===e[1]&&t[2]===e[2]&&t[3]===e[3]&&t[4]===e[4]&&t[5]===e[5]&&t[6]===e[6]&&t[7]===e[7]&&t[8]===e[8]&&t[9]===e[9]&&t[10]===e[10]&&t[11]===e[11]&&t[12]===e[12]&&t[13]===e[13]&&t[14]===e[14]&&t[15]===e[15]}function Pe(t,e){var n=t[0],r=t[1],i=t[2],o=t[3],a=t[4],s=t[5],u=t[6],c=t[7],f=t[8],h=t[9],d=t[10],p=t[11],g=t[12],v=t[13],y=t[14],m=t[15],b=e[0],x=e[1],w=e[2],_=e[3],E=e[4],S=e[5],M=e[6],O=e[7],k=e[8],A=e[9],C=e[10],j=e[11],I=e[12],T=e[13],N=e[14],P=e[15];return Math.abs(n-b)<=l.EPSILON*Math.max(1,Math.abs(n),Math.abs(b))&&Math.abs(r-x)<=l.EPSILON*Math.max(1,Math.abs(r),Math.abs(x))&&Math.abs(i-w)<=l.EPSILON*Math.max(1,Math.abs(i),Math.abs(w))&&Math.abs(o-_)<=l.EPSILON*Math.max(1,Math.abs(o),Math.abs(_))&&Math.abs(a-E)<=l.EPSILON*Math.max(1,Math.abs(a),Math.abs(E))&&Math.abs(s-S)<=l.EPSILON*Math.max(1,Math.abs(s),Math.abs(S))&&Math.abs(u-M)<=l.EPSILON*Math.max(1,Math.abs(u),Math.abs(M))&&Math.abs(c-O)<=l.EPSILON*Math.max(1,Math.abs(c),Math.abs(O))&&Math.abs(f-k)<=l.EPSILON*Math.max(1,Math.abs(f),Math.abs(k))&&Math.abs(h-A)<=l.EPSILON*Math.max(1,Math.abs(h),Math.abs(A))&&Math.abs(d-C)<=l.EPSILON*Math.max(1,Math.abs(d),Math.abs(C))&&Math.abs(p-j)<=l.EPSILON*Math.max(1,Math.abs(p),Math.abs(j))&&Math.abs(g-I)<=l.EPSILON*Math.max(1,Math.abs(g),Math.abs(I))&&Math.abs(v-T)<=l.EPSILON*Math.max(1,Math.abs(v),Math.abs(T))&&Math.abs(y-N)<=l.EPSILON*Math.max(1,Math.abs(y),Math.abs(N))&&Math.abs(m-P)<=l.EPSILON*Math.max(1,Math.abs(m),Math.abs(P))}var De=Kt,Le=je,Re=n(24);function Be(){var t=new l.ARRAY_TYPE(4);return l.ARRAY_TYPE!=Float32Array&&(t[0]=0,t[1]=0,t[2]=0,t[3]=0),t}function Fe(t){var e=new l.ARRAY_TYPE(4);return e[0]=t[0],e[1]=t[1],e[2]=t[2],e[3]=t[3],e}function ze(t,e,n,r){var i=new l.ARRAY_TYPE(4);return i[0]=t,i[1]=e,i[2]=n,i[3]=r,i}function Ge(t,e){return t[0]=e[0],t[1]=e[1],t[2]=e[2],t[3]=e[3],t}function Ye(t,e,n,r,i){return t[0]=e,t[1]=n,t[2]=r,t[3]=i,t}function Ue(t,e,n){return t[0]=e[0]+n[0],t[1]=e[1]+n[1],t[2]=e[2]+n[2],t[3]=e[3]+n[3],t}function Xe(t,e,n){return t[0]=e[0]-n[0],t[1]=e[1]-n[1],t[2]=e[2]-n[2],t[3]=e[3]-n[3],t}function We(t,e,n){return t[0]=e[0]*n[0],t[1]=e[1]*n[1],t[2]=e[2]*n[2],t[3]=e[3]*n[3],t}function Ve(t,e,n){return t[0]=e[0]/n[0],t[1]=e[1]/n[1],t[2]=e[2]/n[2],t[3]=e[3]/n[3],t}function He(t,e){return t[0]=Math.ceil(e[0]),t[1]=Math.ceil(e[1]),t[2]=Math.ceil(e[2]),t[3]=Math.ceil(e[3]),t}function qe(t,e){return t[0]=Math.floor(e[0]),t[1]=Math.floor(e[1]),t[2]=Math.floor(e[2]),t[3]=Math.floor(e[3]),t}function Ze(t,e,n){return t[0]=Math.min(e[0],n[0]),t[1]=Math.min(e[1],n[1]),t[2]=Math.min(e[2],n[2]),t[3]=Math.min(e[3],n[3]),t}function Ke(t,e,n){return t[0]=Math.max(e[0],n[0]),t[1]=Math.max(e[1],n[1]),t[2]=Math.max(e[2],n[2]),t[3]=Math.max(e[3],n[3]),t}function Qe(t,e){return t[0]=Math.round(e[0]),t[1]=Math.round(e[1]),t[2]=Math.round(e[2]),t[3]=Math.round(e[3]),t}function $e(t,e,n){return t[0]=e[0]*n,t[1]=e[1]*n,t[2]=e[2]*n,t[3]=e[3]*n,t}function Je(t,e,n,r){return t[0]=e[0]+n[0]*r,t[1]=e[1]+n[1]*r,t[2]=e[2]+n[2]*r,t[3]=e[3]+n[3]*r,t}function tn(t,e){var n=e[0]-t[0],r=e[1]-t[1],i=e[2]-t[2],o=e[3]-t[3];return Math.hypot(n,r,i,o)}function en(t,e){var n=e[0]-t[0],r=e[1]-t[1],i=e[2]-t[2],o=e[3]-t[3];return n*n+r*r+i*i+o*o}function nn(t){var e=t[0],n=t[1],r=t[2],i=t[3];return Math.hypot(e,n,r,i)}function rn(t){var e=t[0],n=t[1],r=t[2],i=t[3];return e*e+n*n+r*r+i*i}function on(t,e){return t[0]=-e[0],t[1]=-e[1],t[2]=-e[2],t[3]=-e[3],t}function an(t,e){return t[0]=1/e[0],t[1]=1/e[1],t[2]=1/e[2],t[3]=1/e[3],t}function sn(t,e){var n=e[0],r=e[1],i=e[2],o=e[3],a=n*n+r*r+i*i+o*o;return a>0&&(a=1/Math.sqrt(a)),t[0]=n*a,t[1]=r*a,t[2]=i*a,t[3]=o*a,t}function un(t,e){return t[0]*e[0]+t[1]*e[1]+t[2]*e[2]+t[3]*e[3]}function cn(t,e,n,r){var i=n[0]*r[1]-n[1]*r[0],o=n[0]*r[2]-n[2]*r[0],a=n[0]*r[3]-n[3]*r[0],s=n[1]*r[2]-n[2]*r[1],u=n[1]*r[3]-n[3]*r[1],c=n[2]*r[3]-n[3]*r[2],l=e[0],f=e[1],h=e[2],d=e[3];return t[0]=f*c-h*u+d*s,t[1]=-l*c+h*a-d*o,t[2]=l*u-f*a+d*i,t[3]=-l*s+f*o-h*i,t}function ln(t,e,n,r){var i=e[0],o=e[1],a=e[2],s=e[3];return t[0]=i+r*(n[0]-i),t[1]=o+r*(n[1]-o),t[2]=a+r*(n[2]-a),t[3]=s+r*(n[3]-s),t}function fn(t,e){var n,r,i,o,a,s;e=e||1;do{a=(n=2*l.RANDOM()-1)*n+(r=2*l.RANDOM()-1)*r}while(a>=1);do{s=(i=2*l.RANDOM()-1)*i+(o=2*l.RANDOM()-1)*o}while(s>=1);var u=Math.sqrt((1-a)/s);return t[0]=e*n,t[1]=e*r,t[2]=e*i*u,t[3]=e*o*u,t}function hn(t,e,n){var r=e[0],i=e[1],o=e[2],a=e[3];return t[0]=n[0]*r+n[4]*i+n[8]*o+n[12]*a,t[1]=n[1]*r+n[5]*i+n[9]*o+n[13]*a,t[2]=n[2]*r+n[6]*i+n[10]*o+n[14]*a,t[3]=n[3]*r+n[7]*i+n[11]*o+n[15]*a,t}function dn(t,e,n){var r=e[0],i=e[1],o=e[2],a=n[0],s=n[1],u=n[2],c=n[3],l=c*r+s*o-u*i,f=c*i+u*r-a*o,h=c*o+a*i-s*r,d=-a*r-s*i-u*o;return t[0]=l*c+d*-a+f*-u-h*-s,t[1]=f*c+d*-s+h*-a-l*-u,t[2]=h*c+d*-u+l*-s-f*-a,t[3]=e[3],t}function pn(t){return t[0]=0,t[1]=0,t[2]=0,t[3]=0,t}function gn(t){return"vec4("+t[0]+", "+t[1]+", "+t[2]+", "+t[3]+")"}function vn(t,e){return t[0]===e[0]&&t[1]===e[1]&&t[2]===e[2]&&t[3]===e[3]}function yn(t,e){var n=t[0],r=t[1],i=t[2],o=t[3],a=e[0],s=e[1],u=e[2],c=e[3];return Math.abs(n-a)<=l.EPSILON*Math.max(1,Math.abs(n),Math.abs(a))&&Math.abs(r-s)<=l.EPSILON*Math.max(1,Math.abs(r),Math.abs(s))&&Math.abs(i-u)<=l.EPSILON*Math.max(1,Math.abs(i),Math.abs(u))&&Math.abs(o-c)<=l.EPSILON*Math.max(1,Math.abs(o),Math.abs(c))}var mn,bn=Xe,xn=We,wn=Ve,_n=tn,En=en,Sn=nn,Mn=rn,On=(mn=Be(),function(t,e,n,r,i,o){var a,s;for(e||(e=4),n||(n=0),s=r?Math.min(r*e+n,t.length):t.length,a=n;al.EPSILON?(t[0]=e[0]/r,t[1]=e[1]/r,t[2]=e[2]/r):(t[0]=1,t[1]=0,t[2]=0),n}function In(t,e){var n=ar(t,e);return Math.acos(2*n*n-1)}function Tn(t,e,n){var r=e[0],i=e[1],o=e[2],a=e[3],s=n[0],u=n[1],c=n[2],l=n[3];return t[0]=r*l+a*s+i*c-o*u,t[1]=i*l+a*u+o*s-r*c,t[2]=o*l+a*c+r*u-i*s,t[3]=a*l-r*s-i*u-o*c,t}function Nn(t,e,n){n*=.5;var r=e[0],i=e[1],o=e[2],a=e[3],s=Math.sin(n),u=Math.cos(n);return t[0]=r*u+a*s,t[1]=i*u+o*s,t[2]=o*u-i*s,t[3]=a*u-r*s,t}function Pn(t,e,n){n*=.5;var r=e[0],i=e[1],o=e[2],a=e[3],s=Math.sin(n),u=Math.cos(n);return t[0]=r*u-o*s,t[1]=i*u+a*s,t[2]=o*u+r*s,t[3]=a*u-i*s,t}function Dn(t,e,n){n*=.5;var r=e[0],i=e[1],o=e[2],a=e[3],s=Math.sin(n),u=Math.cos(n);return t[0]=r*u+i*s,t[1]=i*u-r*s,t[2]=o*u+a*s,t[3]=a*u-o*s,t}function Ln(t,e){var n=e[0],r=e[1],i=e[2];return t[0]=n,t[1]=r,t[2]=i,t[3]=Math.sqrt(Math.abs(1-n*n-r*r-i*i)),t}function Rn(t,e){var n=e[0],r=e[1],i=e[2],o=e[3],a=Math.sqrt(n*n+r*r+i*i),s=Math.exp(o),u=a>0?s*Math.sin(a)/a:0;return t[0]=n*u,t[1]=r*u,t[2]=i*u,t[3]=s*Math.cos(a),t}function Bn(t,e){var n=e[0],r=e[1],i=e[2],o=e[3],a=Math.sqrt(n*n+r*r+i*i),s=a>0?Math.atan2(a,o)/a:0;return t[0]=n*s,t[1]=r*s,t[2]=i*s,t[3]=.5*Math.log(n*n+r*r+i*i+o*o),t}function Fn(t,e,n){return Bn(t,e),or(t,t,n),Rn(t,t),t}function zn(t,e,n,r){var i,o,a,s,u,c=e[0],f=e[1],h=e[2],d=e[3],p=n[0],g=n[1],v=n[2],y=n[3];return(o=c*p+f*g+h*v+d*y)<0&&(o=-o,p=-p,g=-g,v=-v,y=-y),1-o>l.EPSILON?(i=Math.acos(o),a=Math.sin(i),s=Math.sin((1-r)*i)/a,u=Math.sin(r*i)/a):(s=1-r,u=r),t[0]=s*c+u*p,t[1]=s*f+u*g,t[2]=s*h+u*v,t[3]=s*d+u*y,t}function Gn(t){var e=l.RANDOM(),n=l.RANDOM(),r=l.RANDOM(),i=Math.sqrt(1-e),o=Math.sqrt(e);return t[0]=i*Math.sin(2*Math.PI*n),t[1]=i*Math.cos(2*Math.PI*n),t[2]=o*Math.sin(2*Math.PI*r),t[3]=o*Math.cos(2*Math.PI*r),t}function Yn(t,e){var n=e[0],r=e[1],i=e[2],o=e[3],a=n*n+r*r+i*i+o*o,s=a?1/a:0;return t[0]=-n*s,t[1]=-r*s,t[2]=-i*s,t[3]=o*s,t}function Un(t,e){return t[0]=-e[0],t[1]=-e[1],t[2]=-e[2],t[3]=e[3],t}function Xn(t,e){var n,r=e[0]+e[4]+e[8];if(r>0)n=Math.sqrt(r+1),t[3]=.5*n,n=.5/n,t[0]=(e[5]-e[7])*n,t[1]=(e[6]-e[2])*n,t[2]=(e[1]-e[3])*n;else{var i=0;e[4]>e[0]&&(i=1),e[8]>e[3*i+i]&&(i=2);var o=(i+1)%3,a=(i+2)%3;n=Math.sqrt(e[3*i+i]-e[3*o+o]-e[3*a+a]+1),t[i]=.5*n,n=.5/n,t[3]=(e[3*o+a]-e[3*a+o])*n,t[o]=(e[3*o+i]+e[3*i+o])*n,t[a]=(e[3*a+i]+e[3*i+a])*n}return t}function Wn(t,e,n,r){var i=.5*Math.PI/180;e*=i,n*=i,r*=i;var o=Math.sin(e),a=Math.cos(e),s=Math.sin(n),u=Math.cos(n),c=Math.sin(r),l=Math.cos(r);return t[0]=o*u*l-a*s*c,t[1]=a*s*l+o*u*c,t[2]=a*u*c-o*s*l,t[3]=a*u*l+o*s*c,t}function Vn(t){return"quat("+t[0]+", "+t[1]+", "+t[2]+", "+t[3]+")"}var Hn,qn,Zn,Kn,Qn,$n,Jn=Fe,tr=ze,er=Ge,nr=Ye,rr=Ue,ir=Tn,or=$e,ar=un,sr=ln,ur=nn,cr=ur,lr=rn,fr=lr,hr=sn,dr=vn,pr=yn,gr=(Hn=Re.create(),qn=Re.fromValues(1,0,0),Zn=Re.fromValues(0,1,0),function(t,e,n){var r=Re.dot(e,n);return r<-.999999?(Re.cross(Hn,qn,e),Re.len(Hn)<1e-6&&Re.cross(Hn,Zn,e),Re.normalize(Hn,Hn),Cn(t,Hn,Math.PI),t):r>.999999?(t[0]=0,t[1]=0,t[2]=0,t[3]=1,t):(Re.cross(Hn,e,n),t[0]=Hn[0],t[1]=Hn[1],t[2]=Hn[2],t[3]=1+r,hr(t,t))}),vr=(Kn=kn(),Qn=kn(),function(t,e,n,r,i,o){return zn(Kn,e,i,o),zn(Qn,n,r,o),zn(t,Kn,Qn,2*o*(1-o)),t}),yr=($n=ut(),function(t,e,n,r){return $n[0]=n[0],$n[3]=n[1],$n[6]=n[2],$n[1]=r[0],$n[4]=r[1],$n[7]=r[2],$n[2]=-e[0],$n[5]=-e[1],$n[8]=-e[2],hr(t,Xn(t,$n))});function mr(){var t=new l.ARRAY_TYPE(8);return l.ARRAY_TYPE!=Float32Array&&(t[0]=0,t[1]=0,t[2]=0,t[4]=0,t[5]=0,t[6]=0,t[7]=0),t[3]=1,t}function br(t){var e=new l.ARRAY_TYPE(8);return e[0]=t[0],e[1]=t[1],e[2]=t[2],e[3]=t[3],e[4]=t[4],e[5]=t[5],e[6]=t[6],e[7]=t[7],e}function xr(t,e,n,r,i,o,a,s){var u=new l.ARRAY_TYPE(8);return u[0]=t,u[1]=e,u[2]=n,u[3]=r,u[4]=i,u[5]=o,u[6]=a,u[7]=s,u}function wr(t,e,n,r,i,o,a){var s=new l.ARRAY_TYPE(8);s[0]=t,s[1]=e,s[2]=n,s[3]=r;var u=.5*i,c=.5*o,f=.5*a;return s[4]=u*r+c*n-f*e,s[5]=c*r+f*t-u*n,s[6]=f*r+u*e-c*t,s[7]=-u*t-c*e-f*n,s}function _r(t,e,n){var r=.5*n[0],i=.5*n[1],o=.5*n[2],a=e[0],s=e[1],u=e[2],c=e[3];return t[0]=a,t[1]=s,t[2]=u,t[3]=c,t[4]=r*c+i*u-o*s,t[5]=i*c+o*a-r*u,t[6]=o*c+r*s-i*a,t[7]=-r*a-i*s-o*u,t}function Er(t,e){return t[0]=0,t[1]=0,t[2]=0,t[3]=1,t[4]=.5*e[0],t[5]=.5*e[1],t[6]=.5*e[2],t[7]=0,t}function Sr(t,e){return t[0]=e[0],t[1]=e[1],t[2]=e[2],t[3]=e[3],t[4]=0,t[5]=0,t[6]=0,t[7]=0,t}function Mr(t,e){var n=kn();de(n,e);var r=new l.ARRAY_TYPE(3);return fe(r,e),_r(t,n,r),t}function Or(t,e){return t[0]=e[0],t[1]=e[1],t[2]=e[2],t[3]=e[3],t[4]=e[4],t[5]=e[5],t[6]=e[6],t[7]=e[7],t}function kr(t){return t[0]=0,t[1]=0,t[2]=0,t[3]=1,t[4]=0,t[5]=0,t[6]=0,t[7]=0,t}function Ar(t,e,n,r,i,o,a,s,u){return t[0]=e,t[1]=n,t[2]=r,t[3]=i,t[4]=o,t[5]=a,t[6]=s,t[7]=u,t}var Cr=er;function jr(t,e){return t[0]=e[4],t[1]=e[5],t[2]=e[6],t[3]=e[7],t}var Ir=er;function Tr(t,e){return t[4]=e[0],t[5]=e[1],t[6]=e[2],t[7]=e[3],t}function Nr(t,e){var n=e[4],r=e[5],i=e[6],o=e[7],a=-e[0],s=-e[1],u=-e[2],c=e[3];return t[0]=2*(n*c+o*a+r*u-i*s),t[1]=2*(r*c+o*s+i*a-n*u),t[2]=2*(i*c+o*u+n*s-r*a),t}function Pr(t,e,n){var r=e[0],i=e[1],o=e[2],a=e[3],s=.5*n[0],u=.5*n[1],c=.5*n[2],l=e[4],f=e[5],h=e[6],d=e[7];return t[0]=r,t[1]=i,t[2]=o,t[3]=a,t[4]=a*s+i*c-o*u+l,t[5]=a*u+o*s-r*c+f,t[6]=a*c+r*u-i*s+h,t[7]=-r*s-i*u-o*c+d,t}function Dr(t,e,n){var r=-e[0],i=-e[1],o=-e[2],a=e[3],s=e[4],u=e[5],c=e[6],l=e[7],f=s*a+l*r+u*o-c*i,h=u*a+l*i+c*r-s*o,d=c*a+l*o+s*i-u*r,p=l*a-s*r-u*i-c*o;return Nn(t,e,n),r=t[0],i=t[1],o=t[2],a=t[3],t[4]=f*a+p*r+h*o-d*i,t[5]=h*a+p*i+d*r-f*o,t[6]=d*a+p*o+f*i-h*r,t[7]=p*a-f*r-h*i-d*o,t}function Lr(t,e,n){var r=-e[0],i=-e[1],o=-e[2],a=e[3],s=e[4],u=e[5],c=e[6],l=e[7],f=s*a+l*r+u*o-c*i,h=u*a+l*i+c*r-s*o,d=c*a+l*o+s*i-u*r,p=l*a-s*r-u*i-c*o;return Pn(t,e,n),r=t[0],i=t[1],o=t[2],a=t[3],t[4]=f*a+p*r+h*o-d*i,t[5]=h*a+p*i+d*r-f*o,t[6]=d*a+p*o+f*i-h*r,t[7]=p*a-f*r-h*i-d*o,t}function Rr(t,e,n){var r=-e[0],i=-e[1],o=-e[2],a=e[3],s=e[4],u=e[5],c=e[6],l=e[7],f=s*a+l*r+u*o-c*i,h=u*a+l*i+c*r-s*o,d=c*a+l*o+s*i-u*r,p=l*a-s*r-u*i-c*o;return Dn(t,e,n),r=t[0],i=t[1],o=t[2],a=t[3],t[4]=f*a+p*r+h*o-d*i,t[5]=h*a+p*i+d*r-f*o,t[6]=d*a+p*o+f*i-h*r,t[7]=p*a-f*r-h*i-d*o,t}function Br(t,e,n){var r=n[0],i=n[1],o=n[2],a=n[3],s=e[0],u=e[1],c=e[2],l=e[3];return t[0]=s*a+l*r+u*o-c*i,t[1]=u*a+l*i+c*r-s*o,t[2]=c*a+l*o+s*i-u*r,t[3]=l*a-s*r-u*i-c*o,s=e[4],u=e[5],c=e[6],l=e[7],t[4]=s*a+l*r+u*o-c*i,t[5]=u*a+l*i+c*r-s*o,t[6]=c*a+l*o+s*i-u*r,t[7]=l*a-s*r-u*i-c*o,t}function Fr(t,e,n){var r=e[0],i=e[1],o=e[2],a=e[3],s=n[0],u=n[1],c=n[2],l=n[3];return t[0]=r*l+a*s+i*c-o*u,t[1]=i*l+a*u+o*s-r*c,t[2]=o*l+a*c+r*u-i*s,t[3]=a*l-r*s-i*u-o*c,s=n[4],u=n[5],c=n[6],l=n[7],t[4]=r*l+a*s+i*c-o*u,t[5]=i*l+a*u+o*s-r*c,t[6]=o*l+a*c+r*u-i*s,t[7]=a*l-r*s-i*u-o*c,t}function zr(t,e,n,r){if(Math.abs(r)0){n=Math.sqrt(n);var r=e[0]/n,i=e[1]/n,o=e[2]/n,a=e[3]/n,s=e[4],u=e[5],c=e[6],l=e[7],f=r*s+i*u+o*c+a*l;t[0]=r,t[1]=i,t[2]=o,t[3]=a,t[4]=(s-r*f)/n,t[5]=(u-i*f)/n,t[6]=(c-o*f)/n,t[7]=(l-a*f)/n}return t}function ti(t){return"quat2("+t[0]+", "+t[1]+", "+t[2]+", "+t[3]+", "+t[4]+", "+t[5]+", "+t[6]+", "+t[7]+")"}function ei(t,e){return t[0]===e[0]&&t[1]===e[1]&&t[2]===e[2]&&t[3]===e[3]&&t[4]===e[4]&&t[5]===e[5]&&t[6]===e[6]&&t[7]===e[7]}function ni(t,e){var n=t[0],r=t[1],i=t[2],o=t[3],a=t[4],s=t[5],u=t[6],c=t[7],f=e[0],h=e[1],d=e[2],p=e[3],g=e[4],v=e[5],y=e[6],m=e[7];return Math.abs(n-f)<=l.EPSILON*Math.max(1,Math.abs(n),Math.abs(f))&&Math.abs(r-h)<=l.EPSILON*Math.max(1,Math.abs(r),Math.abs(h))&&Math.abs(i-d)<=l.EPSILON*Math.max(1,Math.abs(i),Math.abs(d))&&Math.abs(o-p)<=l.EPSILON*Math.max(1,Math.abs(o),Math.abs(p))&&Math.abs(a-g)<=l.EPSILON*Math.max(1,Math.abs(a),Math.abs(g))&&Math.abs(s-v)<=l.EPSILON*Math.max(1,Math.abs(s),Math.abs(v))&&Math.abs(u-y)<=l.EPSILON*Math.max(1,Math.abs(u),Math.abs(y))&&Math.abs(c-m)<=l.EPSILON*Math.max(1,Math.abs(c),Math.abs(m))}var ri=n(39)},function(t,e,n){"use strict";n.d(e,"j",(function(){return i})),n.d(e,"c",(function(){return o})),n.d(e,"g",(function(){return a})),n.d(e,"b",(function(){return s}));var r=n(0);function i(t,e){var n=t.indexOf(e);-1!==n&&t.splice(n,1)}n.d(e,"e",(function(){return r.isNil})),n.d(e,"d",(function(){return r.isFunction})),n.d(e,"h",(function(){return r.isString})),n.d(e,"f",(function(){return r.isObject})),n.d(e,"i",(function(){return r.mix})),n.d(e,"a",(function(){return r.each})),n.d(e,"k",(function(){return r.upperFirst}));var o="undefined"!=typeof window&&void 0!==window.document;function a(t,e){if(t.isCanvas())return!0;for(var n=e.getParent(),r=!1;n;){if(n===t){r=!0;break}n=n.getParent()}return r}function s(t){return t.cfg.visible&&t.cfg.capture}},function(t,e,n){"use strict";n.d(e,"e",(function(){return y})),n.d(e,"b",(function(){return E})),n.d(e,"a",(function(){return j})),n.d(e,"c",(function(){return f})),n.d(e,"d",(function(){return L})),n.d(e,"f",(function(){return r}));var r={};n.r(r),n.d(r,"distance",(function(){return o})),n.d(r,"isNumberEqual",(function(){return a})),n.d(r,"getBBoxByArray",(function(){return s})),n.d(r,"getBBoxRange",(function(){return u})),n.d(r,"piMod",(function(){return c}));var i=n(0);function o(t,e,n,r){var i=t-n,o=e-r;return Math.sqrt(i*i+o*o)}function a(t,e){return Math.abs(t-e)<.001}function s(t,e){var n=Object(i.min)(t),r=Object(i.min)(e);return{x:n,y:r,width:Object(i.max)(t)-n,height:Object(i.max)(e)-r}}function u(t,e,n,r){return{minX:Object(i.min)([t,n]),maxX:Object(i.max)([t,n]),minY:Object(i.min)([e,r]),maxY:Object(i.max)([e,r])}}function c(t){return(t+2*Math.PI)%(2*Math.PI)}var l=n(39),f={box:function(t,e,n,r){return s([t,n],[e,r])},length:function(t,e,n,r){return o(t,e,n,r)},pointAt:function(t,e,n,r,i){return{x:(1-i)*t+i*n,y:(1-i)*e+i*r}},pointDistance:function(t,e,n,r,i,a){var s=(n-t)*(i-t)+(r-e)*(a-e);return s<0?o(t,e,i,a):s>(n-t)*(n-t)+(r-e)*(r-e)?o(n,r,i,a):this.pointToLine(t,e,n,r,i,a)},pointToLine:function(t,e,n,r,i,o){var a=[n-t,r-e];if(l.exactEquals(a,[0,0]))return Math.sqrt((i-t)*(i-t)+(o-e)*(o-e));var s=[-a[1],a[0]];l.normalize(s,s);var u=[i-t,o-e];return Math.abs(l.dot(u,s))},tangentAngle:function(t,e,n,r){return Math.atan2(r-e,n-t)}};function h(t,e,n,r,i,a){var s,u=1/0,c=[n,r],l=20;a&&a>200&&(l=a/10);for(var f=1/l,h=f/10,d=0;d<=l;d++){var p=d*f,g=[i.apply(null,t.concat([p])),i.apply(null,e.concat([p]))];(b=o(c[0],c[1],g[0],g[1]))=0&&b=0?[i]:[]}function g(t,e,n,r){return 2*(1-r)*(e-t)+2*r*(n-e)}function v(t,e,n,r,i,o,a){var s=d(t,n,i,a),u=d(e,r,o,a),c=f.pointAt(t,e,n,r,a),l=f.pointAt(n,r,i,o,a);return[[t,e,c.x,c.y,s,u],[s,u,l.x,l.y,i,o]]}var y={box:function(t,e,n,r,i,o){var a=p(t,n,i)[0],u=p(e,r,o)[0],c=[t,i],l=[e,o];return void 0!==a&&c.push(d(t,n,i,a)),void 0!==u&&l.push(d(e,r,o,u)),s(c,l)},length:function(t,e,n,r,i,a){return function t(e,n,r,i,a,s,u){if(0===u)return(o(e,n,r,i)+o(r,i,a,s)+o(e,n,a,s))/2;var c=v(e,n,r,i,a,s,.5),l=c[0],f=c[1];return l.push(u-1),f.push(u-1),t.apply(null,l)+t.apply(null,f)}(t,e,n,r,i,a,3)},nearestPoint:function(t,e,n,r,i,o,a,s){return h([t,n,i],[e,r,o],a,s,d)},pointDistance:function(t,e,n,r,i,a,s,u){var c=this.nearestPoint(t,e,n,r,i,a,s,u);return o(c.x,c.y,s,u)},interpolationAt:d,pointAt:function(t,e,n,r,i,o,a){return{x:d(t,n,i,a),y:d(e,r,o,a)}},divide:function(t,e,n,r,i,o,a){return v(t,e,n,r,i,o,a)},tangentAngle:function(t,e,n,r,i,o,a){var s=g(t,n,i,a),u=g(e,r,o,a);return c(Math.atan2(u,s))}};function m(t,e,n,r,i){var o=1-i;return o*o*o*t+3*e*i*o*o+3*n*i*i*o+r*i*i*i}function b(t,e,n,r,i){var o=1-i;return 3*(o*o*(e-t)+2*o*i*(n-e)+i*i*(r-n))}function x(t,e,n,r){var i,o,s,u=-3*t+9*e-9*n+3*r,c=6*t-12*e+6*n,l=3*e-3*t,f=[];if(a(u,0))a(c,0)||(i=-l/c)>=0&&i<=1&&f.push(i);else{var h=c*c-4*u*l;a(h,0)?f.push(-c/(2*u)):h>0&&(o=(-c-(s=Math.sqrt(h)))/(2*u),(i=(-c+s)/(2*u))>=0&&i<=1&&f.push(i),o>=0&&o<=1&&f.push(o))}return f}function w(t,e,n,r,i,o,a,s,u){var c=m(t,n,i,a,u),l=m(e,r,o,s,u),h=f.pointAt(t,e,n,r,u),d=f.pointAt(n,r,i,o,u),p=f.pointAt(i,o,a,s,u),g=f.pointAt(h.x,h.y,d.x,d.y,u),v=f.pointAt(d.x,d.y,p.x,p.y,u);return[[t,e,h.x,h.y,g.x,g.y,c,l],[c,l,v.x,v.y,p.x,p.y,a,s]]}function _(t,e,n,r,i,a,s,u,c){if(0===c)return function(t,e){for(var n=0,r=t.length,i=0;i0?n:-1*n}var M=function(t,e,n,r,i,o){var a=n,s=r;if(0===a||0===s)return{x:t,y:e};for(var u,c,l=i-t,f=o-e,h=Math.abs(l),d=Math.abs(f),p=a*a,g=s*s,v=Math.PI/4,y=0;y<4;y++){u=a*Math.cos(v),c=s*Math.sin(v);var m=(p-g)*Math.pow(Math.cos(v),3)/a,b=(g-p)*Math.pow(Math.sin(v),3)/s,x=u-m,w=c-b,_=h-m,E=d-b,M=Math.hypot(w,x),O=Math.hypot(E,_);v+=M*Math.asin((x*E-w*_)/(M*O))/Math.sqrt(p+g-u*u-c*c),v=Math.min(Math.PI/2,Math.max(0,v))}return{x:t+S(u,l),y:e+S(c,f)}};function O(t,e,n,r,i,o){return n*Math.cos(i)*Math.cos(o)-r*Math.sin(i)*Math.sin(o)+t}function k(t,e,n,r,i,o){return n*Math.sin(i)*Math.cos(o)+r*Math.cos(i)*Math.sin(o)+e}function A(t,e,n){return{x:t*Math.cos(n),y:e*Math.sin(n)}}function C(t,e,n){var r=Math.cos(n),i=Math.sin(n);return[t*r-e*i,t*i+e*r]}var j={box:function(t,e,n,r,i,o,a){for(var s=function(t,e,n){return Math.atan(-e/t*Math.tan(n))}(n,r,i),u=1/0,c=-1/0,l=[o,a],f=2*-Math.PI;f<=2*Math.PI;f+=Math.PI){var h=s+f;oc&&(c=d)}var p=function(t,e,n){return Math.atan(e/(t*Math.tan(n)))}(n,r,i),g=1/0,v=-1/0,y=[o,a];for(f=2*-Math.PI;f<=2*Math.PI;f+=Math.PI){var m=p+f;ov&&(v=b)}return{x:u,y:g,width:c-u,height:v-g}},length:function(t,e,n,r,i,o,a){},nearestPoint:function(t,e,n,r,i,o,a,s,u){var c=C(s-t,u-e,-i),l=c[0],f=c[1],h=M(0,0,n,r,l,f),d=function(t,e,n,r){return(Math.atan2(r*t,n*e)+2*Math.PI)%(2*Math.PI)}(n,r,h.x,h.y);da&&(h=A(n,r,a));var p=C(h.x,h.y,i);return{x:p[0]+t,y:p[1]+e}},pointDistance:function(t,e,n,r,i,a,s,u,c){var l=this.nearestPoint(t,e,n,r,u,c);return o(l.x,l.y,u,c)},pointAt:function(t,e,n,r,i,o,a,s){var u=(a-o)*s+o;return{x:O(t,0,n,r,i,u),y:k(0,e,n,r,i,u)}},tangentAngle:function(t,e,n,r,i,o,a,s){var u=(a-o)*s+o,l=function(t,e,n,r,i,o,a,s){return-1*n*Math.cos(i)*Math.sin(s)-r*Math.sin(i)*Math.cos(s)}(0,0,n,r,i,0,0,u),f=function(t,e,n,r,i,o,a,s){return-1*n*Math.sin(i)*Math.sin(s)+r*Math.cos(i)*Math.cos(s)}(0,0,n,r,i,0,0,u);return c(Math.atan2(f,l))}};function I(t){for(var e=0,n=[],r=0;r1||e<0||t.length<2)return null;var n=I(t),r=n.segments,i=n.totalLength;if(0===i)return{x:t[0][0],y:t[0][1]};for(var o=0,a=null,s=0;s=o&&e<=o+h){var d=(e-o)/h;a=f.pointAt(c[0],c[1],l[0],l[1],d);break}o+=h}return a}function P(t,e){if(e>1||e<0||t.length<2)return 0;for(var n=I(t),r=n.segments,i=n.totalLength,o=0,a=0,s=0;s=o&&e<=o+f){a=Math.atan2(l[1]-c[1],l[0]-c[0]);break}o+=f}return a}function D(t,e,n){for(var r=1/0,i=0;ie)n.insertBefore(t,i);else if(o_?w:_,A=w>_?1:w/_,C=w>_?_/w:1;e.translate(b,x),e.rotate(M),e.scale(A,C),e.arc(0,0,k,E,S,1-O),e.scale(1/A,1/C),e.rotate(-M),e.translate(-b,-x)}break;case"Z":e.closePath()}if("Z"===p)c=l;else{var j=d.length;c=[d[j-2],d[j-1]]}}}}function v(t,e){var n=t.get("canvas");n&&("remove"===e&&(t._cacheCanvasBBox=t.get("cacheCanvasBBox")),t.get("hasChanged")||(t.set("hasChanged",!0),t.cfg.parent&&t.cfg.parent.get("hasChanged")||(n.refreshElement(t,e,n),n.get("autoDraw")&&n.draw())))}function y(t){if(!t.length)return null;var e=[],n=[],i=[],o=[];return Object(r.each)(t,(function(t){var r=function(t){var e;if(t.destroyed)e=t._cacheCanvasBBox;else{var n=t.get("cacheCanvasBBox"),r=n&&!(!n.width||!n.height),i=t.getCanvasBBox(),o=i&&!(!i.width||!i.height);r&&o?e=Object(a.l)(n,i):r?e=n:o&&(e=i)}return e}(t);r&&(e.push(r.minX),n.push(r.minY),i.push(r.maxX),o.push(r.maxY))})),{minX:Object(r.min)(e),minY:Object(r.min)(n),maxX:Object(r.max)(i),maxY:Object(r.max)(o)}}function m(t,e){return t&&e&&Object(a.f)(t,e)?{minX:Math.max(t.minX,e.minX),minY:Math.max(t.minY,e.minY),maxX:Math.min(t.maxX,e.maxX),maxY:Math.min(t.maxY,e.maxY)}:null}},function(t,e,n){function r(t){return(r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}var i=n(194)();t.exports=i;try{regeneratorRuntime=i}catch(t){"object"===("undefined"==typeof globalThis?"undefined":r(globalThis))?globalThis.regeneratorRuntime=i:Function("r","regeneratorRuntime = r")(i)}},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.Base=void 0;var r=function(){function t(){this.nodes=[],this.edges=[],this.combos=[],this.comboEdges=[],this.hiddenNodes=[],this.hiddenEdges=[],this.hiddenCombos=[],this.vedges=[],this.positions=[],this.destroyed=!1,this.onLayoutEnd=function(){}}return t.prototype.layout=function(t){return this.init(t),this.execute(!0)},t.prototype.init=function(t){this.nodes=t.nodes||[],this.edges=t.edges||[],this.combos=t.combos||[],this.comboEdges=t.comboEdges||[],this.hiddenNodes=t.hiddenNodes||[],this.hiddenEdges=t.hiddenEdges||[],this.hiddenCombos=t.hiddenCombos||[],this.vedges=t.vedges||[]},t.prototype.execute=function(t){},t.prototype.executeWithWorker=function(){},t.prototype.getDefaultCfg=function(){return{}},t.prototype.updateCfg=function(t){t&&Object.assign(this,t)},t.prototype.getType=function(){return"base"},t.prototype.destroy=function(){this.nodes=null,this.edges=null,this.combos=null,this.positions=null,this.destroyed=!0},t}();e.Base=r},function(t,e,n){"use strict";n.d(e,"c",(function(){return h})),n.d(e,"b",(function(){return d})),n.d(e,"a",(function(){return p}));var r=n(1),i=n(29);function o(t){return(o="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}var a=Math.sin,s=Math.cos,u=Math.atan2,c=Math.PI;function l(t,e,n,r,o,l,f){var h=e.stroke,d=e.lineWidth,p=u(r-l,n-o),g=new i.Path({type:"path",canvas:t.get("canvas"),isArrowShape:!0,attrs:{path:"M"+10*s(c/6)+","+10*a(c/6)+" L0,0 L"+10*s(c/6)+",-"+10*a(c/6),stroke:h,lineWidth:d}});g.translate(o,l),g.rotateAtPoint(o,l,p),t.set(f?"startArrowShape":"endArrowShape",g)}function f(t,e,n,o,c,l,f){var h=e.startArrow,d=e.endArrow,p=e.stroke,g=e.lineWidth,v=f?h:d,y=v.d,m=v.fill,b=v.stroke,x=v.lineWidth,w=Object(r.__rest)(v,["d","fill","stroke","lineWidth"]),_=u(o-l,n-c);y&&(c-=s(_)*y,l-=a(_)*y);var E=new i.Path({type:"path",canvas:t.get("canvas"),isArrowShape:!0,attrs:Object(r.__assign)(Object(r.__assign)({},w),{stroke:b||p,lineWidth:x||g,fill:m})});E.translate(c,l),E.rotateAtPoint(c,l,_),t.set(f?"startArrowShape":"endArrowShape",E)}function h(t,e,n,r,i){var o=u(r-e,n-t);return{dx:s(o)*i,dy:a(o)*i}}function d(t,e,n,r,i,a){"object"===o(e.startArrow)?f(t,e,n,r,i,a,!0):e.startArrow?l(t,e,n,r,i,a,!0):t.set("startArrowShape",null)}function p(t,e,n,r,i,a){"object"===o(e.endArrow)?f(t,e,n,r,i,a,!1):e.endArrow?l(t,e,n,r,i,a,!1):t.set("startArrowShape",null)}},function(t,e,n){"use strict";n.d(e,"b",(function(){return i})),n.d(e,"c",(function(){return o})),n.d(e,"a",(function(){return a}));var r=n(12);function i(t,e){var n=t.cfg.el,r=t.attr(),i={dx:r.shadowOffsetX,dy:r.shadowOffsetY,blur:r.shadowBlur,color:r.shadowColor};if(i.dx||i.dy||i.blur||i.color){var o=e.find("filter",i);o||(o=e.addShadow(i)),n.setAttribute("filter","url(#"+o+")")}else n.removeAttribute("filter")}function o(t){var e=t.attr().matrix;if(e){for(var n=t.cfg.el,r=[],i=0;i<9;i+=3)r.push(e[i]+","+e[i+1]);-1===(r=r.join(",")).indexOf("NaN")?n.setAttribute("transform","matrix("+r+")"):console.warn("invalid matrix:",e)}}function a(t,e){var n=t.getClip(),i=t.get("el");if(n){if(n&&!i.hasAttribute("clip-path")){Object(r.a)(n),n.createPath(e);var o=e.addClip(n);i.setAttribute("clip-path","url(#"+o+")")}}else i.removeAttribute("clip-path")}},function(t,e,n){"use strict";n.d(e,"a",(function(){return u})),n.d(e,"b",(function(){return h})),n.d(e,"c",(function(){return g})),n.d(e,"d",(function(){return _}));var r=n(0),i=/[MLHVQTCSAZ]([^MLHVQTCSAZ]*)/gi,o=/[^\s\,]+/gi;var a=function(t){var e=t||[];return Object(r.isArray)(e)?e:Object(r.isString)(e)?(e=e.match(i),Object(r.each)(e,(function(t,n){if((t=t.match(o))[0].length>1){var i=t[0].charAt(0);t.splice(1,0,t[0].substr(1)),t[0]=i}Object(r.each)(t,(function(e,n){isNaN(e)||(t[n]=+e)})),e[n]=t})),e):void 0},s=n(8);var u=function(t,e,n){void 0===e&&(e=!1),void 0===n&&(n=[[0,0],[1,1]]);for(var r=!!e,i=[],o=0,a=t.length;o2&&(n.push([r].concat(o.splice(0,2))),a="l",r="m"===r?"l":"L"),"o"===a&&1===o.length&&n.push([r,o[0]]),"r"===a)n.push([r].concat(o));else for(;o.length>=e[a]&&(n.push([r].concat(o.splice(0,e[a]))),e[a]););return""})),n}var d=/[a-z]/;function p(t,e){return[e[0]+(e[0]-t[0]),e[1]+(e[1]-t[1])]}function g(t){var e=h(t);if(!e||!e.length)return[["M",0,0]];for(var n=!1,r=0;r=0){n=!0;break}}if(!n)return e;var o=[],a=0,s=0,u=0,c=0,l=0,f=e[0];"M"!==f[0]&&"m"!==f[0]||(u=a=+f[1],c=s=+f[2],l++,o[0]=["M",a,s]);r=l;for(var g=e.length;r1&&(n*=Math.sqrt(p),i*=Math.sqrt(p));var g=n*n*(d*d)+i*i*(h*h),v=g?Math.sqrt((n*n*(i*i)-g)/g):1;a===s&&(v*=-1),isNaN(v)&&(v=0);var x=i?v*n*d/i:0,w=n?v*-i*h/n:0,_=(u+l)/2+Math.cos(o)*x-Math.sin(o)*w,E=(c+f)/2+Math.sin(o)*x+Math.cos(o)*w,S=[(h-x)/n,(d-w)/i],M=[(-1*h-x)/n,(-1*d-w)/i],O=m([1,0],S),k=m(S,M);return y(S,M)<=-1&&(k=Math.PI),y(S,M)>=1&&(k=0),0===s&&k>0&&(k-=2*Math.PI),1===s&&k<0&&(k+=2*Math.PI),{cx:_,cy:E,rx:b(t,[l,f])?0:n,ry:b(t,[l,f])?0:i,startAngle:O,endAngle:O+k,xRotation:o,arcFlag:a,sweepFlag:s}}function w(t,e){return[e[0]+(e[0]-t[0]),e[1]+(e[1]-t[1])]}function _(t){for(var e=[],n=null,r=null,i=null,o=0,s=(t=a(t)).length,u=0;u0&&(o=1/Math.sqrt(o)),t[0]=e[0]*o,t[1]=e[1]*o,t[2]=e[2]*o,t}function k(t,e){return t[0]*e[0]+t[1]*e[1]+t[2]*e[2]}function A(t,e,n){var r=e[0],i=e[1],o=e[2],a=n[0],s=n[1],u=n[2];return t[0]=i*u-o*s,t[1]=o*a-r*u,t[2]=r*s-i*a,t}function C(t,e,n,r){var i=e[0],o=e[1],a=e[2];return t[0]=i+r*(n[0]-i),t[1]=o+r*(n[1]-o),t[2]=a+r*(n[2]-a),t}function j(t,e,n,r,i,o){var a=o*o,s=a*(2*o-3)+1,u=a*(o-2)+o,c=a*(o-1),l=a*(3-2*o);return t[0]=e[0]*s+n[0]*u+r[0]*c+i[0]*l,t[1]=e[1]*s+n[1]*u+r[1]*c+i[1]*l,t[2]=e[2]*s+n[2]*u+r[2]*c+i[2]*l,t}function I(t,e,n,r,i,o){var a=1-o,s=a*a,u=o*o,c=s*a,l=3*o*s,f=3*u*a,h=u*o;return t[0]=e[0]*c+n[0]*l+r[0]*f+i[0]*h,t[1]=e[1]*c+n[1]*l+r[1]*f+i[1]*h,t[2]=e[2]*c+n[2]*l+r[2]*f+i[2]*h,t}function T(t,e){e=e||1;var n=2*r.RANDOM()*Math.PI,i=2*r.RANDOM()-1,o=Math.sqrt(1-i*i)*e;return t[0]=Math.cos(n)*o,t[1]=Math.sin(n)*o,t[2]=i*e,t}function N(t,e,n){var r=e[0],i=e[1],o=e[2],a=n[3]*r+n[7]*i+n[11]*o+n[15];return a=a||1,t[0]=(n[0]*r+n[4]*i+n[8]*o+n[12])/a,t[1]=(n[1]*r+n[5]*i+n[9]*o+n[13])/a,t[2]=(n[2]*r+n[6]*i+n[10]*o+n[14])/a,t}function P(t,e,n){var r=e[0],i=e[1],o=e[2];return t[0]=r*n[0]+i*n[3]+o*n[6],t[1]=r*n[1]+i*n[4]+o*n[7],t[2]=r*n[2]+i*n[5]+o*n[8],t}function D(t,e,n){var r=n[0],i=n[1],o=n[2],a=n[3],s=e[0],u=e[1],c=e[2],l=i*c-o*u,f=o*s-r*c,h=r*u-i*s,d=i*h-o*f,p=o*l-r*h,g=r*f-i*l,v=2*a;return l*=v,f*=v,h*=v,d*=2,p*=2,g*=2,t[0]=s+l+d,t[1]=u+f+p,t[2]=c+h+g,t}function L(t,e,n,r){var i=[],o=[];return i[0]=e[0]-n[0],i[1]=e[1]-n[1],i[2]=e[2]-n[2],o[0]=i[0],o[1]=i[1]*Math.cos(r)-i[2]*Math.sin(r),o[2]=i[1]*Math.sin(r)+i[2]*Math.cos(r),t[0]=o[0]+n[0],t[1]=o[1]+n[1],t[2]=o[2]+n[2],t}function R(t,e,n,r){var i=[],o=[];return i[0]=e[0]-n[0],i[1]=e[1]-n[1],i[2]=e[2]-n[2],o[0]=i[2]*Math.sin(r)+i[0]*Math.cos(r),o[1]=i[1],o[2]=i[2]*Math.cos(r)-i[0]*Math.sin(r),t[0]=o[0]+n[0],t[1]=o[1]+n[1],t[2]=o[2]+n[2],t}function B(t,e,n,r){var i=[],o=[];return i[0]=e[0]-n[0],i[1]=e[1]-n[1],i[2]=e[2]-n[2],o[0]=i[0]*Math.cos(r)-i[1]*Math.sin(r),o[1]=i[0]*Math.sin(r)+i[1]*Math.cos(r),o[2]=i[2],t[0]=o[0]+n[0],t[1]=o[1]+n[1],t[2]=o[2]+n[2],t}function F(t,e){var n=t[0],r=t[1],i=t[2],o=e[0],a=e[1],s=e[2],u=Math.sqrt(n*n+r*r+i*i)*Math.sqrt(o*o+a*a+s*s),c=u&&k(t,e)/u;return Math.acos(Math.min(Math.max(c,-1),1))}function z(t){return t[0]=0,t[1]=0,t[2]=0,t}function G(t){return"vec3("+t[0]+", "+t[1]+", "+t[2]+")"}function Y(t,e){return t[0]===e[0]&&t[1]===e[1]&&t[2]===e[2]}function U(t,e){var n=t[0],i=t[1],o=t[2],a=e[0],s=e[1],u=e[2];return Math.abs(n-a)<=r.EPSILON*Math.max(1,Math.abs(n),Math.abs(a))&&Math.abs(i-s)<=r.EPSILON*Math.max(1,Math.abs(i),Math.abs(s))&&Math.abs(o-u)<=r.EPSILON*Math.max(1,Math.abs(o),Math.abs(u))}var X,W=f,V=h,H=d,q=w,Z=_,K=a,Q=E,$=(X=i(),function(t,e,n,r,i,o){var a,s;for(e||(e=3),n||(n=0),s=r?Math.min(r*e+n,t.length):t.length,a=n;aMath.abs(a)*c?(s<0&&(c=-c),n=c*a/s,r=c):(a<0&&(u=-u),n=u,r=u*s/a),{x:i+n,y:o+r}):{x:0,y:0}};e.buildLayerMatrix=function(t){for(var n=[],r=(0,e.maxRank)(t)+1,i=0;ie)&&(e=i)})),e||(e=0),e};e.partition=function(t,e){var n={lhs:[],rhs:[]};return null==t||t.forEach((function(t){e(t)?n.lhs.push(t):n.rhs.push(t)})),n};e.time=function(t,e){var n=Date.now();try{return e()}finally{console.log("".concat(t," time: ").concat(Date.now()-n,"ms"))}};e.notime=function(t,e){return e()};e.minBy=function(t,e){return t.reduce((function(t,n){return e(t)>e(n)?n:t}))}},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.uniqueId=e.getOutEdgesNodeId=e.getNeighbors=e.getEdgesByNodeId=void 0;e.getNeighbors=function(t,e,n){void 0===e&&(e=[]);var r=e.filter((function(e){return e.source===t||e.target===t}));if("target"===n){return r.filter((function(e){return e.source===t})).map((function(t){return t.target}))}if("source"===n){return r.filter((function(e){return e.target===t})).map((function(t){return t.source}))}return r.map((function(e){return e.source===t?e.target:e.source}))};e.getOutEdgesNodeId=function(t,e){return e.filter((function(e){return e.source===t}))};e.getEdgesByNodeId=function(t,e){return e.filter((function(e){return e.source===t||e.target===t}))};e.uniqueId=function(t){void 0===t&&(t=0);var e="".concat(Math.random()).split(".")[1].substr(0,5),n="".concat(Math.random()).split(".")[1].substr(0,5);return"".concat(t,"-").concat(e).concat(n)}},function(t,e,n){"use strict";n.r(e),n.d(e,"catmullRomToBezier",(function(){return u})),n.d(e,"fillPath",(function(){return j})),n.d(e,"fillPathByDiff",(function(){return N})),n.d(e,"formatPath",(function(){return L})),n.d(e,"intersection",(function(){return k})),n.d(e,"parsePathArray",(function(){return v})),n.d(e,"parsePathString",(function(){return s})),n.d(e,"pathToAbsolute",(function(){return l})),n.d(e,"pathToCurve",(function(){return p})),n.d(e,"rectPath",(function(){return _}));var r=n(0),i="\t\n\v\f\r 聽釟€釥庘€€鈥佲€傗€冣€勨€呪€嗏€団€堚€夆€娾€仧銆€\u2028\u2029",o=new RegExp("([a-z])["+i+",]*((-?\\d*\\.?\\d*(?:e[\\-+]?\\d+)?["+i+"]*,?["+i+"]*)+)","ig"),a=new RegExp("(-?\\d*\\.?\\d*(?:e[\\-+]?\\d+)?)["+i+"]*,?["+i+"]*","ig"),s=function(t){if(!t)return null;if(Object(r.isArray)(t))return t;var e={a:7,c:6,o:2,h:1,l:2,m:2,r:4,q:4,s:4,t:2,v:1,u:3,z:0},n=[];return String(t).replace(o,(function(r,i,o){var s=[],u=i.toLowerCase();if(o.replace(a,(function(t,e){e&&s.push(+e)})),"m"===u&&s.length>2&&(n.push([i].concat(s.splice(0,2))),u="l",i="m"===i?"l":"L"),"o"===u&&1===s.length&&n.push([i,s[0]]),"r"===u)n.push([i].concat(s));else for(;s.length>=e[u]&&(n.push([i].concat(s.splice(0,e[u]))),e[u]););return t})),n},u=function(t,e){for(var n=[],r=0,i=t.length;i-2*!e>r;r+=2){var o=[{x:+t[r-2],y:+t[r-1]},{x:+t[r],y:+t[r+1]},{x:+t[r+2],y:+t[r+3]},{x:+t[r+4],y:+t[r+5]}];e?r?i-4===r?o[3]={x:+t[0],y:+t[1]}:i-2===r&&(o[2]={x:+t[0],y:+t[1]},o[3]={x:+t[2],y:+t[3]}):o[0]={x:+t[i-2],y:+t[i-1]}:i-4===r?o[3]=o[2]:r||(o[0]={x:+t[r],y:+t[r+1]}),n.push(["C",(-o[0].x+6*o[1].x+o[2].x)/6,(-o[0].y+6*o[1].y+o[2].y)/6,(o[1].x+6*o[2].x-o[3].x)/6,(o[1].y+6*o[2].y-o[3].y)/6,o[2].x,o[2].y])}return n},c=function(t,e,n,r,i){var o=[];if(null===i&&null===r&&(r=n),t=+t,e=+e,n=+n,r=+r,null!==i){var a=Math.PI/180,s=t+n*Math.cos(-r*a),u=t+n*Math.cos(-i*a);o=[["M",s,e+n*Math.sin(-r*a)],["A",n,n,0,+(i-r>180),0,u,e+n*Math.sin(-i*a)]]}else o=[["M",t,e],["m",0,-r],["a",n,r,0,1,1,0,2*r],["a",n,r,0,1,1,0,-2*r],["z"]];return o},l=function(t){if(!(t=s(t))||!t.length)return[["M",0,0]];var e,n,r=[],i=0,o=0,a=0,l=0,f=0;"M"===t[0][0]&&(a=i=+t[0][1],l=o=+t[0][2],f++,r[0]=["M",i,o]);for(var h=3===t.length&&"M"===t[0][0]&&"R"===t[1][0].toUpperCase()&&"Z"===t[2][0].toUpperCase(),d=void 0,p=void 0,g=f,v=t.length;g1&&(r*=_=Math.sqrt(_),i*=_);var E=r*r,S=i*i,M=(a===s?-1:1)*Math.sqrt(Math.abs((E*S-E*w*w-S*x*x)/(E*w*w+S*x*x)));p=M*r*w/i+(e+u)/2,g=M*-i*x/r+(n+c)/2,h=Math.asin(((n-g)/i).toFixed(9)),d=Math.asin(((c-g)/i).toFixed(9)),h=ed&&(h-=2*Math.PI),!s&&d>h&&(d-=2*Math.PI)}var O=d-h;if(Math.abs(O)>v){var k=d,A=u,C=c;d=h+v*(s&&d>h?1:-1),m=t(u=p+r*Math.cos(d),c=g+i*Math.sin(d),r,i,o,0,s,A,C,[d,k,p,g])}O=d-h;var j=Math.cos(h),I=Math.sin(h),T=Math.cos(d),N=Math.sin(d),P=Math.tan(O/4),D=4/3*r*P,L=4/3*i*P,R=[e,n],B=[e+D*I,n-L*j],F=[u+D*N,c-L*T],z=[u,c];if(B[0]=2*R[0]-B[0],B[1]=2*R[1]-B[1],l)return[B,F,z].concat(m);for(var G=[],Y=0,U=(m=[B,F,z].concat(m).join().split(",")).length;Y7){t[e].shift();for(var o=t[e];o.length;)s[e]="A",i&&(u[e]="A"),t.splice(e++,0,["C"].concat(o.splice(0,6)));t.splice(e,1),n=Math.max(r.length,i&&i.length||0)}},y=function(t,e,o,a,s){t&&e&&"M"===t[s][0]&&"M"!==e[s][0]&&(e.splice(s,0,["M",a.x,a.y]),o.bx=0,o.by=0,o.x=t[s][1],o.y=t[s][2],n=Math.max(r.length,i&&i.length||0))};n=Math.max(r.length,i&&i.length||0);for(var m=0;m1?1:u<0?0:u)/2,l=[-.1252,.1252,-.3678,.3678,-.5873,.5873,-.7699,.7699,-.9041,.9041,-.9816,.9816],f=[.2491,.2491,.2335,.2335,.2032,.2032,.1601,.1601,.1069,.1069,.0472,.0472],h=0,d=0;d<12;d++){var p=c*l[d]+c,g=y(p,t,n,i,a),v=y(p,e,r,o,s),m=g*g+v*v;h+=f[d]*Math.sqrt(m)}return c*h},b=function(t,e,n,r,i,o,a,s){for(var u,c,l,f,h=[],d=[[],[]],p=0;p<2;++p)if(0===p?(c=6*t-12*n+6*i,u=-3*t+9*n-9*i+3*a,l=3*n-3*t):(c=6*e-12*r+6*o,u=-3*e+9*r-9*o+3*s,l=3*r-3*e),Math.abs(u)<1e-12){if(Math.abs(c)<1e-12)continue;(f=-l/c)>0&&f<1&&h.push(f)}else{var g=c*c-4*l*u,v=Math.sqrt(g);if(!(g<0)){var y=(-c+v)/(2*u);y>0&&y<1&&h.push(y);var m=(-c-v)/(2*u);m>0&&m<1&&h.push(m)}}for(var b,x=h.length,w=x;x--;)b=1-(f=h[x]),d[0][x]=b*b*b*t+3*b*b*f*n+3*b*f*f*i+f*f*f*a,d[1][x]=b*b*b*e+3*b*b*f*r+3*b*f*f*o+f*f*f*s;return d[0][w]=t,d[1][w]=e,d[0][w+1]=a,d[1][w+1]=s,d[0].length=d[1].length=w+2,{min:{x:Math.min.apply(0,d[0]),y:Math.min.apply(0,d[1])},max:{x:Math.max.apply(0,d[0]),y:Math.max.apply(0,d[1])}}},x=function(t,e,n,r,i,o,a,s){if(!(Math.max(t,n)Math.max(i,a)||Math.max(e,r)Math.max(o,s))){var u=(t-n)*(o-s)-(e-r)*(i-a);if(u){var c=((t*r-e*n)*(i-a)-(t-n)*(i*s-o*a))/u,l=((t*r-e*n)*(o-s)-(e-r)*(i*s-o*a))/u,f=+c.toFixed(2),h=+l.toFixed(2);if(!(f<+Math.min(t,n).toFixed(2)||f>+Math.max(t,n).toFixed(2)||f<+Math.min(i,a).toFixed(2)||f>+Math.max(i,a).toFixed(2)||h<+Math.min(e,r).toFixed(2)||h>+Math.max(e,r).toFixed(2)||h<+Math.min(o,s).toFixed(2)||h>+Math.max(o,s).toFixed(2)))return{x:c,y:l}}}},w=function(t,e,n){return e>=t.x&&e<=t.x+t.width&&n>=t.y&&n<=t.y+t.height},_=function(t,e,n,r,i){if(i)return[["M",+t+ +i,e],["l",n-2*i,0],["a",i,i,0,0,1,i,i],["l",0,r-2*i],["a",i,i,0,0,1,-i,i],["l",2*i-n,0],["a",i,i,0,0,1,-i,-i],["l",0,2*i-r],["a",i,i,0,0,1,i,-i],["z"]];var o=[["M",t,e],["l",n,0],["l",0,r],["l",-n,0],["z"]];return o.parsePathArray=v,o},E=function(t,e,n,r){return null===t&&(t=e=n=r=0),null===e&&(e=t.y,n=t.width,r=t.height,t=t.x),{x:t,y:e,width:n,w:n,height:r,h:r,x2:t+n,y2:e+r,cx:t+n/2,cy:e+r/2,r1:Math.min(n,r)/2,r2:Math.max(n,r)/2,r0:Math.sqrt(n*n+r*r)/2,path:_(t,e,n,r),vb:[t,e,n,r].join(" ")}},S=function(t,e,n,i,o,a,s,u){Object(r.isArray)(t)||(t=[t,e,n,i,o,a,s,u]);var c=b.apply(null,t);return E(c.min.x,c.min.y,c.max.x-c.min.x,c.max.y-c.min.y)},M=function(t,e,n,r,i,o,a,s,u){var c=1-u,l=Math.pow(c,3),f=Math.pow(c,2),h=u*u,d=h*u,p=t+2*u*(n-t)+h*(i-2*n+t),g=e+2*u*(r-e)+h*(o-2*r+e),v=n+2*u*(i-n)+h*(a-2*i+n),y=r+2*u*(o-r)+h*(s-2*o+r);return{x:l*t+3*f*u*n+3*c*u*u*i+d*a,y:l*e+3*f*u*r+3*c*u*u*o+d*s,m:{x:p,y:g},n:{x:v,y:y},start:{x:c*t+u*n,y:c*e+u*r},end:{x:c*i+u*a,y:c*o+u*s},alpha:90-180*Math.atan2(p-v,g-y)/Math.PI}},O=function(t,e,n){if(!function(t,e){return t=E(t),e=E(e),w(e,t.x,t.y)||w(e,t.x2,t.y)||w(e,t.x,t.y2)||w(e,t.x2,t.y2)||w(t,e.x,e.y)||w(t,e.x2,e.y)||w(t,e.x,e.y2)||w(t,e.x2,e.y2)||(t.xe.x||e.xt.x)&&(t.ye.y||e.yt.y)}(S(t),S(e)))return n?0:[];for(var r=~~(m.apply(0,t)/8),i=~~(m.apply(0,e)/8),o=[],a=[],s={},u=n?0:[],c=0;c=0&&_<=1&&O>=0&&O<=1&&(n?u+=1:u.push({x:b.x,y:b.y,t1:_,t2:O}))}}return u},k=function(t,e){return function(t,e,n){var r,i,o,a,s,u,c,l,f,h;t=p(t),e=p(e);for(var d=n?0:[],g=0,v=t.length;g=3&&(3===t.length&&e.push("Q"),e=e.concat(t[1])),2===t.length&&e.push("L"),e=e.concat(t[t.length-1])}))}(t,e,n));else{var i=[].concat(t);"M"===i[0]&&(i[0]="L");for(var o=0;o<=n-1;o++)r.push(i)}return r},j=function(t,e){if(1===t.length)return t;var n=t.length-1,r=e.length-1,i=n/r,o=[];if(1===t.length&&"M"===t[0][0]){for(var a=0;a=0;u--)a=o[u].index,"add"===o[u].type?t.splice(a,0,[].concat(t[a])):t.splice(a,1)}var f=i-(r=t.length);if(r0)){t[r]=e[r];break}n=P(n,t[r-1],1)}t[r]=["Q"].concat(n.reduce((function(t,e){return t.concat(e)}),[]));break;case"T":t[r]=["T"].concat(n[0]);break;case"C":if(n.length<3){if(!(r>0)){t[r]=e[r];break}n=P(n,t[r-1],2)}t[r]=["C"].concat(n.reduce((function(t,e){return t.concat(e)}),[]));break;case"S":if(n.length<2){if(!(r>0)){t[r]=e[r];break}n=P(n,t[r-1],1)}t[r]=["S"].concat(n.reduce((function(t,e){return t.concat(e)}),[]));break;default:t[r]=e[r]}return t}},function(t,e,n){"use strict";n.r(e),n.d(e,"Base",(function(){return c})),n.d(e,"Circle",(function(){return l})),n.d(e,"Ellipse",(function(){return h})),n.d(e,"Image",(function(){return p})),n.d(e,"Line",(function(){return m})),n.d(e,"Marker",(function(){return _})),n.d(e,"Path",(function(){return N})),n.d(e,"Polygon",(function(){return D})),n.d(e,"Polyline",(function(){return L})),n.d(e,"Rect",(function(){return B})),n.d(e,"Text",(function(){return F}));var r={};n.r(r),n.d(r,"Base",(function(){return c})),n.d(r,"Circle",(function(){return l})),n.d(r,"Ellipse",(function(){return h})),n.d(r,"Image",(function(){return p})),n.d(r,"Line",(function(){return m})),n.d(r,"Marker",(function(){return _})),n.d(r,"Path",(function(){return N})),n.d(r,"Polygon",(function(){return D})),n.d(r,"Polyline",(function(){return L})),n.d(r,"Rect",(function(){return B})),n.d(r,"Text",(function(){return F}));var i=n(1),o=n(11),a=n(5),s=n(16),u=n(36),c=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return Object(i.__extends)(e,t),e.prototype.getDefaultAttrs=function(){var e=t.prototype.getDefaultAttrs.call(this);return Object(i.__assign)(Object(i.__assign)({},e),{lineWidth:1,lineAppendWidth:0,strokeOpacity:1,fillOpacity:1})},e.prototype.getShapeBase=function(){return r},e.prototype.getGroupBase=function(){return u.a},e.prototype.onCanvasChange=function(t){Object(s.h)(this,t)},e.prototype.calculateBBox=function(){var t=this.get("type"),e=this.getHitLineWidth(),n=Object(o.getBBoxMethod)(t)(this),r=e/2,i=n.x-r,a=n.y-r,s=n.x+n.width+r,u=n.y+n.height+r;return{x:i,minX:i,y:a,minY:a,width:n.width+e,height:n.height+e,maxX:s,maxY:u}},e.prototype.isFill=function(){return!!this.attrs.fill||this.isClipShape()},e.prototype.isStroke=function(){return!!this.attrs.stroke},e.prototype._applyClip=function(t,e){e&&(t.save(),Object(s.a)(t,e),e.createPath(t),t.restore(),t.clip(),e._afterDraw())},e.prototype.draw=function(t,e){var n=this.cfg.clipShape;if(e){if(!1===this.cfg.refresh)return void this.set("hasChanged",!1);var r=this.getCanvasBBox();if(!Object(a.f)(e,r))return this.set("hasChanged",!1),void(this.cfg.isInView&&this._afterDraw())}t.save(),Object(s.a)(t,this),this._applyClip(t,n),this.drawPath(t),t.restore(),this._afterDraw()},e.prototype.getCanvasViewBox=function(){var t=this.cfg.canvas;return t?t.getViewRange():null},e.prototype.cacheCanvasBBox=function(){var t=this.getCanvasViewBox();if(t){var e=this.getCanvasBBox(),n=Object(a.f)(e,t);this.set("isInView",n),n?this.set("cacheCanvasBBox",e):this.set("cacheCanvasBBox",null)}},e.prototype._afterDraw=function(){this.cacheCanvasBBox(),this.set("hasChanged",!1),this.set("refresh",null)},e.prototype.skipDraw=function(){this.set("cacheCanvasBBox",null),this.set("isInView",null),this.set("hasChanged",!1)},e.prototype.drawPath=function(t){this.createPath(t),this.strokeAndFill(t),this.afterDrawPath(t)},e.prototype.fill=function(t){t.fill()},e.prototype.stroke=function(t){t.stroke()},e.prototype.strokeAndFill=function(t){var e=this.attrs,n=e.lineWidth,r=e.opacity,i=e.strokeOpacity,o=e.fillOpacity;this.isFill()&&(Object(a.i)(o)||1===o?this.fill(t):(t.globalAlpha=o,this.fill(t),t.globalAlpha=r)),this.isStroke()&&n>0&&(Object(a.i)(i)||1===i||(t.globalAlpha=i),this.stroke(t)),this.afterDrawPath(t)},e.prototype.createPath=function(t){},e.prototype.afterDrawPath=function(t){},e.prototype.isInShape=function(t,e){var n=this.isStroke(),r=this.isFill(),i=this.getHitLineWidth();return this.isInStrokeOrPath(t,e,n,r,i)},e.prototype.isInStrokeOrPath=function(t,e,n,r,i){return!1},e.prototype.getHitLineWidth=function(){if(!this.isStroke())return 0;var t=this.attrs;return t.lineWidth+t.lineAppendWidth},e}(o.AbstractShape),l=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return Object(i.__extends)(e,t),e.prototype.getDefaultAttrs=function(){var e=t.prototype.getDefaultAttrs.call(this);return Object(i.__assign)(Object(i.__assign)({},e),{x:0,y:0,r:0})},e.prototype.isInStrokeOrPath=function(t,e,n,r,i){var o=this.attr(),s=o.x,u=o.y,c=o.r,l=i/2,f=Object(a.b)(s,u,t,e);return r&&n?f<=c+l:r?f<=c:!!n&&(f>=c-l&&f<=c+l)},e.prototype.createPath=function(t){var e=this.attr(),n=e.x,r=e.y,i=e.r;t.beginPath(),t.arc(n,r,i,0,2*Math.PI,!1),t.closePath()},e}(c);function f(t,e,n,r){return t/(n*n)+e/(r*r)}var h=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return Object(i.__extends)(e,t),e.prototype.getDefaultAttrs=function(){var e=t.prototype.getDefaultAttrs.call(this);return Object(i.__assign)(Object(i.__assign)({},e),{x:0,y:0,rx:0,ry:0})},e.prototype.isInStrokeOrPath=function(t,e,n,r,i){var o=this.attr(),a=i/2,s=o.x,u=o.y,c=o.rx,l=o.ry,h=(t-s)*(t-s),d=(e-u)*(e-u);return r&&n?f(h,d,c+a,l+a)<=1:r?f(h,d,c,l)<=1:!!n&&(f(h,d,c-a,l-a)>=1&&f(h,d,c+a,l+a)<=1)},e.prototype.createPath=function(t){var e=this.attr(),n=e.x,r=e.y,i=e.rx,o=e.ry;if(t.beginPath(),t.ellipse)t.ellipse(n,r,i,o,0,0,2*Math.PI,!1);else{var a=i>o?i:o,s=i>o?1:i/o,u=i>o?o/i:1;t.save(),t.translate(n,r),t.scale(s,u),t.arc(0,0,a,0,2*Math.PI),t.restore(),t.closePath()}},e}(c);function d(t){return t instanceof HTMLElement&&Object(a.k)(t.nodeName)&&"CANVAS"===t.nodeName.toUpperCase()}var p=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return Object(i.__extends)(e,t),e.prototype.getDefaultAttrs=function(){var e=t.prototype.getDefaultAttrs.call(this);return Object(i.__assign)(Object(i.__assign)({},e),{x:0,y:0,width:0,height:0})},e.prototype.initAttrs=function(t){this._setImage(t.img)},e.prototype.isStroke=function(){return!1},e.prototype.isOnlyHitBox=function(){return!0},e.prototype._afterLoading=function(){if(!0===this.get("toDraw")){var t=this.get("canvas");t?t.draw():this.createPath(this.get("context"))}},e.prototype._setImage=function(t){var e=this,n=this.attrs;if(Object(a.k)(t)){var r=new Image;r.onload=function(){if(e.destroyed)return!1;e.attr("img",r),e.set("loading",!1),e._afterLoading();var t=e.get("callback");t&&t.call(e)},r.crossOrigin="Anonymous",r.src=t,this.set("loading",!0)}else t instanceof Image?(n.width||(n.width=t.width),n.height||(n.height=t.height)):d(t)&&(n.width||(n.width=Number(t.getAttribute("width"))),n.height||(n.height,Number(t.getAttribute("height"))))},e.prototype.onAttrChange=function(e,n,r){t.prototype.onAttrChange.call(this,e,n,r),"img"===e&&this._setImage(n)},e.prototype.createPath=function(t){if(this.get("loading"))return this.set("toDraw",!0),void this.set("context",t);var e=this.attr(),n=e.x,r=e.y,i=e.width,o=e.height,s=e.sx,u=e.sy,c=e.swidth,l=e.sheight,f=e.img;(f instanceof Image||d(f))&&(Object(a.i)(s)||Object(a.i)(u)||Object(a.i)(c)||Object(a.i)(l)?t.drawImage(f,n,r,i,o):t.drawImage(f,s,u,c,l,n,r,i,o))},e}(c),g=n(10);function v(t,e,n,r,i,o,a){var s=Math.min(t,n),u=Math.max(t,n),c=Math.min(e,r),l=Math.max(e,r),f=i/2;return o>=s-f&&o<=u+f&&a>=c-f&&a<=l+f&&g.c.pointToLine(t,e,n,r,o,a)<=i/2}var y=n(19),m=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return Object(i.__extends)(e,t),e.prototype.getDefaultAttrs=function(){var e=t.prototype.getDefaultAttrs.call(this);return Object(i.__assign)(Object(i.__assign)({},e),{x1:0,y1:0,x2:0,y2:0,startArrow:!1,endArrow:!1})},e.prototype.initAttrs=function(t){this.setArrow()},e.prototype.onAttrChange=function(e,n,r){t.prototype.onAttrChange.call(this,e,n,r),this.setArrow()},e.prototype.setArrow=function(){var t=this.attr(),e=t.x1,n=t.y1,r=t.x2,i=t.y2,o=t.startArrow,a=t.endArrow;o&&y.b(this,t,r,i,e,n),a&&y.a(this,t,e,n,r,i)},e.prototype.isInStrokeOrPath=function(t,e,n,r,i){if(!n||!i)return!1;var o=this.attr();return v(o.x1,o.y1,o.x2,o.y2,i,t,e)},e.prototype.createPath=function(t){var e=this.attr(),n=e.x1,r=e.y1,i=e.x2,o=e.y2,a=e.startArrow,s=e.endArrow,u={dx:0,dy:0},c={dx:0,dy:0};a&&a.d&&(u=y.c(n,r,i,o,e.startArrow.d)),s&&s.d&&(c=y.c(n,r,i,o,e.endArrow.d)),t.beginPath(),t.moveTo(n+u.dx,r+u.dy),t.lineTo(i-c.dx,o-c.dy)},e.prototype.afterDrawPath=function(t){var e=this.get("startArrowShape"),n=this.get("endArrowShape");e&&e.draw(t),n&&n.draw(t)},e.prototype.getTotalLength=function(){var t=this.attr(),e=t.x1,n=t.y1,r=t.x2,i=t.y2;return g.c.length(e,n,r,i)},e.prototype.getPoint=function(t){var e=this.attr(),n=e.x1,r=e.y1,i=e.x2,o=e.y2;return g.c.pointAt(n,r,i,o,t)},e}(c),b=n(0),x=n(21),w={circle:function(t,e,n){return[["M",t-n,e],["A",n,n,0,1,0,t+n,e],["A",n,n,0,1,0,t-n,e]]},square:function(t,e,n){return[["M",t-n,e-n],["L",t+n,e-n],["L",t+n,e+n],["L",t-n,e+n],["Z"]]},diamond:function(t,e,n){return[["M",t-n,e],["L",t,e-n],["L",t+n,e],["L",t,e+n],["Z"]]},triangle:function(t,e,n){var r=n*Math.sin(1/3*Math.PI);return[["M",t-n,e+r],["L",t,e-r],["L",t+n,e+r],["Z"]]},"triangle-down":function(t,e,n){var r=n*Math.sin(1/3*Math.PI);return[["M",t-n,e-r],["L",t+n,e-r],["L",t,e+r],["Z"]]}},_=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return Object(i.__extends)(e,t),e.prototype.initAttrs=function(t){this._resetParamsCache()},e.prototype._resetParamsCache=function(){this.set("paramsCache",{})},e.prototype.onAttrChange=function(e,n,r){t.prototype.onAttrChange.call(this,e,n,r),-1!==["symbol","x","y","r","radius"].indexOf(e)&&this._resetParamsCache()},e.prototype.isOnlyHitBox=function(){return!0},e.prototype._getR=function(t){return Object(b.isNil)(t.r)?t.radius:t.r},e.prototype._getPath=function(){var t,n,r=this.attr(),i=r.x,o=r.y,s=r.symbol||"circle",u=this._getR(r);if(Object(a.h)(s))n=(t=s)(i,o,u),n=Object(x.c)(n);else{if(!(t=e.Symbols[s]))return console.warn(s+" marker is not supported."),null;n=t(i,o,u)}return n},e.prototype.createPath=function(t){var e=this._getPath(),n=this.get("paramsCache");Object(s.e)(this,t,{path:e},n)},e.Symbols=w,e}(c);function E(t,e,n){var r=Object(o.getOffScreenContext)();return t.createPath(r),r.isPointInPath(e,n)}function S(t){return Math.abs(t)<1e-6?0:t<0?-1:1}function M(t,e,n){return(n[0]-t[0])*(e[1]-t[1])==(e[0]-t[0])*(n[1]-t[1])&&Math.min(t[0],e[0])<=n[0]&&n[0]<=Math.max(t[0],e[0])&&Math.min(t[1],e[1])<=n[1]&&n[1]<=Math.max(t[1],e[1])}function O(t,e,n){var r=!1,i=t.length;if(i<=2)return!1;for(var o=0;o0!=S(s[1]-n)>0&&S(e-(n-a[1])*(a[0]-s[0])/(a[1]-s[1])-a[0])<0&&(r=!r)}return r}var k=n(4),A=n(24);function C(t,e,n,r,i,o,s,u){var c=(Math.atan2(u-e,s-t)+2*Math.PI)%(2*Math.PI);if(ci)return!1;var l={x:t+n*Math.cos(c),y:e+n*Math.sin(c)};return Object(a.b)(l.x,l.y,s,u)<=o/2}var j=k.a.transform;var I=Object(i.__assign)({hasArc:function(t){for(var e=!1,n=t.length,r=0;r0&&r.push(i),{polygons:n,polylines:r}},isPointInStroke:function(t,e,n,r,i){for(var o=!1,s=e/2,u=0;ux?b:x,O=j(null,[["t",-y,-m],["r",-E],["s",1/(b>x?1:b/x),1/(b>x?x/b:1)]]);A.transformMat3(S,S,O),o=C(0,0,M,w,_,e,S[0],S[1])}if(o)break}}return o}},o.PathUtil);function T(t,e,n){for(var r=!1,i=0;i=r[0]&&t<=r[1]&&(e=(t-r[0])/(r[1]-r[0]),n=i)}));var o=i[n];if(Object(b.isNil)(o)||Object(b.isNil)(n))return null;var a=o.length,s=i[n+1];return g.b.pointAt(o[a-2],o[a-1],s[1],s[2],s[3],s[4],s[5],s[6],e)},e.prototype._calculateCurve=function(){var t=this.attr().path;this.set("curve",I.pathToCurve(t))},e.prototype._setTcache=function(){var t,e,n,r,i=0,o=0,a=[],s=this.get("curve");s&&(Object(b.each)(s,(function(t,e){n=s[e+1],r=t.length,n&&(i+=g.b.length(t[r-2],t[r-1],n[1],n[2],n[3],n[4],n[5],n[6])||0)})),this.set("totalLength",i),0!==i?(Object(b.each)(s,(function(u,c){n=s[c+1],r=u.length,n&&((t=[])[0]=o/i,e=g.b.length(u[r-2],u[r-1],n[1],n[2],n[3],n[4],n[5],n[6]),o+=e||0,t[1]=o/i,a.push(t))})),this.set("tCache",a)):this.set("tCache",[]))},e.prototype.getStartTangent=function(){var t,e=this.getSegments();if(e.length>1){var n=e[0].currentPoint,r=e[1].currentPoint,i=e[1].startTangent;t=[],i?(t.push([n[0]-i[0],n[1]-i[1]]),t.push([n[0],n[1]])):(t.push([r[0],r[1]]),t.push([n[0],n[1]]))}return t},e.prototype.getEndTangent=function(){var t,e=this.getSegments(),n=e.length;if(n>1){var r=e[n-2].currentPoint,i=e[n-1].currentPoint,o=e[n-1].endTangent;t=[],o?(t.push([i[0]-o[0],i[1]-o[1]]),t.push([i[0],i[1]])):(t.push([r[0],r[1]]),t.push([i[0],i[1]]))}return t},e}(c);function P(t,e,n,r,i){var o=t.length;if(o<2)return!1;for(var a=0;a=r[0]&&t<=r[1]&&(e=(t-r[0])/(r[1]-r[0]),n=i)})),g.c.pointAt(r[n][0],r[n][1],r[n+1][0],r[n+1][1],e)},e.prototype._setTcache=function(){var t=this.attr().points;if(t&&0!==t.length){var e=this.getTotalLength();if(!(e<=0)){var n,r,i=0,o=[];Object(b.each)(t,(function(a,s){t[s+1]&&((n=[])[0]=i/e,r=g.c.length(a[0],a[1],t[s+1][0],t[s+1][1]),i+=r,n[1]=i/e,o.push(n))})),this.set("tCache",o)}}},e.prototype.getStartTangent=function(){var t=this.attr().points,e=[];return e.push([t[1][0],t[1][1]]),e.push([t[0][0],t[0][1]]),e},e.prototype.getEndTangent=function(){var t=this.attr().points,e=t.length-1,n=[];return n.push([t[e-1][0],t[e-1][1]]),n.push([t[e][0],t[e][1]]),n},e}(c),R=n(56);var B=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return Object(i.__extends)(e,t),e.prototype.getDefaultAttrs=function(){var e=t.prototype.getDefaultAttrs.call(this);return Object(i.__assign)(Object(i.__assign)({},e),{x:0,y:0,width:0,height:0,radius:0})},e.prototype.isInStrokeOrPath=function(t,e,n,r,i){var o=this.attr(),s=o.x,u=o.y,c=o.width,l=o.height,f=o.radius;if(f){var h=!1;return n&&(h=function(t,e,n,r,i,o,a,s){return v(t+i,e,t+n-i,e,o,a,s)||v(t+n,e+i,t+n,e+r-i,o,a,s)||v(t+n-i,e+r,t+i,e+r,o,a,s)||v(t,e+r-i,t,e+i,o,a,s)||C(t+n-i,e+i,i,1.5*Math.PI,2*Math.PI,o,a,s)||C(t+n-i,e+r-i,i,0,.5*Math.PI,o,a,s)||C(t+i,e+r-i,i,.5*Math.PI,Math.PI,o,a,s)||C(t+i,e+i,i,Math.PI,1.5*Math.PI,o,a,s)}(s,u,c,l,f,i,t,e)),!h&&r&&(h=E(this,t,e)),h}var d=i/2;return r&&n?Object(a.e)(s-d,u-d,c+d,l+d,t,e):r?Object(a.e)(s,u,c,l,t,e):n?function(t,e,n,r,i,o,s){var u=i/2;return Object(a.e)(t-u,e-u,n,i,o,s)||Object(a.e)(t+n-u,e-u,i,r,o,s)||Object(a.e)(t+u,e+r-u,n,i,o,s)||Object(a.e)(t-u,e+u,i,r,o,s)}(s,u,c,l,i,t,e):void 0},e.prototype.createPath=function(t){var e=this.attr(),n=e.x,r=e.y,i=e.width,o=e.height,a=e.radius;if(t.beginPath(),0===a)t.rect(n,r,i,o);else{var s=Object(R.a)(a),u=s[0],c=s[1],l=s[2],f=s[3];t.moveTo(n+u,r),t.lineTo(n+i-c,r),0!==c&&t.arc(n+i-c,r+c,c,-Math.PI/2,0),t.lineTo(n+i,r+o-l),0!==l&&t.arc(n+i-l,r+o-l,l,0,Math.PI/2),t.lineTo(n+f,r+o),0!==f&&t.arc(n+f,r+o-f,f,Math.PI/2,Math.PI),t.lineTo(n,r+u),0!==u&&t.arc(n+u,r+u,u,Math.PI,1.5*Math.PI),t.closePath()}},e}(c),F=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return Object(i.__extends)(e,t),e.prototype.getDefaultAttrs=function(){var e=t.prototype.getDefaultAttrs.call(this);return Object(i.__assign)(Object(i.__assign)({},e),{x:0,y:0,text:null,fontSize:12,fontFamily:"sans-serif",fontStyle:"normal",fontWeight:"normal",fontVariant:"normal",textAlign:"start",textBaseline:"bottom"})},e.prototype.isOnlyHitBox=function(){return!0},e.prototype.initAttrs=function(t){this._assembleFont(),t.text&&this._setText(t.text)},e.prototype._assembleFont=function(){var t=this.attrs;t.font=Object(o.assembleFont)(t)},e.prototype._setText=function(t){var e=null;Object(a.k)(t)&&-1!==t.indexOf("\n")&&(e=t.split("\n")),this.set("textArr",e)},e.prototype.onAttrChange=function(e,n,r){t.prototype.onAttrChange.call(this,e,n,r),e.startsWith("font")&&this._assembleFont(),"text"===e&&this._setText(n)},e.prototype._getSpaceingY=function(){var t=this.attrs,e=t.lineHeight,n=1*t.fontSize;return e?e-n:.14*n},e.prototype._drawTextArr=function(t,e,n){var r,i=this.attrs,s=i.textBaseline,u=i.x,c=i.y,l=1*i.fontSize,f=this._getSpaceingY(),h=Object(o.getTextHeight)(i.text,i.fontSize,i.lineHeight);Object(a.c)(e,(function(e,i){r=c+i*(f+l)-h+l,"middle"===s&&(r+=h-l-(h-l)/2),"top"===s&&(r+=h-l),Object(a.i)(e)||(n?t.fillText(e,u,r):t.strokeText(e,u,r))}))},e.prototype._drawText=function(t,e){var n=this.attr(),r=n.x,i=n.y,o=this.get("textArr");if(o)this._drawTextArr(t,o,e);else{var s=n.text;Object(a.i)(s)||(e?t.fillText(s,r,i):t.strokeText(s,r,i))}},e.prototype.strokeAndFill=function(t){var e=this.attrs,n=e.lineWidth,r=e.opacity,i=e.strokeOpacity,o=e.fillOpacity;this.isStroke()&&n>0&&(Object(a.i)(i)||1===i||(t.globalAlpha=r),this.stroke(t)),this.isFill()&&(Object(a.i)(o)||1===o?this.fill(t):(t.globalAlpha=o,this.fill(t),t.globalAlpha=r)),this.afterDrawPath(t)},e.prototype.fill=function(t){this._drawText(t,!0)},e.prototype.stroke=function(t){this._drawText(t,!1)},e}(c)},function(t,e){var n=[],r=[];function i(t,e){if(e=e||{},void 0===t)throw new Error("insert-css: You need to provide a CSS string. Usage: insertCss(cssString[, options]).");var i,o=!0===e.prepend?"prepend":"append",a=void 0!==e.container?e.container:document.querySelector("head"),s=n.indexOf(a);return-1===s&&(s=n.push(a)-1,r[s]={}),void 0!==r[s]&&void 0!==r[s][o]?i=r[s][o]:(i=r[s][o]=function(){var t=document.createElement("style");return t.setAttribute("type","text/css"),t}(),"prepend"===o?a.insertBefore(i,a.childNodes[0]):a.appendChild(i)),65279===t.charCodeAt(0)&&(t=t.substr(1,t.length)),i.styleSheet?i.styleSheet.cssText+=t:i.textContent+=t,i}t.exports=i,t.exports.insertCss=i},function(t,e,n){"use strict";n(38),n(11);var r=n(113);n.d(e,"Canvas",(function(){return r.a}));n(37)},function(t,e,n){"use strict";n.d(e,"b",(function(){return o})),n.d(e,"c",(function(){return a})),n.d(e,"a",(function(){return s}));var r=n(9),i=n(50);function o(t,e,n){var i=1;return Object(r.h)(t)&&(i=t.split("\n").length),i>1?e*i+function(t,e){return e?e-t:.14*t}(e,n)*(i-1):e}function a(t,e){var n=Object(i.a)(),o=0;if(Object(r.e)(t)||""===t)return o;if(n.save(),n.font=e,Object(r.h)(t)&&t.includes("\n")){var a=t.split("\n");Object(r.a)(a,(function(t){var e=n.measureText(t).width;o0&&(e?"stroke"in n?this._setColor(t,"stroke",o):"strokeStyle"in n&&this._setColor(t,"stroke",a):this._setColor(t,"stroke",o||a),u&&f.setAttribute(c.b.strokeOpacity,u),l&&f.setAttribute(c.b.lineWidth,l))},e.prototype._setColor=function(t,e,n){var r=this.get("el");if(n)if(n=n.trim(),/^[r,R,L,l]{1}[\s]*\(/.test(n))(i=t.find("gradient",n))||(i=t.addGradient(n)),r.setAttribute(c.b[e],"url(#"+i+")");else if(/^[p,P]{1}[\s]*\(/.test(n)){var i;(i=t.find("pattern",n))||(i=t.addPattern(n)),r.setAttribute(c.b[e],"url(#"+i+")")}else r.setAttribute(c.b[e],n);else r.setAttribute(c.b[e],"none")},e.prototype.shadow=function(t,e){var n=this.attr(),r=e||n,i=r.shadowOffsetX,o=r.shadowOffsetY,s=r.shadowBlur,u=r.shadowColor;(i||o||s||u)&&Object(a.b)(this,t)},e.prototype.transform=function(t){var e=this.attr();(t||e).matrix&&Object(a.c)(this)},e.prototype.isInShape=function(t,e){return this.isPointInPath(t,e)},e.prototype.isPointInPath=function(t,e){var n=this.get("el"),r=this.get("canvas").get("el").getBoundingClientRect(),i=t+r.left,o=e+r.top,a=document.elementFromPoint(i,o);return!(!a||!a.isEqualNode(n))},e.prototype.getHitLineWidth=function(){var t=this.attrs,e=t.lineWidth,n=t.lineAppendWidth;return this.isStroke()?e+n:0},e}(o.AbstractShape),h=n(0),d=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e.type="circle",e.canFill=!0,e.canStroke=!0,e}return Object(i.__extends)(e,t),e.prototype.getDefaultAttrs=function(){var e=t.prototype.getDefaultAttrs.call(this);return Object(i.__assign)(Object(i.__assign)({},e),{x:0,y:0,r:0})},e.prototype.createPath=function(t,e){var n=this.attr(),r=this.get("el");Object(h.each)(e||n,(function(t,e){"x"===e||"y"===e?r.setAttribute("c"+e,t):c.b[e]&&r.setAttribute(c.b[e],t)}))},e}(f),p=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e.type="dom",e.canFill=!1,e.canStroke=!1,e}return Object(i.__extends)(e,t),e.prototype.createPath=function(t,e){var n=this.attr(),r=this.get("el");if(Object(h.each)(e||n,(function(t,e){c.b[e]&&r.setAttribute(c.b[e],t)})),"function"==typeof n.html){var i=n.html.call(this,n);if(i instanceof Element||i instanceof HTMLDocument){for(var o=r.childNodes,a=o.length-1;a>=0;a--)r.removeChild(o[a]);r.appendChild(i)}else r.innerHTML=i}else r.innerHTML=n.html},e}(f),g=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e.type="ellipse",e.canFill=!0,e.canStroke=!0,e}return Object(i.__extends)(e,t),e.prototype.getDefaultAttrs=function(){var e=t.prototype.getDefaultAttrs.call(this);return Object(i.__assign)(Object(i.__assign)({},e),{x:0,y:0,rx:0,ry:0})},e.prototype.createPath=function(t,e){var n=this.attr(),r=this.get("el");Object(h.each)(e||n,(function(t,e){"x"===e||"y"===e?r.setAttribute("c"+e,t):c.b[e]&&r.setAttribute(c.b[e],t)}))},e}(f),v=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e.type="image",e.canFill=!1,e.canStroke=!1,e}return Object(i.__extends)(e,t),e.prototype.getDefaultAttrs=function(){var e=t.prototype.getDefaultAttrs.call(this);return Object(i.__assign)(Object(i.__assign)({},e),{x:0,y:0,width:0,height:0})},e.prototype.createPath=function(t,e){var n=this,r=this.attr(),i=this.get("el");Object(h.each)(e||r,(function(t,e){"img"===e?n._setImage(r.img):c.b[e]&&i.setAttribute(c.b[e],t)}))},e.prototype.setAttr=function(t,e){this.attrs[t]=e,"img"===t&&this._setImage(e)},e.prototype._setImage=function(t){var e=this.attr(),n=this.get("el");if(Object(h.isString)(t))n.setAttribute("href",t);else if(t instanceof window.Image)e.width||(n.setAttribute("width",t.width),this.attr("width",t.width)),e.height||(n.setAttribute("height",t.height),this.attr("height",t.height)),n.setAttribute("href",t.src);else if(t instanceof HTMLElement&&Object(h.isString)(t.nodeName)&&"CANVAS"===t.nodeName.toUpperCase())n.setAttribute("href",t.toDataURL());else if(t instanceof ImageData){var r=document.createElement("canvas");r.setAttribute("width",""+t.width),r.setAttribute("height",""+t.height),r.getContext("2d").putImageData(t,0,0),e.width||(n.setAttribute("width",""+t.width),this.attr("width",t.width)),e.height||(n.setAttribute("height",""+t.height),this.attr("height",t.height)),n.setAttribute("href",r.toDataURL())}},e}(f),y=n(10),m=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e.type="line",e.canFill=!1,e.canStroke=!0,e}return Object(i.__extends)(e,t),e.prototype.getDefaultAttrs=function(){var e=t.prototype.getDefaultAttrs.call(this);return Object(i.__assign)(Object(i.__assign)({},e),{x1:0,y1:0,x2:0,y2:0,startArrow:!1,endArrow:!1})},e.prototype.createPath=function(t,e){var n=this.attr(),r=this.get("el");Object(h.each)(e||n,(function(e,i){if("startArrow"===i||"endArrow"===i)if(e){var o=Object(h.isObject)(e)?t.addArrow(n,c.b[i]):t.getDefaultArrow(n,c.b[i]);r.setAttribute(c.b[i],"url(#"+o+")")}else r.removeAttribute(c.b[i]);else c.b[i]&&r.setAttribute(c.b[i],e)}))},e.prototype.getTotalLength=function(){var t=this.attr(),e=t.x1,n=t.y1,r=t.x2,i=t.y2;return y.c.length(e,n,r,i)},e.prototype.getPoint=function(t){var e=this.attr(),n=e.x1,r=e.y1,i=e.x2,o=e.y2;return y.c.pointAt(n,r,i,o,t)},e}(f),b={circle:function(t,e,n){return[["M",t,e],["m",-n,0],["a",n,n,0,1,0,2*n,0],["a",n,n,0,1,0,2*-n,0]]},square:function(t,e,n){return[["M",t-n,e-n],["L",t+n,e-n],["L",t+n,e+n],["L",t-n,e+n],["Z"]]},diamond:function(t,e,n){return[["M",t-n,e],["L",t,e-n],["L",t+n,e],["L",t,e+n],["Z"]]},triangle:function(t,e,n){var r=n*Math.sin(1/3*Math.PI);return[["M",t-n,e+r],["L",t,e-r],["L",t+n,e+r],["z"]]},triangleDown:function(t,e,n){var r=n*Math.sin(1/3*Math.PI);return[["M",t-n,e-r],["L",t+n,e-r],["L",t,e+r],["Z"]]}},x={get:function(t){return b[t]},register:function(t,e){b[t]=e},remove:function(t){delete b[t]},getAll:function(){return b}},w=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e.type="marker",e.canFill=!0,e.canStroke=!0,e}return Object(i.__extends)(e,t),e.prototype.createPath=function(t){this.get("el").setAttribute("d",this._assembleMarker())},e.prototype._assembleMarker=function(){var t=this._getPath();return Object(h.isArray)(t)?t.map((function(t){return t.join(" ")})).join(""):t},e.prototype._getPath=function(){var t,e=this.attr(),n=e.x,r=e.y,i=e.r||e.radius,o=e.symbol||"circle";return(t=Object(h.isFunction)(o)?o:x.get(o))?t(n,r,i):(console.warn(t+" symbol is not exist."),null)},e.symbolsFactory=x,e}(f),_=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e.type="path",e.canFill=!0,e.canStroke=!0,e}return Object(i.__extends)(e,t),e.prototype.getDefaultAttrs=function(){var e=t.prototype.getDefaultAttrs.call(this);return Object(i.__assign)(Object(i.__assign)({},e),{startArrow:!1,endArrow:!1})},e.prototype.createPath=function(t,e){var n=this,r=this.attr(),i=this.get("el");Object(h.each)(e||r,(function(e,o){if("path"===o&&Object(h.isArray)(e))i.setAttribute("d",n._formatPath(e));else if("startArrow"===o||"endArrow"===o)if(e){var a=Object(h.isObject)(e)?t.addArrow(r,c.b[o]):t.getDefaultArrow(r,c.b[o]);i.setAttribute(c.b[o],"url(#"+a+")")}else i.removeAttribute(c.b[o]);else c.b[o]&&i.setAttribute(c.b[o],e)}))},e.prototype._formatPath=function(t){var e=t.map((function(t){return t.join(" ")})).join("");return~e.indexOf("NaN")?"":e},e.prototype.getTotalLength=function(){var t=this.get("el");return t?t.getTotalLength():null},e.prototype.getPoint=function(t){var e=this.get("el"),n=this.getTotalLength();if(0===n)return null;var r=e?e.getPointAtLength(t*n):null;return r?{x:r.x,y:r.y}:null},e}(f),E=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e.type="polygon",e.canFill=!0,e.canStroke=!0,e}return Object(i.__extends)(e,t),e.prototype.createPath=function(t,e){var n=this.attr(),r=this.get("el");Object(h.each)(e||n,(function(t,e){"points"===e&&Object(h.isArray)(t)&&t.length>=2?r.setAttribute("points",t.map((function(t){return t[0]+","+t[1]})).join(" ")):c.b[e]&&r.setAttribute(c.b[e],t)}))},e}(f),S=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e.type="polyline",e.canFill=!0,e.canStroke=!0,e}return Object(i.__extends)(e,t),e.prototype.getDefaultAttrs=function(){var e=t.prototype.getDefaultAttrs.call(this);return Object(i.__assign)(Object(i.__assign)({},e),{startArrow:!1,endArrow:!1})},e.prototype.onAttrChange=function(e,n,r){t.prototype.onAttrChange.call(this,e,n,r),-1!==["points"].indexOf(e)&&this._resetCache()},e.prototype._resetCache=function(){this.set("totalLength",null),this.set("tCache",null)},e.prototype.createPath=function(t,e){var n=this.attr(),r=this.get("el");Object(h.each)(e||n,(function(t,e){"points"===e&&Object(h.isArray)(t)&&t.length>=2?r.setAttribute("points",t.map((function(t){return t[0]+","+t[1]})).join(" ")):c.b[e]&&r.setAttribute(c.b[e],t)}))},e.prototype.getTotalLength=function(){var t=this.attr().points,e=this.get("totalLength");return Object(h.isNil)(e)?(this.set("totalLength",y.d.length(t)),this.get("totalLength")):e},e.prototype.getPoint=function(t){var e,n,r=this.attr().points,i=this.get("tCache");return i||(this._setTcache(),i=this.get("tCache")),Object(h.each)(i,(function(r,i){t>=r[0]&&t<=r[1]&&(e=(t-r[0])/(r[1]-r[0]),n=i)})),y.c.pointAt(r[n][0],r[n][1],r[n+1][0],r[n+1][1],e)},e.prototype._setTcache=function(){var t=this.attr().points;if(t&&0!==t.length){var e=this.getTotalLength();if(!(e<=0)){var n,r,i=0,o=[];Object(h.each)(t,(function(a,s){t[s+1]&&((n=[])[0]=i/e,r=y.c.length(a[0],a[1],t[s+1][0],t[s+1][1]),i+=r,n[1]=i/e,o.push(n))})),this.set("tCache",o)}}},e.prototype.getStartTangent=function(){var t=this.attr().points,e=[];return e.push([t[1][0],t[1][1]]),e.push([t[0][0],t[0][1]]),e},e.prototype.getEndTangent=function(){var t=this.attr().points,e=t.length-1,n=[];return n.push([t[e-1][0],t[e-1][1]]),n.push([t[e][0],t[e][1]]),n},e}(f);var M=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e.type="rect",e.canFill=!0,e.canStroke=!0,e}return Object(i.__extends)(e,t),e.prototype.getDefaultAttrs=function(){var e=t.prototype.getDefaultAttrs.call(this);return Object(i.__assign)(Object(i.__assign)({},e),{x:0,y:0,width:0,height:0,radius:0})},e.prototype.createPath=function(t,e){var n=this,r=this.attr(),i=this.get("el"),o=!1,a=["x","y","width","height","radius"];Object(h.each)(e||r,(function(t,e){-1===a.indexOf(e)||o?-1===a.indexOf(e)&&c.b[e]&&i.setAttribute(c.b[e],t):(i.setAttribute("d",n._assembleRect(r)),o=!0)}))},e.prototype._assembleRect=function(t){var e=t.x,n=t.y,r=t.width,i=t.height,o=t.radius;if(!o)return"M "+e+","+n+" l "+r+",0 l 0,"+i+" l"+-r+" 0 z";var a=function(t){var e=0,n=0,r=0,i=0;return Object(h.isArray)(t)?1===t.length?e=n=r=i=t[0]:2===t.length?(e=r=t[0],n=i=t[1]):3===t.length?(e=t[0],n=i=t[1],r=t[2]):(e=t[0],n=t[1],r=t[2],i=t[3]):e=n=r=i=t,{r1:e,r2:n,r3:r,r4:i}}(o);return Object(h.isArray)(o)?1===o.length?a.r1=a.r2=a.r3=a.r4=o[0]:2===o.length?(a.r1=a.r3=o[0],a.r2=a.r4=o[1]):3===o.length?(a.r1=o[0],a.r2=a.r4=o[1],a.r3=o[2]):(a.r1=o[0],a.r2=o[1],a.r3=o[2],a.r4=o[3]):a.r1=a.r2=a.r3=a.r4=o,[["M "+(e+a.r1)+","+n],["l "+(r-a.r1-a.r2)+",0"],["a "+a.r2+","+a.r2+",0,0,1,"+a.r2+","+a.r2],["l 0,"+(i-a.r2-a.r3)],["a "+a.r3+","+a.r3+",0,0,1,"+-a.r3+","+a.r3],["l "+(a.r3+a.r4-r)+",0"],["a "+a.r4+","+a.r4+",0,0,1,"+-a.r4+","+-a.r4],["l 0,"+(a.r4+a.r1-i)],["a "+a.r1+","+a.r1+",0,0,1,"+a.r1+","+-a.r1],["z"]].join(" ")},e}(f),O=n(55),k={top:"before-edge",middle:"central",bottom:"after-edge",alphabetic:"baseline",hanging:"hanging"},A={top:"text-before-edge",middle:"central",bottom:"text-after-edge",alphabetic:"alphabetic",hanging:"hanging"},C={left:"left",start:"left",center:"middle",right:"end",end:"end"},j=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e.type="text",e.canFill=!0,e.canStroke=!0,e}return Object(i.__extends)(e,t),e.prototype.getDefaultAttrs=function(){var e=t.prototype.getDefaultAttrs.call(this);return Object(i.__assign)(Object(i.__assign)({},e),{x:0,y:0,text:null,fontSize:12,fontFamily:"sans-serif",fontStyle:"normal",fontWeight:"normal",fontVariant:"normal",textAlign:"start",textBaseline:"bottom"})},e.prototype.createPath=function(t,e){var n=this,r=this.attr(),i=this.get("el");this._setFont(),Object(h.each)(e||r,(function(t,e){"text"===e?n._setText(""+t):"matrix"===e&&t?Object(a.c)(n):c.b[e]&&i.setAttribute(c.b[e],t)})),i.setAttribute("paint-order","stroke"),i.setAttribute("style","stroke-linecap:butt; stroke-linejoin:miter;")},e.prototype._setFont=function(){var t=this.get("el"),e=this.attr(),n=e.textBaseline,r=e.textAlign,i=Object(O.a)();i&&"firefox"===i.name?t.setAttribute("dominant-baseline",A[n]||"alphabetic"):t.setAttribute("alignment-baseline",k[n]||"baseline"),t.setAttribute("text-anchor",C[r]||"left")},e.prototype._setText=function(t){var e=this.get("el"),n=this.attr(),r=n.x,i=n.textBaseline,o=void 0===i?"bottom":i;if(t)if(~t.indexOf("\n")){var a=t.split("\n"),s=a.length-1,u="";Object(h.each)(a,(function(t,e){0===e?"alphabetic"===o?u+=''+t+"":"top"===o?u+=''+t+"":"middle"===o?u+=''+t+"":"bottom"===o?u+=''+t+"":"hanging"===o&&(u+=''+t+""):u+=''+t+""})),e.innerHTML=u}else e.innerHTML=t;else e.innerHTML=""},e}(f)},function(t,e,n){"use strict";n.r(e),n.d(e,"create",(function(){return i})),n.d(e,"clone",(function(){return o})),n.d(e,"fromValues",(function(){return a})),n.d(e,"copy",(function(){return s})),n.d(e,"set",(function(){return u})),n.d(e,"add",(function(){return c})),n.d(e,"subtract",(function(){return l})),n.d(e,"multiply",(function(){return f})),n.d(e,"divide",(function(){return h})),n.d(e,"ceil",(function(){return d})),n.d(e,"floor",(function(){return p})),n.d(e,"min",(function(){return g})),n.d(e,"max",(function(){return v})),n.d(e,"round",(function(){return y})),n.d(e,"scale",(function(){return m})),n.d(e,"scaleAndAdd",(function(){return b})),n.d(e,"distance",(function(){return x})),n.d(e,"squaredDistance",(function(){return w})),n.d(e,"length",(function(){return _})),n.d(e,"squaredLength",(function(){return E})),n.d(e,"negate",(function(){return S})),n.d(e,"inverse",(function(){return M})),n.d(e,"normalize",(function(){return O})),n.d(e,"dot",(function(){return k})),n.d(e,"cross",(function(){return A})),n.d(e,"lerp",(function(){return C})),n.d(e,"random",(function(){return j})),n.d(e,"transformMat2",(function(){return I})),n.d(e,"transformMat2d",(function(){return T})),n.d(e,"transformMat3",(function(){return N})),n.d(e,"transformMat4",(function(){return P})),n.d(e,"rotate",(function(){return D})),n.d(e,"angle",(function(){return L})),n.d(e,"zero",(function(){return R})),n.d(e,"str",(function(){return B})),n.d(e,"exactEquals",(function(){return F})),n.d(e,"equals",(function(){return z})),n.d(e,"len",(function(){return Y})),n.d(e,"sub",(function(){return U})),n.d(e,"mul",(function(){return X})),n.d(e,"div",(function(){return W})),n.d(e,"dist",(function(){return V})),n.d(e,"sqrDist",(function(){return H})),n.d(e,"sqrLen",(function(){return q})),n.d(e,"forEach",(function(){return Z}));var r=n(2);function i(){var t=new r.ARRAY_TYPE(2);return r.ARRAY_TYPE!=Float32Array&&(t[0]=0,t[1]=0),t}function o(t){var e=new r.ARRAY_TYPE(2);return e[0]=t[0],e[1]=t[1],e}function a(t,e){var n=new r.ARRAY_TYPE(2);return n[0]=t,n[1]=e,n}function s(t,e){return t[0]=e[0],t[1]=e[1],t}function u(t,e,n){return t[0]=e,t[1]=n,t}function c(t,e,n){return t[0]=e[0]+n[0],t[1]=e[1]+n[1],t}function l(t,e,n){return t[0]=e[0]-n[0],t[1]=e[1]-n[1],t}function f(t,e,n){return t[0]=e[0]*n[0],t[1]=e[1]*n[1],t}function h(t,e,n){return t[0]=e[0]/n[0],t[1]=e[1]/n[1],t}function d(t,e){return t[0]=Math.ceil(e[0]),t[1]=Math.ceil(e[1]),t}function p(t,e){return t[0]=Math.floor(e[0]),t[1]=Math.floor(e[1]),t}function g(t,e,n){return t[0]=Math.min(e[0],n[0]),t[1]=Math.min(e[1],n[1]),t}function v(t,e,n){return t[0]=Math.max(e[0],n[0]),t[1]=Math.max(e[1],n[1]),t}function y(t,e){return t[0]=Math.round(e[0]),t[1]=Math.round(e[1]),t}function m(t,e,n){return t[0]=e[0]*n,t[1]=e[1]*n,t}function b(t,e,n,r){return t[0]=e[0]+n[0]*r,t[1]=e[1]+n[1]*r,t}function x(t,e){var n=e[0]-t[0],r=e[1]-t[1];return Math.hypot(n,r)}function w(t,e){var n=e[0]-t[0],r=e[1]-t[1];return n*n+r*r}function _(t){var e=t[0],n=t[1];return Math.hypot(e,n)}function E(t){var e=t[0],n=t[1];return e*e+n*n}function S(t,e){return t[0]=-e[0],t[1]=-e[1],t}function M(t,e){return t[0]=1/e[0],t[1]=1/e[1],t}function O(t,e){var n=e[0],r=e[1],i=n*n+r*r;return i>0&&(i=1/Math.sqrt(i)),t[0]=e[0]*i,t[1]=e[1]*i,t}function k(t,e){return t[0]*e[0]+t[1]*e[1]}function A(t,e,n){var r=e[0]*n[1]-e[1]*n[0];return t[0]=t[1]=0,t[2]=r,t}function C(t,e,n,r){var i=e[0],o=e[1];return t[0]=i+r*(n[0]-i),t[1]=o+r*(n[1]-o),t}function j(t,e){e=e||1;var n=2*r.RANDOM()*Math.PI;return t[0]=Math.cos(n)*e,t[1]=Math.sin(n)*e,t}function I(t,e,n){var r=e[0],i=e[1];return t[0]=n[0]*r+n[2]*i,t[1]=n[1]*r+n[3]*i,t}function T(t,e,n){var r=e[0],i=e[1];return t[0]=n[0]*r+n[2]*i+n[4],t[1]=n[1]*r+n[3]*i+n[5],t}function N(t,e,n){var r=e[0],i=e[1];return t[0]=n[0]*r+n[3]*i+n[6],t[1]=n[1]*r+n[4]*i+n[7],t}function P(t,e,n){var r=e[0],i=e[1];return t[0]=n[0]*r+n[4]*i+n[12],t[1]=n[1]*r+n[5]*i+n[13],t}function D(t,e,n,r){var i=e[0]-n[0],o=e[1]-n[1],a=Math.sin(r),s=Math.cos(r);return t[0]=i*s-o*a+n[0],t[1]=i*a+o*s+n[1],t}function L(t,e){var n=t[0],r=t[1],i=e[0],o=e[1],a=Math.sqrt(n*n+r*r)*Math.sqrt(i*i+o*o),s=a&&(n*i+r*o)/a;return Math.acos(Math.min(Math.max(s,-1),1))}function R(t){return t[0]=0,t[1]=0,t}function B(t){return"vec2("+t[0]+", "+t[1]+")"}function F(t,e){return t[0]===e[0]&&t[1]===e[1]}function z(t,e){var n=t[0],i=t[1],o=e[0],a=e[1];return Math.abs(n-o)<=r.EPSILON*Math.max(1,Math.abs(n),Math.abs(o))&&Math.abs(i-a)<=r.EPSILON*Math.max(1,Math.abs(i),Math.abs(a))}var G,Y=_,U=l,X=f,W=h,V=x,H=w,q=E,Z=(G=i(),function(t,e,n,r,i,o){var a,s;for(e||(e=2),n||(n=0),s=r?Math.min(r*e+n,t.length):t.length,a=n;a-1}},function(t,e,n){"use strict";e.a=function(t){return"object"===a(t)&&null!==t}},function(t,e,n){"use strict";var r=n(8),i=n(2),o=Object.values?function(t){return Object.values(t)}:function(t){var e=[];return Object(r.a)(t,(function(n,r){Object(i.a)(t)&&"prototype"===r||e.push(n)})),e};e.a=o},function(t,e,n){"use strict";function r(t,e){for(var n in e)e.hasOwnProperty(n)&&"constructor"!==n&&void 0!==e[n]&&(t[n]=e[n])}e.a=function(t,e,n,i){return e&&r(t,e),n&&r(t,n),i&&r(t,i),t}},function(t,e,n){var r=n(35),i=["LR","RL","TB","BT","H","V"],o=["LR","RL","H"],a=i[0];t.exports=function(t,e,n){var s=e.direction||a;if(e.isHorizontal=function(t){return o.indexOf(t)>-1}(s),s&&-1===i.indexOf(s))throw new TypeError("Invalid direction: "+s);if(s===i[0])n(t,e);else if(s===i[1])n(t,e),t.right2left();else if(s===i[2])n(t,e);else if(s===i[3])n(t,e),t.bottom2top();else if(s===i[4]||s===i[5]){var u=r(t,e),c=u.left,l=u.right;n(c,e),n(l,e),e.isHorizontal?c.right2left():c.bottom2top(),l.translate(c.x-l.x,c.y-l.y),t.x=c.x,t.y=l.y;var f=t.getBoundingBox();e.isHorizontal?f.top<0&&t.translate(0,-f.top):f.left<0&&t.translate(-f.left,0)}var h=e.fixedRoot;return void 0===h&&(h=!0),h&&t.translate(-(t.x+t.width/2+t.hgap),-(t.y+t.height/2+t.vgap)),t}},function(t,e,n){var r=n(6),i={getId:function(t){return t.id||t.name},getPreH:function(t){return t.preH||0},getPreV:function(t){return t.preV||0},getHGap:function(t){return t.hgap||18},getVGap:function(t){return t.vgap||18},getChildren:function(t){return t.children},getHeight:function(t){return t.height||36},getWidth:function(t){var e=t.label||" ";return t.width||18*e.split("").length}};function o(t,e){var n=this;if(n.vgap=n.hgap=0,t instanceof o)return t;n.data=t;var r=e.getHGap(t),i=e.getVGap(t);return n.preH=e.getPreH(t),n.preV=e.getPreV(t),n.width=e.getWidth(t),n.height=e.getHeight(t),n.width+=n.preH,n.height+=n.preV,n.id=e.getId(t),n.x=n.y=0,n.depth=0,n.children||(n.children=[]),n.addGap(r,i),n}r.assign(o.prototype,{isRoot:function(){return 0===this.depth},isLeaf:function(){return 0===this.children.length},addGap:function(t,e){this.hgap+=t,this.vgap+=e,this.width+=2*t,this.height+=2*e},eachNode:function(t){for(var e,n=[this];e=n.shift();)t(e),n=e.children.concat(n)},DFTraverse:function(t){this.eachNode(t)},BFTraverse:function(t){for(var e,n=[this];e=n.shift();)t(e),n=n.concat(e.children)},getBoundingBox:function(){var t={left:Number.MAX_VALUE,top:Number.MAX_VALUE,width:0,height:0};return this.eachNode((function(e){t.left=Math.min(t.left,e.x),t.top=Math.min(t.top,e.y),t.width=Math.max(t.width,e.x+e.width),t.height=Math.max(t.height,e.y+e.height)})),t},translate:function(t,e){void 0===t&&(t=0),void 0===e&&(e=0),this.eachNode((function(n){n.x+=t,n.y+=e,n.x+=n.preH,n.y+=n.preV}))},right2left:function(){var t=this.getBoundingBox();this.eachNode((function(e){e.x=e.x-2*(e.x-t.left)-e.width})),this.translate(t.width,0)},bottom2top:function(){var t=this.getBoundingBox();this.eachNode((function(e){e.y=e.y-2*(e.y-t.top)-e.height})),this.translate(0,t.height)}}),t.exports=function(t,e,n){void 0===e&&(e={});var a,s=new o(t,e=r.assign({},i,e)),u=[s];if(!n&&!t.collapsed)for(;a=u.shift();)if(!a.data.collapsed){var c=e.getChildren(a.data),l=c?c.length:0;if(a.children=new Array(l),c&&l)for(var f=0;f-1;)i.call(t,s,1);return t}},function(t,e,n){"use strict";var r=n(1),i=n(24);e.a=function(t,e){var n=[];if(!Object(r.a)(t))return n;for(var o=-1,a=[],s=t.length;++oe[r])return 1;if(t[r]n?n:t}},function(t,e,n){"use strict";e.a=function(t,e){var n=e.toString(),r=n.indexOf(".");if(-1===r)return Math.round(t);var i=n.substr(r+1).length;return i>20&&(i=20),parseFloat(t.toFixed(i))}},function(t,e,n){"use strict";var r=n(5);e.a=function(t){return Object(r.a)(t)&&t%1!=0}},function(t,e,n){"use strict";var r=n(5);e.a=function(t){return Object(r.a)(t)&&t%2==0}},function(t,e,n){"use strict";var r=n(5),i=Number.isInteger?Number.isInteger:function(t){return Object(r.a)(t)&&t%1==0};e.a=i},function(t,e,n){"use strict";var r=n(5);e.a=function(t){return Object(r.a)(t)&&t<0}},function(t,e,n){"use strict";e.a=function(t,e,n){return void 0===n&&(n=1e-5),Math.abs(t-e)0}},function(t,e,n){"use strict";var r=n(0),i=n(2);e.a=function(t,e){if(Object(r.a)(t)){for(var n,o=-1/0,a=0;ao&&(n=s,o=u)}return n}}},function(t,e,n){"use strict";var r=n(0),i=n(2);e.a=function(t,e){if(Object(r.a)(t)){for(var n,o=1/0,a=0;ae?(r&&(clearTimeout(r),r=null),s=c,a=t.apply(i,o),r||(i=o=null)):r||!1===n.trailing||(r=setTimeout(u,l)),a};return c.cancel=function(){clearTimeout(r),s=0,r=i=o=null},c}},function(t,e,n){"use strict";var r=n(1);e.a=function(t){return Object(r.a)(t)?Array.prototype.slice.call(t):[]}},function(t,e,n){"use strict";var r={};e.a=function(t){return r[t=t||"g"]?r[t]+=1:r[t]=1,t+r[t]}},function(t,e,n){"use strict";e.a=function(){}},function(t,e,n){"use strict";e.a=function(t){return t}},function(t,e,n){"use strict";e.a=function(t){return Object(r.a)(t)?0:Object(i.a)(t)?t.length:Object.keys(t).length};var r=n(7),i=n(1)},function(t,e,n){"use strict";e.a=function(){for(var t=0,e=0,n=arguments.length;ef&&u>f);)if(h.push(s),f-=u,!(l=l.substr(16)))return h.join("");for(;s=l.substr(0,1),!((u=Object(o.a)(s,n))+c>f);)if(h.push(s),f-=u,!(l=l.substr(1)))return h.join("");return""+h.join("")+a}},function(t,e,n){"use strict";var r=function(){function t(){this.map={}}return t.prototype.has=function(t){return void 0!==this.map[t]},t.prototype.get=function(t,e){var n=this.map[t];return void 0===n?e:n},t.prototype.set=function(t,e){this.map[t]=e},t.prototype.clear=function(){this.map={}},t.prototype.delete=function(t){delete this.map[t]},t.prototype.size=function(){return Object.keys(this.map).length},t}();e.a=r},function(t,e){function n(t,e,n,r){void 0===r&&(r=[]);var i=this;i.w=t||0,i.h=e||0,i.y=n||0,i.x=0,i.c=r||[],i.cs=r.length,i.prelim=0,i.mod=0,i.shift=0,i.change=0,i.tl=null,i.tr=null,i.el=null,i.er=null,i.msel=0,i.mser=0}function r(t,e){var n=function t(e,n){var r=n?e.y:e.x;return e.children.forEach((function(e){r=Math.min(t(e,n),r)})),r}(t,e);!function t(e,n,r){r?e.y+=n:e.x+=n,e.children.forEach((function(e){t(e,n,r)}))}(t,-n,e)}n.fromNode=function(t,e){if(!t)return null;var r=[];return t.children.forEach((function(t){r.push(n.fromNode(t,e))})),e?new n(t.height,t.width,t.x,r):new n(t.width,t.height,t.y,r)},t.exports=function(t,e){void 0===e&&(e={});var i=e.isHorizontal;function o(t){0===t.cs?(t.el=t,t.er=t,t.msel=t.mser=0):(t.el=t.c[0].el,t.msel=t.c[0].msel,t.er=t.c[t.cs-1].er,t.mser=t.c[t.cs-1].mser)}function a(t,e,n){for(var r=t.c[e-1],i=r.mod,o=t.c[e],a=o.mod;null!==r&&null!==o;){l(r)>n.low&&(n=n.nxt);var f=i+r.prelim+r.w-(a+o.prelim);f>0&&(a+=f,s(t,e,n.index,f));var h=l(r),d=l(o);h<=d&&null!==(r=c(r))&&(i+=r.mod),h>=d&&null!==(o=u(o))&&(a+=o.mod)}!r&&o?function(t,e,n,r){var i=t.c[0].el;i.tl=n;var o=r-n.mod-t.c[0].msel;i.mod+=o,i.prelim-=o,t.c[0].el=t.c[e].el,t.c[0].msel=t.c[e].msel}(t,e,o,a):r&&!o&&function(t,e,n,r){var i=t.c[e].er;i.tr=n;var o=r-n.mod-t.c[e].mser;i.mod+=o,i.prelim-=o,t.c[e].er=t.c[e-1].er,t.c[e].mser=t.c[e-1].mser}(t,e,r,i)}function s(t,e,n,r){t.c[e].mod+=r,t.c[e].msel+=r,t.c[e].mser+=r,function(t,e,n,r){if(n!==e-1){var i=e-n;t.c[n+1].shift+=r/i,t.c[e].shift-=r/i,t.c[e].change-=r-r/i}}(t,e,n,r)}function u(t){return 0===t.cs?t.tl:t.c[0]}function c(t){return 0===t.cs?t.tr:t.c[t.cs-1]}function l(t){return t.y+t.h}function f(t,e,n){for(;null!==n&&t>=n.low;)n=n.nxt;return{low:t,index:e,nxt:n}}!function t(e,n,r){void 0===r&&(r=0),n?(e.x=r,r+=e.width):(e.y=r,r+=e.height),e.children.forEach((function(e){t(e,n,r)}))}(t,i);var h=n.fromNode(t,i);return function t(e){if(0!==e.cs){t(e.c[0]);for(var n=f(l(e.c[0].el),0,null),r=1;ra&&(a=e.depth);var n=e.children,r=n.length,o=new i(e.height,[]);return n.forEach((function(e,n){var i=t(e);o.children.push(i),0===n&&(o.leftChild=i),n===r-1&&(o.rightChild=i)})),o.originNode=e,o.isLeaf=e.isLeaf(),o}(t);return function t(e){if(e.isLeaf||0===e.children.length)e.drawingDepth=a;else{var n=e.children.map((function(e){return t(e)})),r=Math.min.apply(null,n);e.drawingDepth=r-1}return e.drawingDepth}(s),function t(r){r.x=r.drawingDepth*e.rankSep,r.isLeaf?(r.y=0,n&&(r.y=n.y+n.height+e.nodeSep,r.originNode.parent!==n.originNode.parent&&(r.y+=e.subTreeSep)),n=r):(r.children.forEach((function(e){t(e)})),r.y=(r.leftChild.y+r.rightChild.y)/2)}(s),function t(e,n,r){r?(n.x=e.x,n.y=e.y):(n.x=e.y,n.y=e.x),e.children.forEach((function(e,i){t(e,n.children[i],r)}))}(s,t,e.isHorizontal),t}},function(t,e,n){function r(t,e){return(r=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t})(t,e)}var i=n(11),o=n(123),a=n(35),s=n(6),u=["LR","RL","H"],c=u[0],l=function(t){var e,n;function i(){return t.apply(this,arguments)||this}return n=t,(e=i).prototype=Object.create(n.prototype),e.prototype.constructor=e,r(e,n),i.prototype.execute=function(){var t=this.options,e=this.rootNode;t.isHorizontal=!0;var n=t.indent,r=void 0===n?20:n,i=t.dropCap,s=void 0===i||i,l=t.direction,f=void 0===l?c:l,h=t.align;if(f&&-1===u.indexOf(f))throw new TypeError("Invalid direction: "+f);if(f===u[0])o(e,r,s,h);else if(f===u[1])o(e,r,s,h),e.right2left();else if(f===u[2]){var d=a(e,t),p=d.left,g=d.right;o(p,r,s,h),p.right2left(),o(g,r,s,h);var v=p.getBoundingBox();g.translate(v.width,0),e.x=g.x-e.width/2}return e},i}(i),f={};t.exports=function(t,e){return e=s.assign({},f,e),new l(t,e).execute()}},function(t,e,n){var r=n(6);t.exports=function(t,e,n,i){var o=null;t.eachNode((function(t){!function(t,e,n,i,o){var a="function"==typeof n?n(t):n*t.depth;if(!i)try{if(t.id===t.parent.children[0].id)return t.x+=a,void(t.y=e?e.y:0)}catch(t){}if(t.x+=a,e){if(t.y=e.y+r.getHeight(e,t,o),e.parent&&t.parent.id!==e.parent.id){var s=e.parent,u=s.y+r.getHeight(s,t,o);t.y=u>t.y?u:t.y}}else t.y=0}(t,o,e,n,i),o=t}))}},function(t,e,n){function r(t,e){return(r=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t})(t,e)}var i=n(11),o=n(125),a=n(17),s=n(6),u=function(t){var e,n;function i(){return t.apply(this,arguments)||this}return n=t,(e=i).prototype=Object.create(n.prototype),e.prototype.constructor=e,r(e,n),i.prototype.execute=function(){return a(this.rootNode,this.options,o)},i}(i),c={};t.exports=function(t,e){return e=s.assign({},c,e),new u(t,e).execute()}},function(t,e,n){var r=n(6),i={getSubTreeSep:function(){return 0}};t.exports=function(t,e){void 0===e&&(e={}),e=r.assign({},i,e),t.parent={x:0,width:0,height:0,y:0},t.BFTraverse((function(t){t.x=t.parent.x+t.parent.width})),t.parent=null,function t(e,n){var r=0;return e.children.length?e.children.forEach((function(e){r+=t(e,n)})):r=e.height,e._subTreeSep=n.getSubTreeSep(e.data),e.totalHeight=Math.max(e.height,r)+2*e._subTreeSep,e.totalHeight}(t,e),t.startY=0,t.y=t.totalHeight/2-t.height/2,t.eachNode((function(t){var e=t.children,n=e.length;if(n){var r=e[0];if(r.startY=t.startY+t._subTreeSep,1===n)r.y=t.y+t.height/2-r.height/2;else{r.y=r.startY+r.totalHeight/2-r.height/2;for(var i=1;ie.height)e.y=i.y+a/2-e.height/2;else if(1!==n.length||e.height>s){var u=e.y+(e.height-a)/2-i.y;n.forEach((function(t){t.translate(0,u)}))}else e.y=(i.y+i.height/2+o.y+o.height/2)/2-e.height/2}}(t)}}])},"object"===a(e)&&"object"===a(t)?t.exports=o():(r=[],void 0===(i="function"==typeof(n=o)?n.apply(e,r):n)||(t.exports=i))}).call(this,n(100)(t))},function(t,e,n){"use strict";function r(t){return(r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}var i=n(146),o=n(150),a=[].slice,s=["keyword","gray","hex"],u={};Object.keys(o).forEach((function(t){u[a.call(o[t].labels).sort().join("")]=t}));var c={};function l(t,e){if(!(this instanceof l))return new l(t,e);if(e&&e in s&&(e=null),e&&!(e in o))throw new Error("Unknown model: "+e);var n,r;if(null==t)this.model="rgb",this.color=[0,0,0],this.valpha=1;else if(t instanceof l)this.model=t.model,this.color=t.color.slice(),this.valpha=t.valpha;else if("string"==typeof t){var f=i.get(t);if(null===f)throw new Error("Unable to parse color from string: "+t);this.model=f.model,r=o[this.model].channels,this.color=f.value.slice(0,r),this.valpha="number"==typeof f.value[r]?f.value[r]:1}else if(t.length){this.model=e||"rgb",r=o[this.model].channels;var h=a.call(t,0,r);this.color=p(h,r),this.valpha="number"==typeof t[r]?t[r]:1}else if("number"==typeof t)t&=16777215,this.model="rgb",this.color=[t>>16&255,t>>8&255,255&t],this.valpha=1;else{this.valpha=1;var d=Object.keys(t);"alpha"in t&&(d.splice(d.indexOf("alpha"),1),this.valpha="number"==typeof t.alpha?t.alpha:0);var g=d.sort().join("");if(!(g in u))throw new Error("Unable to parse color from object: "+JSON.stringify(t));this.model=u[g];var v=o[this.model].labels,y=[];for(n=0;nn?(e+.05)/(n+.05):(n+.05)/(e+.05)},level:function(t){var e=this.contrast(t);return e>=7.1?"AAA":e>=4.5?"AA":""},isDark:function(){var t=this.rgb().color;return(299*t[0]+587*t[1]+114*t[2])/1e3<128},isLight:function(){return!this.isDark()},negate:function(){for(var t=this.rgb(),e=0;e<3;e++)t.color[e]=255-t.color[e];return t},lighten:function(t){var e=this.hsl();return e.color[2]+=e.color[2]*t,e},darken:function(t){var e=this.hsl();return e.color[2]-=e.color[2]*t,e},saturate:function(t){var e=this.hsl();return e.color[1]+=e.color[1]*t,e},desaturate:function(t){var e=this.hsl();return e.color[1]-=e.color[1]*t,e},whiten:function(t){var e=this.hwb();return e.color[1]+=e.color[1]*t,e},blacken:function(t){var e=this.hwb();return e.color[2]+=e.color[2]*t,e},grayscale:function(){var t=this.rgb().color,e=.3*t[0]+.59*t[1]+.11*t[2];return l.rgb(e,e,e)},fade:function(t){return this.alpha(this.valpha-this.valpha*t)},opaquer:function(t){return this.alpha(this.valpha+this.valpha*t)},rotate:function(t){var e=this.hsl(),n=e.color[0];return n=(n=(n+t)%360)<0?360+n:n,e.color[0]=n,e},mix:function(t,e){if(!t||!t.rgb)throw new Error('Argument to "mix" was not a Color instance, but rather an instance of '+r(t));var n=t.rgb(),i=this.rgb(),o=void 0===e?.5:e,a=2*o-1,s=n.alpha()-i.alpha(),u=((a*s==-1?a:(a+s)/(1+a*s))+1)/2,c=1-u;return l.rgb(u*n.red()+c*i.red(),u*n.green()+c*i.green(),u*n.blue()+c*i.blue(),n.alpha()*o+i.alpha()*(1-o))}},Object.keys(o).forEach((function(t){if(-1===s.indexOf(t)){var e=o[t].channels;l.prototype[t]=function(){if(this.model===t)return new l(this);if(arguments.length)return new l(arguments,t);var n="number"==typeof arguments[e]?e:this.valpha;return new l(d(o[this.model][t].raw(this.color)).concat(n),t)},l[t]=function(n){return"number"==typeof n&&(n=p(a.call(arguments),e)),new l(n,t)}}})),t.exports=l},function(t,e){function n(e){return t.exports=n="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},t.exports.__esModule=!0,t.exports.default=t.exports,n(e)}t.exports=n,t.exports.__esModule=!0,t.exports.default=t.exports},function(t,e,n){"use strict";n.d(e,"a",(function(){return s}));var r=n(5);function i(t){return Math.sqrt(t[0]*t[0]+t[1]*t[1])}function o(t,e){return i(t)*i(e)?(t[0]*e[0]+t[1]*e[1])/(i(t)*i(e)):1}function a(t,e){return(t[0]*e[1]1&&(n*=Math.sqrt(v),i*=Math.sqrt(v));var y=n*n*(g*g)+i*i*(p*p),m=y?Math.sqrt((n*n*(i*i)-y)/y):1;u===c&&(m*=-1),isNaN(m)&&(m=0);var b=i?m*n*g/i:0,x=n?m*-i*p/n:0,w=(l+h)/2+Math.cos(s)*b-Math.sin(s)*x,_=(f+d)/2+Math.sin(s)*b+Math.cos(s)*x,E=[(p-b)/n,(g-x)/i],S=[(-1*p-b)/n,(-1*g-x)/i],M=a([1,0],E),O=a(E,S);return o(E,S)<=-1&&(O=Math.PI),o(E,S)>=1&&(O=0),0===c&&O>0&&(O-=2*Math.PI),1===c&&O<0&&(O+=2*Math.PI),{cx:w,cy:_,rx:Object(r.j)(t,[h,d])?0:n,ry:Object(r.j)(t,[h,d])?0:i,startAngle:M,endAngle:M+O,xRotation:s,arcFlag:u,sweepFlag:c}}},function(t,e,n){var r,i,o;function a(t){return(a="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}o=function(){"use strict";function t(e){return(t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(e)}var e=/^\s+/,n=/\s+$/;function r(i,o){if(o=o||{},(i=i||"")instanceof r)return i;if(!(this instanceof r))return new r(i,o);var a=function(r){var i,o,a,s={r:0,g:0,b:0},u=1,c=null,l=null,f=null,h=!1,d=!1;return"string"==typeof r&&(r=function(t){t=t.replace(e,"").replace(n,"").toLowerCase();var r,i=!1;if(x[t])t=x[t],i=!0;else if("transparent"==t)return{r:0,g:0,b:0,a:0,format:"name"};return(r=N.rgb.exec(t))?{r:r[1],g:r[2],b:r[3]}:(r=N.rgba.exec(t))?{r:r[1],g:r[2],b:r[3],a:r[4]}:(r=N.hsl.exec(t))?{h:r[1],s:r[2],l:r[3]}:(r=N.hsla.exec(t))?{h:r[1],s:r[2],l:r[3],a:r[4]}:(r=N.hsv.exec(t))?{h:r[1],s:r[2],v:r[3]}:(r=N.hsva.exec(t))?{h:r[1],s:r[2],v:r[3],a:r[4]}:(r=N.hex8.exec(t))?{r:M(r[1]),g:M(r[2]),b:M(r[3]),a:C(r[4]),format:i?"name":"hex8"}:(r=N.hex6.exec(t))?{r:M(r[1]),g:M(r[2]),b:M(r[3]),format:i?"name":"hex"}:(r=N.hex4.exec(t))?{r:M(r[1]+""+r[1]),g:M(r[2]+""+r[2]),b:M(r[3]+""+r[3]),a:C(r[4]+""+r[4]),format:i?"name":"hex8"}:!!(r=N.hex3.exec(t))&&{r:M(r[1]+""+r[1]),g:M(r[2]+""+r[2]),b:M(r[3]+""+r[3]),format:i?"name":"hex"}}(r)),"object"==t(r)&&(P(r.r)&&P(r.g)&&P(r.b)?(i=r.r,o=r.g,a=r.b,s={r:255*E(i,255),g:255*E(o,255),b:255*E(a,255)},h=!0,d="%"===String(r.r).substr(-1)?"prgb":"rgb"):P(r.h)&&P(r.s)&&P(r.v)?(c=k(r.s),l=k(r.v),s=function(t,e,n){t=6*E(t,360),e=E(e,100),n=E(n,100);var r=Math.floor(t),i=t-r,o=n*(1-e),a=n*(1-i*e),s=n*(1-(1-i)*e),u=r%6;return{r:255*[n,a,o,o,s,n][u],g:255*[s,n,n,a,o,o][u],b:255*[o,o,s,n,n,a][u]}}(r.h,c,l),h=!0,d="hsv"):P(r.h)&&P(r.s)&&P(r.l)&&(c=k(r.s),f=k(r.l),s=function(t,e,n){var r,i,o;function a(t,e,n){return n<0&&(n+=1),n>1&&(n-=1),n<1/6?t+6*(e-t)*n:n<.5?e:n<2/3?t+(e-t)*(2/3-n)*6:t}if(t=E(t,360),e=E(e,100),n=E(n,100),0===e)r=i=o=n;else{var s=n<.5?n*(1+e):n+e-n*e,u=2*n-s;r=a(u,s,t+1/3),i=a(u,s,t),o=a(u,s,t-1/3)}return{r:255*r,g:255*i,b:255*o}}(r.h,c,f),h=!0,d="hsl"),r.hasOwnProperty("a")&&(u=r.a)),u=_(u),{ok:h,format:r.format||d,r:Math.min(255,Math.max(s.r,0)),g:Math.min(255,Math.max(s.g,0)),b:Math.min(255,Math.max(s.b,0)),a:u}}(i);this._originalInput=i,this._r=a.r,this._g=a.g,this._b=a.b,this._a=a.a,this._roundA=Math.round(100*this._a)/100,this._format=o.format||a.format,this._gradientType=o.gradientType,this._r<1&&(this._r=Math.round(this._r)),this._g<1&&(this._g=Math.round(this._g)),this._b<1&&(this._b=Math.round(this._b)),this._ok=a.ok}function i(t,e,n){t=E(t,255),e=E(e,255),n=E(n,255);var r,i,o=Math.max(t,e,n),a=Math.min(t,e,n),s=(o+a)/2;if(o==a)r=i=0;else{var u=o-a;switch(i=s>.5?u/(2-o-a):u/(o+a),o){case t:r=(e-n)/u+(e>1)+720)%360;--e;)i.h=(i.h+o)%360,a.push(r(i));return a}function b(t,e){e=e||6;for(var n=r(t).toHsv(),i=n.h,o=n.s,a=n.v,s=[],u=1/e;e--;)s.push(r({h:i,s:o,v:a})),a=(a+u)%1;return s}r.prototype={isDark:function(){return this.getBrightness()<128},isLight:function(){return!this.isDark()},isValid:function(){return this._ok},getOriginalInput:function(){return this._originalInput},getFormat:function(){return this._format},getAlpha:function(){return this._a},getBrightness:function(){var t=this.toRgb();return(299*t.r+587*t.g+114*t.b)/1e3},getLuminance:function(){var t,e,n,r=this.toRgb();return t=r.r/255,e=r.g/255,n=r.b/255,.2126*(t<=.03928?t/12.92:Math.pow((t+.055)/1.055,2.4))+.7152*(e<=.03928?e/12.92:Math.pow((e+.055)/1.055,2.4))+.0722*(n<=.03928?n/12.92:Math.pow((n+.055)/1.055,2.4))},setAlpha:function(t){return this._a=_(t),this._roundA=Math.round(100*this._a)/100,this},toHsv:function(){var t=o(this._r,this._g,this._b);return{h:360*t.h,s:t.s,v:t.v,a:this._a}},toHsvString:function(){var t=o(this._r,this._g,this._b),e=Math.round(360*t.h),n=Math.round(100*t.s),r=Math.round(100*t.v);return 1==this._a?"hsv("+e+", "+n+"%, "+r+"%)":"hsva("+e+", "+n+"%, "+r+"%, "+this._roundA+")"},toHsl:function(){var t=i(this._r,this._g,this._b);return{h:360*t.h,s:t.s,l:t.l,a:this._a}},toHslString:function(){var t=i(this._r,this._g,this._b),e=Math.round(360*t.h),n=Math.round(100*t.s),r=Math.round(100*t.l);return 1==this._a?"hsl("+e+", "+n+"%, "+r+"%)":"hsla("+e+", "+n+"%, "+r+"%, "+this._roundA+")"},toHex:function(t){return a(this._r,this._g,this._b,t)},toHexString:function(t){return"#"+this.toHex(t)},toHex8:function(t){return function(t,e,n,r,i){var o=[O(Math.round(t).toString(16)),O(Math.round(e).toString(16)),O(Math.round(n).toString(16)),O(A(r))];return i&&o[0].charAt(0)==o[0].charAt(1)&&o[1].charAt(0)==o[1].charAt(1)&&o[2].charAt(0)==o[2].charAt(1)&&o[3].charAt(0)==o[3].charAt(1)?o[0].charAt(0)+o[1].charAt(0)+o[2].charAt(0)+o[3].charAt(0):o.join("")}(this._r,this._g,this._b,this._a,t)},toHex8String:function(t){return"#"+this.toHex8(t)},toRgb:function(){return{r:Math.round(this._r),g:Math.round(this._g),b:Math.round(this._b),a:this._a}},toRgbString:function(){return 1==this._a?"rgb("+Math.round(this._r)+", "+Math.round(this._g)+", "+Math.round(this._b)+")":"rgba("+Math.round(this._r)+", "+Math.round(this._g)+", "+Math.round(this._b)+", "+this._roundA+")"},toPercentageRgb:function(){return{r:Math.round(100*E(this._r,255))+"%",g:Math.round(100*E(this._g,255))+"%",b:Math.round(100*E(this._b,255))+"%",a:this._a}},toPercentageRgbString:function(){return 1==this._a?"rgb("+Math.round(100*E(this._r,255))+"%, "+Math.round(100*E(this._g,255))+"%, "+Math.round(100*E(this._b,255))+"%)":"rgba("+Math.round(100*E(this._r,255))+"%, "+Math.round(100*E(this._g,255))+"%, "+Math.round(100*E(this._b,255))+"%, "+this._roundA+")"},toName:function(){return 0===this._a?"transparent":!(this._a<1)&&(w[a(this._r,this._g,this._b,!0)]||!1)},toFilter:function(t){var e="#"+s(this._r,this._g,this._b,this._a),n=e,i=this._gradientType?"GradientType = 1, ":"";if(t){var o=r(t);n="#"+s(o._r,o._g,o._b,o._a)}return"progid:DXImageTransform.Microsoft.gradient("+i+"startColorstr="+e+",endColorstr="+n+")"},toString:function(t){var e=!!t;t=t||this._format;var n=!1,r=this._a<1&&this._a>=0;return e||!r||"hex"!==t&&"hex6"!==t&&"hex3"!==t&&"hex4"!==t&&"hex8"!==t&&"name"!==t?("rgb"===t&&(n=this.toRgbString()),"prgb"===t&&(n=this.toPercentageRgbString()),"hex"!==t&&"hex6"!==t||(n=this.toHexString()),"hex3"===t&&(n=this.toHexString(!0)),"hex4"===t&&(n=this.toHex8String(!0)),"hex8"===t&&(n=this.toHex8String()),"name"===t&&(n=this.toName()),"hsl"===t&&(n=this.toHslString()),"hsv"===t&&(n=this.toHsvString()),n||this.toHexString()):"name"===t&&0===this._a?this.toName():this.toRgbString()},clone:function(){return r(this.toString())},_applyModification:function(t,e){var n=t.apply(null,[this].concat([].slice.call(e)));return this._r=n._r,this._g=n._g,this._b=n._b,this.setAlpha(n._a),this},lighten:function(){return this._applyModification(f,arguments)},brighten:function(){return this._applyModification(h,arguments)},darken:function(){return this._applyModification(d,arguments)},desaturate:function(){return this._applyModification(u,arguments)},saturate:function(){return this._applyModification(c,arguments)},greyscale:function(){return this._applyModification(l,arguments)},spin:function(){return this._applyModification(p,arguments)},_applyCombination:function(t,e){return t.apply(null,[this].concat([].slice.call(e)))},analogous:function(){return this._applyCombination(m,arguments)},complement:function(){return this._applyCombination(g,arguments)},monochromatic:function(){return this._applyCombination(b,arguments)},splitcomplement:function(){return this._applyCombination(y,arguments)},triad:function(){return this._applyCombination(v,[3])},tetrad:function(){return this._applyCombination(v,[4])}},r.fromRatio=function(e,n){if("object"==t(e)){var i={};for(var o in e)e.hasOwnProperty(o)&&(i[o]="a"===o?e[o]:k(e[o]));e=i}return r(e,n)},r.equals=function(t,e){return!(!t||!e)&&r(t).toRgbString()==r(e).toRgbString()},r.random=function(){return r.fromRatio({r:Math.random(),g:Math.random(),b:Math.random()})},r.mix=function(t,e,n){n=0===n?0:n||50;var i=r(t).toRgb(),o=r(e).toRgb(),a=n/100;return r({r:(o.r-i.r)*a+i.r,g:(o.g-i.g)*a+i.g,b:(o.b-i.b)*a+i.b,a:(o.a-i.a)*a+i.a})},r.readability=function(t,e){var n=r(t),i=r(e);return(Math.max(n.getLuminance(),i.getLuminance())+.05)/(Math.min(n.getLuminance(),i.getLuminance())+.05)},r.isReadable=function(t,e,n){var i,o,a,s,u,c=r.readability(t,e);switch(o=!1,(a=n,s=((a=a||{level:"AA",size:"small"}).level||"AA").toUpperCase(),u=(a.size||"small").toLowerCase(),"AA"!==s&&"AAA"!==s&&(s="AA"),"small"!==u&&"large"!==u&&(u="small"),i={level:s,size:u}).level+i.size){case"AAsmall":case"AAAlarge":o=c>=4.5;break;case"AAlarge":o=c>=3;break;case"AAAsmall":o=c>=7}return o},r.mostReadable=function(t,e,n){var i,o,a,s,u=null,c=0;o=(n=n||{}).includeFallbackColors,a=n.level,s=n.size;for(var l=0;lc&&(c=i,u=r(e[l]));return r.isReadable(t,u,{level:a,size:s})||!o?u:(n.includeFallbackColors=!1,r.mostReadable(t,["#fff","#000"],n))};var x=r.names={aliceblue:"f0f8ff",antiquewhite:"faebd7",aqua:"0ff",aquamarine:"7fffd4",azure:"f0ffff",beige:"f5f5dc",bisque:"ffe4c4",black:"000",blanchedalmond:"ffebcd",blue:"00f",blueviolet:"8a2be2",brown:"a52a2a",burlywood:"deb887",burntsienna:"ea7e5d",cadetblue:"5f9ea0",chartreuse:"7fff00",chocolate:"d2691e",coral:"ff7f50",cornflowerblue:"6495ed",cornsilk:"fff8dc",crimson:"dc143c",cyan:"0ff",darkblue:"00008b",darkcyan:"008b8b",darkgoldenrod:"b8860b",darkgray:"a9a9a9",darkgreen:"006400",darkgrey:"a9a9a9",darkkhaki:"bdb76b",darkmagenta:"8b008b",darkolivegreen:"556b2f",darkorange:"ff8c00",darkorchid:"9932cc",darkred:"8b0000",darksalmon:"e9967a",darkseagreen:"8fbc8f",darkslateblue:"483d8b",darkslategray:"2f4f4f",darkslategrey:"2f4f4f",darkturquoise:"00ced1",darkviolet:"9400d3",deeppink:"ff1493",deepskyblue:"00bfff",dimgray:"696969",dimgrey:"696969",dodgerblue:"1e90ff",firebrick:"b22222",floralwhite:"fffaf0",forestgreen:"228b22",fuchsia:"f0f",gainsboro:"dcdcdc",ghostwhite:"f8f8ff",gold:"ffd700",goldenrod:"daa520",gray:"808080",green:"008000",greenyellow:"adff2f",grey:"808080",honeydew:"f0fff0",hotpink:"ff69b4",indianred:"cd5c5c",indigo:"4b0082",ivory:"fffff0",khaki:"f0e68c",lavender:"e6e6fa",lavenderblush:"fff0f5",lawngreen:"7cfc00",lemonchiffon:"fffacd",lightblue:"add8e6",lightcoral:"f08080",lightcyan:"e0ffff",lightgoldenrodyellow:"fafad2",lightgray:"d3d3d3",lightgreen:"90ee90",lightgrey:"d3d3d3",lightpink:"ffb6c1",lightsalmon:"ffa07a",lightseagreen:"20b2aa",lightskyblue:"87cefa",lightslategray:"789",lightslategrey:"789",lightsteelblue:"b0c4de",lightyellow:"ffffe0",lime:"0f0",limegreen:"32cd32",linen:"faf0e6",magenta:"f0f",maroon:"800000",mediumaquamarine:"66cdaa",mediumblue:"0000cd",mediumorchid:"ba55d3",mediumpurple:"9370db",mediumseagreen:"3cb371",mediumslateblue:"7b68ee",mediumspringgreen:"00fa9a",mediumturquoise:"48d1cc",mediumvioletred:"c71585",midnightblue:"191970",mintcream:"f5fffa",mistyrose:"ffe4e1",moccasin:"ffe4b5",navajowhite:"ffdead",navy:"000080",oldlace:"fdf5e6",olive:"808000",olivedrab:"6b8e23",orange:"ffa500",orangered:"ff4500",orchid:"da70d6",palegoldenrod:"eee8aa",palegreen:"98fb98",paleturquoise:"afeeee",palevioletred:"db7093",papayawhip:"ffefd5",peachpuff:"ffdab9",peru:"cd853f",pink:"ffc0cb",plum:"dda0dd",powderblue:"b0e0e6",purple:"800080",rebeccapurple:"663399",red:"f00",rosybrown:"bc8f8f",royalblue:"4169e1",saddlebrown:"8b4513",salmon:"fa8072",sandybrown:"f4a460",seagreen:"2e8b57",seashell:"fff5ee",sienna:"a0522d",silver:"c0c0c0",skyblue:"87ceeb",slateblue:"6a5acd",slategray:"708090",slategrey:"708090",snow:"fffafa",springgreen:"00ff7f",steelblue:"4682b4",tan:"d2b48c",teal:"008080",thistle:"d8bfd8",tomato:"ff6347",turquoise:"40e0d0",violet:"ee82ee",wheat:"f5deb3",white:"fff",whitesmoke:"f5f5f5",yellow:"ff0",yellowgreen:"9acd32"},w=r.hexNames=function(t){var e={};for(var n in t)t.hasOwnProperty(n)&&(e[t[n]]=n);return e}(x);function _(t){return t=parseFloat(t),(isNaN(t)||t<0||t>1)&&(t=1),t}function E(t,e){(function(t){return"string"==typeof t&&-1!=t.indexOf(".")&&1===parseFloat(t)})(t)&&(t="100%");var n=function(t){return"string"==typeof t&&-1!=t.indexOf("%")}(t);return t=Math.min(e,Math.max(0,parseFloat(t))),n&&(t=parseInt(t*e,10)/100),Math.abs(t-e)<1e-6?1:t%e/parseFloat(e)}function S(t){return Math.min(1,Math.max(0,t))}function M(t){return parseInt(t,16)}function O(t){return 1==t.length?"0"+t:""+t}function k(t){return t<=1&&(t=100*t+"%"),t}function A(t){return Math.round(255*parseFloat(t)).toString(16)}function C(t){return M(t)/255}var j,I,T,N=(I="[\\s|\\(]+("+(j="(?:[-\\+]?\\d*\\.\\d+%?)|(?:[-\\+]?\\d+%?)")+")[,|\\s]+("+j+")[,|\\s]+("+j+")\\s*\\)?",T="[\\s|\\(]+("+j+")[,|\\s]+("+j+")[,|\\s]+("+j+")[,|\\s]+("+j+")\\s*\\)?",{CSS_UNIT:new RegExp(j),rgb:new RegExp("rgb"+I),rgba:new RegExp("rgba"+T),hsl:new RegExp("hsl"+I),hsla:new RegExp("hsla"+T),hsv:new RegExp("hsv"+I),hsva:new RegExp("hsva"+T),hex3:/^#?([0-9a-fA-F]{1})([0-9a-fA-F]{1})([0-9a-fA-F]{1})$/,hex6:/^#?([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})$/,hex4:/^#?([0-9a-fA-F]{1})([0-9a-fA-F]{1})([0-9a-fA-F]{1})([0-9a-fA-F]{1})$/,hex8:/^#?([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})$/});function P(t){return!!N.CSS_UNIT.exec(t)}return r},"object"===a(e)&&void 0!==t?t.exports=o():void 0===(i="function"==typeof(r=o)?r.call(e,n,e,t):r)||(t.exports=i)},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r=function(t,e){var n=t.nodes,r=t.edges,i=[],o={};if(!n)throw new Error("invalid nodes data!");return n&&n.forEach((function(t,e){o[t.id]=e;i.push([])})),r&&r.forEach((function(t){var n=t.source,r=t.target,a=o[n],s=o[r];!a&&0!==a||!s&&0!==s||(i[a][s]=1,e||(i[s][a]=1))})),i};e.default=r},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.FORCE_LAYOUT_TYPE_MAP=e.LAYOUT_MESSAGE=void 0,e.LAYOUT_MESSAGE={RUN:"LAYOUT_RUN",END:"LAYOUT_END",ERROR:"LAYOUT_ERROR",TICK:"LAYOUT_TICK",GPURUN:"GPU_LAYOUT_RUN",GPUEND:"GPU_LAYOUT_END"},e.FORCE_LAYOUT_TYPE_MAP={gForce:!0,force2:!0,fruchterman:!0,forceAtlas2:!0,force:!0,"graphin-force":!0}},function(t,e,n){"use strict";n.r(e),n.d(e,"Graph",(function(){return E})),n.d(e,"GraphWithEvent",(function(){return N})),n.d(e,"algorithm",(function(){return r})),n.d(e,"comparision",(function(){return o})),n.d(e,"essence",(function(){return i})),n.d(e,"generate",(function(){return s}));var r={};n.r(r),n.d(r,"components",(function(){return B})),n.d(r,"dfs",(function(){return F})),n.d(r,"dijkstra",(function(){return X})),n.d(r,"dijkstraAll",(function(){return W})),n.d(r,"findCycles",(function(){return H})),n.d(r,"tarjan",(function(){return V})),n.d(r,"isAcyclic",(function(){return ot})),n.d(r,"postorder",(function(){return at})),n.d(r,"preorder",(function(){return st})),n.d(r,"prim",(function(){return R})),n.d(r,"topsort",(function(){return it})),n.d(r,"floydWarshall",(function(){return ct}));var i={};n.r(i),n.d(i,"isGraph",(function(){return wt})),n.d(i,"isSimpleGraph",(function(){return _t})),n.d(i,"isNullGraph",(function(){return Et})),n.d(i,"hasSelfLoop",(function(){return St}));var o={};n.r(o),n.d(o,"containAllSameEdges",(function(){return vt})),n.d(o,"containAllSameNodes",(function(){return gt})),n.d(o,"containSameEdges",(function(){return ft})),n.d(o,"containSameNodes",(function(){return lt})),n.d(o,"isGraphComplement",(function(){return Mt})),n.d(o,"isGraphOptionSame",(function(){return pt})),n.d(o,"getSameEdges",(function(){return dt})),n.d(o,"getSameNodes",(function(){return ht})),n.d(o,"isGraphSame",(function(){return yt})),n.d(o,"isGraphContainsAnother",(function(){return mt}));var a,s={};function u(t,e){var n=t.get(e)||0;t.set(e,n+1)}function c(t,e){var n=t.get(e);void 0!==n&&((n-=1)>0?t.set(e,n):t.delete(e))}function l(t,e,n,r){var i=String(e),o=String(n);if(!t&&i>o){var s=i;i=o,o=s}return i+a.EDGE_KEY_DELIM+o+a.EDGE_KEY_DELIM+(void 0===r?a.DEFAULT_EDGE_NAME:r)}function f(t,e,n,r){var i=String(e),o=String(n),a={v:e,w:n};if(!t&&i>o){var s=a.v;a.v=a.w,a.w=s}return void 0!==r&&(a.name=r),a}function h(t,e){return l(t,e.v,e.w,e.name)}function d(t){return"function"==typeof t}n.r(s),n.d(s,"getGraphComplement",(function(){return Ot})),function(t){t.DEFAULT_EDGE_NAME="\0",t.GRAPH_NODE="\0",t.EDGE_KEY_DELIM=""}(a||(a={}));var p=function(t){return t.nodes().map((function(e){var n={id:e,value:t.node(e),parent:t.parent(e)};return void 0===n.value&&delete n.value,void 0===n.parent&&delete n.parent,n}))},g=function(t){return t.edges().map((function(e){var n=t.edge(e),r={v:e.v,w:e.w,value:n,name:e.name};return void 0===r.name&&delete r.name,void 0===r.value&&delete r.value,r}))},v=function(t){var e={options:{directed:t.isDirected(),multigraph:t.isMultigraph(),compound:t.isCompound()},nodes:p(t),edges:g(t),value:t.graph()};return void 0===e.value&&delete e.value,e};function y(t,e){var n=Object.keys(t);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(t);e&&(r=r.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),n.push.apply(n,r)}return n}function m(t){for(var e=1;e0&&void 0!==arguments[0]?arguments[0]:{};x(this,t),this.directed=!0,this.multigraph=!1,this.compound=!1,this.GRAPH_NODE=a.GRAPH_NODE,this.label=void 0,this.nodeCountNum=0,this.edgeCountNum=0,this.defaultNodeLabelFn=function(){},this.defaultEdgeLabelFn=function(){},this.parentMap=void 0,this.childrenMap=void 0,this.nodesLabelMap=new Map,this.inEdgesMap=new Map,this.outEdgesMap=new Map,this.predecessorsMap=new Map,this.successorsMap=new Map,this.edgesMap=new Map,this.edgesLabelsMap=new Map,this.isDirected=function(){return e.directed},this.isMultigraph=function(){return e.multigraph},this.isCompound=function(){return e.compound},this.setGraph=function(t){return e.label=t,e},this.graph=function(){return e.label},this.setDefaultNodeLabel=function(t){return d(t)?e.defaultNodeLabelFn=t:e.defaultNodeLabelFn=function(){return t},e},this.nodeCount=function(){return e.nodeCountNum},this.node=function(t){return e.nodesLabelMap.get(t)},this.nodes=function(){return Array.from(e.nodesLabelMap.keys())},this.sources=function(){return e.nodes().filter((function(t){var n;return!(null===(n=e.inEdgesMap.get(t))||void 0===n?void 0:n.size)}))},this.sinks=function(){return e.nodes().filter((function(t){var n;return!(null===(n=e.outEdgesMap.get(t))||void 0===n?void 0:n.size)}))},this.setNodes=function(t,n){return t.map((function(t){return e.setNode(t,n)})),e},this.hasNode=function(t){return e.nodesLabelMap.has(t)},this.checkCompound=function(){if(!e.isCompound())throw new Error("Cannot construct parent-children relations in a non-compound graph")},this.parent=function(t){if(e.isCompound()){var n,r=null===(n=e.parentMap)||void 0===n?void 0:n.get(t);if(r!==e.GRAPH_NODE)return r}},this.removeFromParentsChildList=function(t){var n=e.parentMap.get(t);e.childrenMap.get(n).delete(t)},this.setParent=function(t,n){var r,i;e.checkCompound();for(var o=void 0===n?e.GRAPH_NODE:n,a=e.parent(o);a;){if(t===a)throw new Error("Setting "+n+" as parent of "+t+" would create a cycle");a=e.parent(a)}n&&e.setNode(n),e.setNode(t),e.removeFromParentsChildList(t),null===(r=e.parentMap)||void 0===r||r.set(t,o);var s=e.childrenMap.get(o);return s.set(t,!0),null===(i=e.childrenMap)||void 0===i||i.set(o,s),e},this.children=function(t){var n=void 0===t?e.GRAPH_NODE:t;if(e.isCompound()){var r,i=null===(r=e.childrenMap)||void 0===r?void 0:r.get(n);return i?Array.from(i.keys()):void 0}return n===e.GRAPH_NODE?e.nodes():t&&e.hasNode(t)?[]:void 0},this.predecessors=function(t){var n=e.predecessorsMap.get(t);return n?Array.from(n.keys()):void 0},this.successors=function(t){var n=e.successorsMap.get(t);return n?Array.from(n.keys()):void 0},this.neighbors=function(t){var n;if(e.hasNode(t))return Array.from(new Set(null===(n=e.predecessors(t))||void 0===n?void 0:n.concat(e.successors(t))))},this.isLeaf=function(t){var n,r;return e.isDirected()?!(null===(r=e.successors(t))||void 0===r?void 0:r.length):!(null===(n=e.neighbors(t))||void 0===n?void 0:n.length)},this.filterNodes=function(n){var r=e.directed,i=e.multigraph,o=e.compound,a=new t({directed:r,multigraph:i,compound:o});if(a.setGraph(e.graph()),e.nodes().forEach((function(t){n(t)&&a.setNode(t,e.node(t))})),e.edges().forEach((function(t){a.hasNode(t.v)&&a.hasNode(t.w)&&a.setEdgeObj(t,e.edge(t))})),o){a.nodes().forEach((function(t){a.setParent(t,function(t){for(var n=e.parent(t);void 0!==n&&!a.hasNode(n);)n=e.parent(n);return n}(t))}))}return a},this.setDefaultEdgeLabel=function(t){return d(t)?e.defaultEdgeLabelFn=t:e.defaultEdgeLabelFn=function(){return t},e},this.edgeCount=function(){return e.edgeCountNum},this.setEdgeObj=function(t,n){return e.setEdge(t.v,t.w,n,t.name)},this.setPath=function(t,n){return t.reduce((function(t,r){return e.setEdge(t,r,n),r})),e},this.edgeFromArgs=function(t,n,r){return e.edge({v:t,w:n,name:r})},this.edge=function(t){return e.edgesLabelsMap.get(h(e.isDirected(),t))},this.hasEdge=function(t,n,r){return e.edgesLabelsMap.has(h(e.isDirected(),{v:t,w:n,name:r}))},this.removeEdgeObj=function(t){var n=t.v,r=t.w,i=t.name;return e.removeEdge(n,r,i)},this.edges=function(){return Array.from(e.edgesMap.values())},this.inEdges=function(t,n){var r=e.inEdgesMap.get(t);if(r)return Array.from(r.values()).filter((function(t){return!n||t.v===n}))},this.outEdges=function(t,n){var r=e.outEdgesMap.get(t);if(r)return Array.from(r.values()).filter((function(t){return!n||t.w===n}))},this.nodeEdges=function(t,n){var r;if(e.hasNode(t))return null===(r=e.inEdges(t,n))||void 0===r?void 0:r.concat(e.outEdges(t,n))},this.toJSON=function(){return v(e)},this.nodeInDegree=function(t){var n=e.inEdgesMap.get(t);return n?n.size:0},this.nodeOutDegree=function(t){var n=e.outEdgesMap.get(t);return n?n.size:0},this.nodeDegree=function(t){return e.nodeInDegree(t)+e.nodeOutDegree(t)},this.source=function(t){return t.v},this.target=function(t){return t.w};var r=m(m({},_),n);this.compound=r.compound,this.directed=r.directed,this.multigraph=r.multigraph,this.compound&&(this.parentMap=new Map,this.childrenMap=new Map)}var e,n,r;return e=t,(n=[{key:"setNode",value:function(t,e){var n,r=this.nodesLabelMap,i=this.defaultNodeLabelFn,o=this.isCompound,a=this.parentMap,s=this.childrenMap,u=this.inEdgesMap,c=this.outEdgesMap,l=this.predecessorsMap,f=this.successorsMap;return r.has(t)?(void 0!==e&&r.set(t,e),this):(r.set(t,e||i(t)),o()&&(null==a||a.set(t,this.GRAPH_NODE),null==s||s.set(t,new Map),(null==s?void 0:s.has(this.GRAPH_NODE))||null==s||s.set(this.GRAPH_NODE,new Map),null==s||null===(n=s.get(this.GRAPH_NODE))||void 0===n||n.set(t,!0)),[u,c,l,f].forEach((function(e){return e.set(t,new Map)})),this.nodeCountNum+=1,this)}},{key:"removeNode",value:function(t){var e=this;if(this.hasNode(t)){var n,r,i,o=function(t){e.removeEdge(t.v,t.w,t.name)},a=this.inEdgesMap,s=this.outEdgesMap,u=this.predecessorsMap,c=this.successorsMap,l=this.nodesLabelMap;this.isCompound()&&(this.removeFromParentsChildList(t),null===(n=this.parentMap)||void 0===n||n.delete(t),null===(r=this.children(t))||void 0===r||r.forEach((function(t){return e.setParent(t)})),null===(i=this.childrenMap)||void 0===i||i.delete(t));var f=a.get(t),h=s.get(t);Array.from(f.values()).forEach((function(t){return o(t)})),Array.from(h.values()).forEach((function(t){return o(t)})),l.delete(t),a.delete(t),s.delete(t),u.delete(t),c.delete(t),this.nodeCountNum-=1}return this}},{key:"setEdge",value:function(t,e,n,r){var i,o,a=f(this.isDirected(),t,e,r),s=h(this.isDirected(),a),c=a.v,l=a.w;if(this.edgesLabelsMap.has(s))return this.edgesLabelsMap.set(s,n),this;if(void 0!==r&&!this.isMultigraph())throw new Error("Cannot set a named edge when isMultigraph = false");this.setNode(c),this.setNode(l),this.edgesLabelsMap.set(s,n||this.defaultEdgeLabelFn(c,l,r)),Object.freeze(a),this.edgesMap.set(s,a);var d=this.predecessorsMap.get(l),p=this.successorsMap.get(c);return u(d,c),u(p,l),null===(i=this.inEdgesMap.get(l))||void 0===i||i.set(s,a),null===(o=this.outEdgesMap.get(c))||void 0===o||o.set(s,a),this.edgeCountNum+=1,this}},{key:"removeEdge",value:function(t,e,n){var r=l(this.isDirected(),t,e,n);if(this.edgesMap.get(r)){var i=f(this.isDirected(),t,e,n),o=i.v,a=i.w;this.edgesLabelsMap.delete(r),this.edgesMap.delete(r);var s=this.predecessorsMap.get(a),u=this.successorsMap.get(o);c(s,o),c(u,a),this.inEdgesMap.get(a).delete(r),this.outEdgesMap.get(o).delete(r),this.edgeCountNum-=1}return this}}])&&w(e.prototype,n),r&&w(e,r),Object.defineProperty(e,"prototype",{writable:!1}),t}();function S(t){return(S="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function M(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function O(t,e){for(var n=0;n-1&&this.eventPool[t].splice(n,1)}}},{key:"emitEvent",value:function(t){for(var e=arguments.length,n=new Array(e>1?e-1:0),r=1;r>1])||void 0===a?void 0:a.priority)e.arr[r].priority)throw new Error("New priority is greater than current priority.Key: ".concat(t," Old: + ").concat(e.arr[r].priority," New: ").concat(n));e.arr[r].priority=n,e.innerDecrease(r)}})),R=function(t,e){var n,r=new E,i=new Map,o=new L;function a(t){var r=t.v===n?t.w:t.v,a=o.priority(r);if(void 0!==a){var s=e(t);s0;){var u;if(n=o.removeMin(),i.has(n))r.setEdge(n,i.get(n));else{if(s)throw new Error("Input graph is not connected: "+t.graph());s=!0}null===(u=t.nodeEdges(n))||void 0===u||u.forEach(a)}return r},B=function(t){var e=new Set,n=[];return t.nodes().forEach((function(r){for(var i=[],o=[r];o.length>0;){var a,s,u=o.pop();if(!e.has(u))e.add(u),i.push(u),null===(a=t.successors(u))||void 0===a||a.forEach((function(t){return o.push(t)})),null===(s=t.predecessors(u))||void 0===s||s.forEach((function(t){return o.push(t)}))}i.length&&n.push(i)})),n},F=function(t,e,n){var r=Array.isArray(e)?e:[e],i=function(e){return t.isDirected()?t.successors(e):t.neighbors(e)},o=[],a=[];return r.forEach((function(e){if(!t.hasNode(e))throw new Error("Graph does not have node: "+e);!function t(e,n,r,i,o,a){i.includes(n)||(i.push(n),r||a.push(n),o(n).forEach((function(n){return t(e,n,r,i,o,a)})),r&&a.push(n))}(t,e,"post"===n,a,i,o)})),o};function z(t,e){return function(t){if(Array.isArray(t))return t}(t)||function(t,e){var n=null==t?null:"undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"];if(null==n)return;var r,i,o=[],a=!0,s=!1;try{for(n=n.call(t);!(a=(r=n.next()).done)&&(o.push(r.value),!e||o.length!==e);a=!0);}catch(t){s=!0,i=t}finally{try{a||null==n.return||n.return()}finally{if(s)throw i}}return o}(t,e)||function(t,e){if(!t)return;if("string"==typeof t)return G(t,e);var n=Object.prototype.toString.call(t).slice(8,-1);"Object"===n&&t.constructor&&(n=t.constructor.name);if("Map"===n||"Set"===n)return Array.from(t);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return G(t,e)}(t,e)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function G(t,e){(null==e||e>t.length)&&(e=t.length);for(var n=0,r=new Array(e);n0&&(i=s.removeMin(),!(o=a.get(i))||o.distance!==Number.POSITIVE_INFINITY);)r(i).forEach(u);var c={};return Array.from(a.entries()).forEach((function(t){var e=z(t,2),n=e[0],r=e[1];return c[String(n)]=r,c})),c},X=function(t,e,n,r){return U(t,e,n||Y,r||function(e){return t.outEdges(e)})},W=function(t,e,n){var r={};return t.nodes().forEach((function(i){return r[String(i)]=X(t,i,e,n),r})),r},V=function(t){var e=0,n=[],r=new Map,i=[];return t.nodes().forEach((function(o){r.has(o)||function o(a){var s,u={onStack:!0,lowlink:e,index:e};if(r.set(a,u),e+=1,n.push(a),null===(s=t.successors(a))||void 0===s||s.forEach((function(t){var e;if(r.has(t)){if(null===(e=r.get(t))||void 0===e?void 0:e.onStack){var n=r.get(t);u.lowlink=Math.min(u.lowlink,n.index)}}else{o(t);var i=r.get(t);u.lowlink=Math.min(u.lowlink,i.lowlink)}})),u.lowlink===u.index){var c,l=[];do{c=n.pop(),r.get(c).onStack=!1,l.push(c)}while(a!==c);i.push(l)}}(o)})),i},H=function(t){return V(t).filter((function(e){return e.length>1||1===e.length&&t.hasEdge(e[0],e[0])}))};function q(t){return(q="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Z(t,e){for(var n=0;nt.length)&&(e=t.length);for(var n=0,r=new Array(e);n0)}));return i.length>0?Object(o.a)(i,(function(i){var o=i.getBBox(),a=o.minX,s=o.maxX,u=o.minY,c=o.maxY;ae&&(e=s),ur&&(r=c)})):(t=0,e=0,n=0,r=0),{x:t,y:n,minX:t,minY:n,maxX:e,maxY:r,width:e-t,height:r-n}},e.prototype.getCanvasBBox=function(){var t=1/0,e=-1/0,n=1/0,r=-1/0,i=this.getChildren().filter((function(t){return t.get("visible")&&(!t.isGroup()||t.isGroup()&&t.getChildren().length>0)}));return i.length>0?Object(o.a)(i,(function(i){var o=i.getCanvasBBox(),a=o.minX,s=o.maxX,u=o.minY,c=o.maxY;ae&&(e=s),ur&&(r=c)})):(t=0,e=0,n=0,r=0),{x:t,y:n,minX:t,minY:n,maxX:e,maxY:r,width:e-t,height:r-n}},e.prototype.getDefaultCfg=function(){var e=t.prototype.getDefaultCfg.call(this);return e.children=[],e},e.prototype.onAttrChange=function(e,n,r){if(t.prototype.onAttrChange.call(this,e,n,r),"matrix"===e){var i=this.getTotalMatrix();this._applyChildrenMarix(i)}},e.prototype.applyMatrix=function(e){var n=this.getTotalMatrix();t.prototype.applyMatrix.call(this,e);var r=this.getTotalMatrix();r!==n&&this._applyChildrenMarix(r)},e.prototype._applyChildrenMarix=function(t){var e=this.getChildren();Object(o.a)(e,(function(e){e.applyMatrix(t)}))},e.prototype.addShape=function(){for(var t=[],e=0;e=0;a--){var s=t[a];if(Object(o.b)(s)&&(s.isGroup()?i=s.getShape(e,n,r):s.isHit(e,n)&&(i=s)),i)break}return i},e.prototype.add=function(t){var e=this.getCanvas(),n=this.getChildren(),r=this.get("timeline"),i=t.getParent();i&&function(t,e,n){void 0===n&&(n=!0),n?e.destroy():(e.set("parent",null),e.set("canvas",null)),Object(o.j)(t.getChildren(),e)}(i,t,!1),t.set("parent",this),e&&function t(e,n){if(e.set("canvas",n),e.isGroup()){var r=e.get("children");r.length&&r.forEach((function(e){t(e,n)}))}}(t,e),r&&function t(e,n){if(e.set("timeline",n),e.isGroup()){var r=e.get("children");r.length&&r.forEach((function(e){t(e,n)}))}}(t,r),n.push(t),t.onCanvasChange("add"),this._applyElementMatrix(t)},e.prototype._applyElementMatrix=function(t){var e=this.getTotalMatrix();e&&t.applyMatrix(e)},e.prototype.getChildren=function(){return this.get("children")},e.prototype.sort=function(){var t,e=this.getChildren();Object(o.a)(e,(function(t,e){return t._INDEX=e,t})),e.sort((t=function(t,e){return t.get("zIndex")-e.get("zIndex")},function(e,n){var r=t(e,n);return 0===r?e._INDEX-n._INDEX:r})),this.onCanvasChange("sort")},e.prototype.clear=function(){if(this.set("clearing",!0),!this.destroyed){for(var t=this.getChildren(),e=t.length-1;e>=0;e--)t[e].destroy();this.set("children",[]),this.onCanvasChange("clear"),this.set("clearing",!1)}},e.prototype.destroy=function(){this.get("destroyed")||(this.clear(),t.prototype.destroy.call(this))},e.prototype.getFirst=function(){return this.getChildByIndex(0)},e.prototype.getLast=function(){var t=this.getChildren();return this.getChildByIndex(t.length-1)},e.prototype.getChildByIndex=function(t){return this.getChildren()[t]},e.prototype.getCount=function(){return this.getChildren().length},e.prototype.contain=function(t){return this.getChildren().indexOf(t)>-1},e.prototype.removeChild=function(t,e){void 0===e&&(e=!0),this.contain(t)&&t.remove(e)},e.prototype.findAll=function(t){var e=[],n=this.getChildren();return Object(o.a)(n,(function(n){t(n)&&e.push(n),n.isGroup()&&(e=e.concat(n.findAll(t)))})),e},e.prototype.find=function(t){var e=null,n=this.getChildren();return Object(o.a)(n,(function(n){if(t(n)?e=n:n.isGroup()&&(e=n.find(t)),e)return!1})),e},e.prototype.findById=function(t){return this.find((function(e){return e.get("id")===t}))},e.prototype.findByClassName=function(t){return this.find((function(e){return e.get("className")===t}))},e.prototype.findAllByName=function(t){return this.findAll((function(e){return e.get("name")===t}))},e}(i.a);e.a=s},function(t,e,n){"use strict";var r=n(1),i=n(0),o=n(4),a=n(9),s=n(22),u=n(49),c=o.a.transform,l=["zIndex","capture","visible","type"],f=["repeat"];function h(t,e){var n={},r=e.attrs;for(var i in t)n[i]=r[i];return n}function d(t,e){var n={},r=e.attr();return Object(i.each)(t,(function(t,e){-1!==f.indexOf(e)||Object(i.isEqual)(r[e],t)||(n[e]=t)})),n}function p(t,e){if(e.onFrame)return t;var n=e.startTime,r=e.delay,o=e.duration,a=Object.prototype.hasOwnProperty;return Object(i.each)(t,(function(t){n+rt.delay&&Object(i.each)(e.toAttrs,(function(e,n){a.call(t.toAttrs,n)&&(delete t.toAttrs[n],delete t.fromAttrs[n])}))})),t}var g=function(t){function e(e){var n=t.call(this,e)||this;n.attrs={};var r=n.getDefaultAttrs();return Object(i.mix)(r,e.attrs),n.attrs=r,n.initAttrs(r),n.initAnimate(),n}return Object(r.__extends)(e,t),e.prototype.getDefaultCfg=function(){return{visible:!0,capture:!0,zIndex:0}},e.prototype.getDefaultAttrs=function(){return{matrix:this.getDefaultMatrix(),opacity:1}},e.prototype.onCanvasChange=function(t){},e.prototype.initAttrs=function(t){},e.prototype.initAnimate=function(){this.set("animable",!0),this.set("animating",!1)},e.prototype.isGroup=function(){return!1},e.prototype.getParent=function(){return this.get("parent")},e.prototype.getCanvas=function(){return this.get("canvas")},e.prototype.attr=function(){for(var t,e=[],n=0;n0?r=p(r,_):n.addAnimator(this),r.push(_),this.set("animations",r),this.set("_pause",{isPaused:!1})}},e.prototype.stopAnimate=function(t){var e=this;void 0===t&&(t=!0);var n=this.get("animations");Object(i.each)(n,(function(n){t&&(n.onFrame?e.attr(n.onFrame(1)):e.attr(n.toAttrs)),n.callback&&n.callback()})),this.set("animating",!1),this.set("animations",[])},e.prototype.pauseAnimate=function(){var t=this.get("timeline"),e=this.get("animations"),n=t.getTime();return Object(i.each)(e,(function(t){t._paused=!0,t._pauseTime=n,t.pauseCallback&&t.pauseCallback()})),this.set("_pause",{isPaused:!0,pauseTime:n}),this},e.prototype.resumeAnimate=function(){var t=this.get("timeline").getTime(),e=this.get("animations"),n=this.get("_pause").pauseTime;return Object(i.each)(e,(function(e){e.startTime=e.startTime+(t-n),e._paused=!1,e._pauseTime=null,e.resumeCallback&&e.resumeCallback()})),this.set("_pause",{isPaused:!1}),this.set("animations",e),this},e.prototype.emitDelegation=function(t,e){var n,r=this,o=e.propagationPath;this.getEvents();"mouseenter"===t?n=e.fromShape:"mouseleave"===t&&(n=e.toShape);for(var s=function(t){var s=o[t],c=s.get("name");if(c){if((s.isGroup()||s.isCanvas&&s.isCanvas())&&n&&Object(a.g)(s,n))return"break";Object(i.isArray)(c)?Object(i.each)(c,(function(t){r.emitDelegateEvent(s,t,e)})):u.emitDelegateEvent(s,c,e)}},u=this,c=0;c=0&&s<.5*Math.PI?(r={x:l.minX,y:l.minY},o={x:l.maxX,y:l.maxY}):.5*Math.PI<=s&&sh[e.id]+s?(h[a]=h[e.id]+s,d[a]=[e.id]):h[a]===h[e.id]+s&&d[a].push(e.id)}))},v=0;ve[r][o]+e[o][i]&&(e[r][i]=e[r][o]+e[o][i]);return e};e.getAdjMatrix=function(t,n){var r=t.nodes,i=t.edges,o=[],a={};if(!r)throw new Error("invalid nodes data!");return r&&r.forEach((function(t,e){a[t.id]=e;o.push([])})),null==i||i.forEach((function(t){var r=(0,e.getEdgeTerminal)(t,"source"),i=(0,e.getEdgeTerminal)(t,"target"),s=a[r],u=a[i];void 0!==s&&void 0!==u&&(o[s][u]=1,n||(o[u][s]=1))})),o};e.scaleMatrix=function(t,e){var n=[];return t.forEach((function(t){var r=[];t.forEach((function(t){r.push(t*e)})),n.push(r)})),n};e.traverseTreeUp=function(t,e){"function"==typeof e&&function t(e,n){if(e&&e.children)for(var r=e.children.length-1;r>=0;r--)if(!t(e.children[r],n))return;return!!n(e)}(t,e)};e.getLayoutBBox=function(t){var e=1/0,n=1/0,o=-1/0,a=-1/0;return t.forEach((function(t){var s=t.size;(0,r.isArray)(s)?1===s.length&&(s=[s[0],s[0]]):(0,i.isNumber)(s)?s=[s,s]:(void 0===s||isNaN(s))&&(s=[30,30]);var u=[s[0]/2,s[1]/2],c=t.x-u[0],l=t.x+u[0],f=t.y-u[1],h=t.y+u[1];e>c&&(e=c),n>f&&(n=f),oe.x&&(N=e.x),P>e.y&&(P=e.y)})),w.edges().forEach((function(t){var e;null===(e=w.edge(t).points)||void 0===e||e.forEach((function(t){N>t.x&&(N=t.x),P>t.y&&(P=t.y)}))})),T[0]=p[0]-N,T[1]=p[1]-P}var D="LR"===h||"RL"===h;if(g){var L=this.focusNode,R=this.ranksep,B=this.getRadialPos,F=(0,s.isString)(L)?L:null==L?void 0:L.id,z=F?null===(r=w.node(F))||void 0===r?void 0:r._rank:0,G=[],Y=D?"y":"x",U=D?"height":"width",X=1/0,W=-1/0;w.nodes().forEach((function(t){var e=w.node(t);if(o.nodeMap[t]){var n=k(o.nodeMap[t]);if(0===z)G[e._rank]||(G[e._rank]={nodes:[],totalWidth:0,maxSize:-1/0}),G[e._rank].nodes.push(t),G[e._rank].totalWidth+=2*n+e[U],G[e._rank].maxSizeW&&(W=s)}}));var V=R||50,H={},q=(W-X)/.9,Z=[.5*(X+W-q),.5*(X+W+q)],K=function(t,e,n,r){void 0===n&&(n=-1/0),void 0===r&&(r=[0,1]);var i=n;return t.forEach((function(t){var n=w.node(t);H[t]=e;var a=B(n[Y],Z,q,e,r),s=a.x,u=a.y;if(o.nodeMap[t]){o.nodeMap[t].x=s+T[0],o.nodeMap[t].y=u+T[1],o.nodeMap[t]._order=n._order;var c=O(o.nodeMap[t]);i=i}))}:function(t,e,n){var r=Math.max(e.x,n.x),i=Math.min(e.x,n.x);return t.filter((function(t){return t.x<=r&&t.x>=i}))};w.edges().forEach((function(t){var e,n=w.edge(t),r=x.findIndex((function(e){var n=(0,s.getEdgeTerminal)(e,"source"),r=(0,s.getEdgeTerminal)(e,"target");return n===t.v&&r===t.w}));if(!(r<=-1)&&o.edgeLabelSpace&&o.controlPoints&&"loop"!==x[r].type){null===(e=null==n?void 0:n.points)||void 0===e||e.forEach((function(t){t.x+=T[0],t.y+=T[1]}));var i=o.nodeMap[t.v],a=o.nodeMap[t.w];x[r].controlPoints=f(null==n?void 0:n.points,i,a,tt,D,et,nt)}}))}return o.onLayoutEnd&&o.onLayoutEnd(),{nodes:u,edges:x}}},e.prototype.getRadialPos=function(t,e,n,r,i){void 0===i&&(i=[0,1]);var o=(t-e[0])/n,a=2*(o=o*(i[1]-i[0])+i[0])*Math.PI;return{x:Math.cos(a)*r,y:Math.sin(a)*r}},e.prototype.getType=function(){return"dagre"},e}(u.Base);e.DagreLayout=l;var f=function(t,e,n,r,i,o,a){var s=(null==t?void 0:t.slice(1,t.length-1))||[];if(e&&n){var u=e.x,c=e.y,l=n.x,f=n.y;if(i&&(u=e.y,c=e.x,l=n.y,f=n.x),f!==c&&u!==l){var h=r.indexOf(c),d=r[h+1];if(d){var p=s[0],g=i?{x:(c+d)/2,y:(null==p?void 0:p.y)||l}:{x:(null==p?void 0:p.x)||l,y:(c+d)/2};p&&!o(p,g)||s.unshift(g)}var v=r.indexOf(f),y=Math.abs(v-h);if(1===y)(s=a(s,e,n)).length||s.push(i?{x:(c+f)/2,y:u}:{x:u,y:(c+f)/2});else if(y>1){var m=r[v-1];if(m){var b=s[s.length-1],x=i?{x:(f+m)/2,y:(null==b?void 0:b.y)||l}:{x:(null==b?void 0:b.x)||u,y:(f+m)/2};b&&!o(b,x)||s.push(x)}}}}return s}},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.slack=e.longestPathWithLayer=e.longestPath=void 0;var r=function(t){var e,n={};null===(e=t.sources())||void 0===e||e.forEach((function(e){return function e(r){var i,o,a=t.node(r);return a?n[r]?a.rank:(n[r]=!0,null===(i=t.outEdges(r))||void 0===i||i.forEach((function(n){var r=e(n.w)-t.edge(n).minlen;r&&(void 0===o||rd+l||ip+l||of.index){var h=d-s.x-s.vx,y=p-s.y-s.vy,m=h*h+y*y;mt.r&&(t.r=t[e].r)}function d(){if(e){var r,i,o=e.length;for(n=new Array(o),r=0;r=0&&(n=t.slice(r+1),t=t.slice(0,r)),t&&!e.hasOwnProperty(t))throw new Error("unknown type: "+t);return{type:t,name:n}}))}function m(t,e){for(var n,r=0,i=t.length;r0)for(var n,r,i=new Array(n),o=0;o=0&&e._call.call(null,t),e=e._next;--S}()}finally{S=0,function(){var t,e,n=_,r=1/0;for(;n;)n._call?(r>n._time&&(r=n._time),t=n,n=n._next):(e=n._next,n._next=null,n=t?t._next=e:_=e);E=t,B(r)}(),A=0}}function R(){var t=j.now(),e=t-k;e>1e3&&(C-=e,k=t)}function B(t){S||(M&&(M=clearTimeout(M)),t-A>24?(t<1/0&&(M=setTimeout(L,t-j.now()-C)),O&&(O=clearInterval(O))):(O||(k=j.now(),O=setInterval(R,1e3)),S=1,I(L)))}P.prototype=D.prototype={constructor:P,restart:function(t,e,n){if("function"!=typeof t)throw new TypeError("callback is not a function");n=(null==n?T():+n)+(null==e?0:+e),this._next||E===this||(E?E._next=this:_=this,E=this),this._call=t,this._time=n,B()},stop:function(){this._call&&(this._call=null,this._time=1/0,B())}};var F=4294967296;function z(t){return t.x}function G(t){return t.y}var Y=Math.PI*(3-Math.sqrt(5)),U=function(t){var e,n,r=1,i=.001,o=1-Math.pow(i,1/300),a=0,s=.6,u=new Map,c=D(h),l=x("tick","end"),f=(n=1,function(){return(n=(1664525*n+1013904223)%F)/F});function h(){d(),l.call("tick",e),r1?(null==n?u.delete(t):u.set(t,g(n)),e):u.get(t)},find:function(e,n,r){var i,o,a,s,u,c=0,l=t.length;for(null==r?r=1/0:r*=r,c=0;c1?(l.on(t,n),e):l.on(t)}}},X=function(){var t,e,n,r,s,u=o(-30),c=1,l=1/0,f=.81;function h(n){var o,a=t.length,s=Object(i.a)(t,z,G).visitAfter(p);for(r=n,o=0;o=l)){(t.data!==e||t.next)&&(0===h&&(g+=(h=a(n))*h),0===d&&(g+=(d=a(n))*d),gMath.PI/2?Math.PI-c:c,l=l>Math.PI/2?Math.PI-l:l,{xExtra:Math.cos(u/2-c)*(e/2*(1/Math.sin(u/2)))-e/2||0,yExtra:Math.cos(l-u/2)*(e/2*(1/Math.sin(u/2)))-e/2||0}}i("rect",a),i("image",a),i("circle",s),i("marker",s),i("polyline",(function(t){for(var e=t.attr().points,n=[],r=[],i=0;i=0;return n?o?2*Math.PI-i:i:o?i:2*Math.PI-i},e.vertical=function(t,e,n){return n?(t[0]=e[1],t[1]=-1*e[0]):(t[0]=-1*e[1],t[1]=e[0]),t}},function(t,e){},function(t,e){},function(t,e,n){"use strict";var r=n(1),i=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return Object(r.__extends)(e,t),e.prototype.isGroup=function(){return!0},e.prototype.isEntityGroup=function(){return!1},e.prototype.clone=function(){for(var e=t.prototype.clone.call(this),n=this.getChildren(),r=0;r=t&&n.minY<=e&&n.maxY>=e},e.prototype.afterAttrsChange=function(e){t.prototype.afterAttrsChange.call(this,e),this.clearCacheBBox()},e.prototype.getBBox=function(){var t=this.cfg.bbox;return t||(t=this.calculateBBox(),this.set("bbox",t)),t},e.prototype.getCanvasBBox=function(){var t=this.cfg.canvasBBox;return t||(t=this.calculateCanvasBBox(),this.set("canvasBBox",t)),t},e.prototype.applyMatrix=function(e){t.prototype.applyMatrix.call(this,e),this.set("canvasBBox",null)},e.prototype.calculateCanvasBBox=function(){var t=this.getBBox(),e=this.getTotalMatrix(),n=t.minX,r=t.minY,i=t.maxX,a=t.maxY;if(e){var s=Object(o.c)(e,[t.minX,t.minY]),u=Object(o.c)(e,[t.maxX,t.minY]),c=Object(o.c)(e,[t.minX,t.maxY]),l=Object(o.c)(e,[t.maxX,t.maxY]);n=Math.min(s[0],u[0],c[0],l[0]),i=Math.max(s[0],u[0],c[0],l[0]),r=Math.min(s[1],u[1],c[1],l[1]),a=Math.max(s[1],u[1],c[1],l[1])}var f=this.attrs;if(f.shadowColor){var h=f.shadowBlur,d=void 0===h?0:h,p=f.shadowOffsetX,g=void 0===p?0:p,v=f.shadowOffsetY,y=void 0===v?0:v,m=n-d+g,b=i+d+g,x=r-d+y,w=a+d+y;n=Math.min(n,m),i=Math.max(i,b),r=Math.min(r,x),a=Math.max(a,w)}return{x:n,y:r,minX:n,minY:r,maxX:i,maxY:a,width:i-n,height:a-r}},e.prototype.clearCacheBBox=function(){this.set("bbox",null),this.set("canvasBBox",null)},e.prototype.isClipShape=function(){return this.get("isClipShape")},e.prototype.isInShape=function(t,e){return!1},e.prototype.isOnlyHitBox=function(){return!1},e.prototype.isHit=function(t,e){var n=this.get("startArrowShape"),r=this.get("endArrowShape"),i=[t,e,1],o=(i=this.invertFromMatrix(i))[0],a=i[1],s=this._isInBBox(o,a);if(this.isOnlyHitBox())return s;if(s&&!this.isClipped(o,a)){if(this.isInShape(o,a))return!0;if(n&&n.isHit(o,a))return!0;if(r&&r.isHit(o,a))return!0}return!1},e}(i.a);e.a=a},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(t,e){return e?o(t):i(t)},e.detectStrongConnectComponents=e.detectConnectedComponents=void 0;var r=n(27),i=function(t){for(var e=t.nodes,n=void 0===e?[]:e,i=t.edges,o=void 0===i?[]:i,a=[],s={},u=[],c=function t(e){u.push(e),s[e.id]=!0;for(var i=(0,r.getNeighbors)(e.id,o),a=function(e){var r=i[e];if(!s[r]){var o=n.filter((function(t){return t.id===r}));o.length>0&&t(o[0])}},c=0;c0;)h.push(u.pop());a.push(h)}}return a};e.detectConnectedComponents=i;var o=function(t){for(var e=t.nodes,n=void 0===e?[]:e,i=t.edges,o=void 0===i?[]:i,a=[],s={},u={},c={},l=[],f=0,h=function t(e){u[e.id]=f,c[e.id]=f,f+=1,a.push(e),s[e.id]=!0;for(var i=(0,r.getNeighbors)(e.id,o,"target").filter((function(t){return n.map((function(t){return t.id})).indexOf(t)>-1})),h=function(r){var o=i[r];if(u[o]||0===u[o])s[o]&&(c[e.id]=Math.min(c[e.id],u[o]));else{var a=n.filter((function(t){return t.id===o}));a.length>0&&t(a[0]),c[e.id]=Math.min(c[e.id],c[o])}},d=0;d0;){var g=a.pop();if(s[g.id]=!1,p.push(g),g===e)break}p.length>0&&l.push(p)}},d=0,p=n;dr[a][u]+r[u][s]&&(r[a][s]=r[a][u]+r[u][s]);return r};e.default=o},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r=n(0),i=function(){function t(t){this.arr=t}return t.prototype.getArr=function(){return this.arr||[]},t.prototype.add=function(e){var n,r=e.arr;if(!(null===(n=this.arr)||void 0===n?void 0:n.length))return new t(r);if(!(null==r?void 0:r.length))return new t(this.arr);if(this.arr.length===r.length){var i=[];for(var o in this.arr)i[o]=this.arr[o]+r[o];return new t(i)}},t.prototype.subtract=function(e){var n,r=e.arr;if(!(null===(n=this.arr)||void 0===n?void 0:n.length))return new t(r);if(!(null==r?void 0:r.length))return new t(this.arr);if(this.arr.length===r.length){var i=[];for(var o in this.arr)i[o]=this.arr[o]-r[o];return new t(i)}},t.prototype.avg=function(e){var n=[];if(0!==e)for(var r in this.arr)n[r]=this.arr[r]/e;return new t(n)},t.prototype.negate=function(){var e=[];for(var n in this.arr)e[n]=-this.arr[n];return new t(e)},t.prototype.squareEuclideanDistance=function(t){var e,n=t.arr;if(!(null===(e=this.arr)||void 0===e?void 0:e.length)||!(null==n?void 0:n.length))return 0;if(this.arr.length===n.length){var r=0;for(var i in this.arr)r+=Math.pow(this.arr[i]-t.arr[i],2);return r}},t.prototype.euclideanDistance=function(t){var e,n=t.arr;if(!(null===(e=this.arr)||void 0===e?void 0:e.length)||!(null==n?void 0:n.length))return 0;if(this.arr.length===n.length){var r=0;for(var i in this.arr)r+=Math.pow(this.arr[i]-t.arr[i],2);return Math.sqrt(r)}console.error("The two vectors are unequal in length.")},t.prototype.normalize=function(){var e=[],n=(0,r.clone)(this.arr);n.sort((function(t,e){return t-e}));var i=n[n.length-1],o=n[0];for(var a in this.arr)e[a]=(this.arr[a]-o)/(i-o);return new t(e)},t.prototype.norm2=function(){var t;if(!(null===(t=this.arr)||void 0===t?void 0:t.length))return 0;var e=0;for(var n in this.arr)e+=Math.pow(this.arr[n],2);return Math.sqrt(e)},t.prototype.dot=function(t){var e,n=t.arr;if(!(null===(e=this.arr)||void 0===e?void 0:e.length)||!(null==n?void 0:n.length))return 0;if(this.arr.length===n.length){var r=0;for(var i in this.arr)r+=this.arr[i]*t.arr[i];return r}console.error("The two vectors are unequal in length.")},t.prototype.equal=function(t){var e,n=t.arr;if((null===(e=this.arr)||void 0===e?void 0:e.length)!==(null==n?void 0:n.length))return!1;for(var r in this.arr)if(this.arr[r]!==n[r])return!1;return!0},t}();e.default=i},function(t,e,n){var r=n(151),i={};for(var o in r)r.hasOwnProperty(o)&&(i[r[o]]=o);var a=t.exports={rgb:{channels:3,labels:"rgb"},hsl:{channels:3,labels:"hsl"},hsv:{channels:3,labels:"hsv"},hwb:{channels:3,labels:"hwb"},cmyk:{channels:4,labels:"cmyk"},xyz:{channels:3,labels:"xyz"},lab:{channels:3,labels:"lab"},lch:{channels:3,labels:"lch"},hex:{channels:1,labels:["hex"]},keyword:{channels:1,labels:["keyword"]},ansi16:{channels:1,labels:["ansi16"]},ansi256:{channels:1,labels:["ansi256"]},hcg:{channels:3,labels:["h","c","g"]},apple:{channels:3,labels:["r16","g16","b16"]},gray:{channels:1,labels:["gray"]}};for(var s in a)if(a.hasOwnProperty(s)){if(!("channels"in a[s]))throw new Error("missing channels property: "+s);if(!("labels"in a[s]))throw new Error("missing channel labels property: "+s);if(a[s].labels.length!==a[s].channels)throw new Error("channel and label counts mismatch: "+s);var u=a[s].channels,c=a[s].labels;delete a[s].channels,delete a[s].labels,Object.defineProperty(a[s],"channels",{value:u}),Object.defineProperty(a[s],"labels",{value:c})}a.rgb.hsl=function(t){var e,n,r=t[0]/255,i=t[1]/255,o=t[2]/255,a=Math.min(r,i,o),s=Math.max(r,i,o),u=s-a;return s===a?e=0:r===s?e=(i-o)/u:i===s?e=2+(o-r)/u:o===s&&(e=4+(r-i)/u),(e=Math.min(60*e,360))<0&&(e+=360),n=(a+s)/2,[e,100*(s===a?0:n<=.5?u/(s+a):u/(2-s-a)),100*n]},a.rgb.hsv=function(t){var e,n,r,i,o,a=t[0]/255,s=t[1]/255,u=t[2]/255,c=Math.max(a,s,u),l=c-Math.min(a,s,u),f=function(t){return(c-t)/6/l+.5};return 0===l?i=o=0:(o=l/c,e=f(a),n=f(s),r=f(u),a===c?i=r-n:s===c?i=1/3+e-r:u===c&&(i=2/3+n-e),i<0?i+=1:i>1&&(i-=1)),[360*i,100*o,100*c]},a.rgb.hwb=function(t){var e=t[0],n=t[1],r=t[2];return[a.rgb.hsl(t)[0],100*(1/255*Math.min(e,Math.min(n,r))),100*(r=1-1/255*Math.max(e,Math.max(n,r)))]},a.rgb.cmyk=function(t){var e,n=t[0]/255,r=t[1]/255,i=t[2]/255;return[100*((1-n-(e=Math.min(1-n,1-r,1-i)))/(1-e)||0),100*((1-r-e)/(1-e)||0),100*((1-i-e)/(1-e)||0),100*e]},a.rgb.keyword=function(t){var e=i[t];if(e)return e;var n,o,a,s=1/0;for(var u in r)if(r.hasOwnProperty(u)){var c=r[u],l=(o=t,a=c,Math.pow(o[0]-a[0],2)+Math.pow(o[1]-a[1],2)+Math.pow(o[2]-a[2],2));l.04045?Math.pow((e+.055)/1.055,2.4):e/12.92)+.3576*(n=n>.04045?Math.pow((n+.055)/1.055,2.4):n/12.92)+.1805*(r=r>.04045?Math.pow((r+.055)/1.055,2.4):r/12.92)),100*(.2126*e+.7152*n+.0722*r),100*(.0193*e+.1192*n+.9505*r)]},a.rgb.lab=function(t){var e=a.rgb.xyz(t),n=e[0],r=e[1],i=e[2];return r/=100,i/=108.883,n=(n/=95.047)>.008856?Math.pow(n,1/3):7.787*n+16/116,[116*(r=r>.008856?Math.pow(r,1/3):7.787*r+16/116)-16,500*(n-r),200*(r-(i=i>.008856?Math.pow(i,1/3):7.787*i+16/116))]},a.hsl.rgb=function(t){var e,n,r,i,o,a=t[0]/360,s=t[1]/100,u=t[2]/100;if(0===s)return[o=255*u,o,o];e=2*u-(n=u<.5?u*(1+s):u+s-u*s),i=[0,0,0];for(var c=0;c<3;c++)(r=a+1/3*-(c-1))<0&&r++,r>1&&r--,o=6*r<1?e+6*(n-e)*r:2*r<1?n:3*r<2?e+(n-e)*(2/3-r)*6:e,i[c]=255*o;return i},a.hsl.hsv=function(t){var e=t[0],n=t[1]/100,r=t[2]/100,i=n,o=Math.max(r,.01);return n*=(r*=2)<=1?r:2-r,i*=o<=1?o:2-o,[e,100*(0===r?2*i/(o+i):2*n/(r+n)),100*((r+n)/2)]},a.hsv.rgb=function(t){var e=t[0]/60,n=t[1]/100,r=t[2]/100,i=Math.floor(e)%6,o=e-Math.floor(e),a=255*r*(1-n),s=255*r*(1-n*o),u=255*r*(1-n*(1-o));switch(r*=255,i){case 0:return[r,u,a];case 1:return[s,r,a];case 2:return[a,r,u];case 3:return[a,s,r];case 4:return[u,a,r];case 5:return[r,a,s]}},a.hsv.hsl=function(t){var e,n,r,i=t[0],o=t[1]/100,a=t[2]/100,s=Math.max(a,.01);return r=(2-o)*a,n=o*s,[i,100*(n=(n/=(e=(2-o)*s)<=1?e:2-e)||0),100*(r/=2)]},a.hwb.rgb=function(t){var e,n,r,i,o,a,s,u=t[0]/360,c=t[1]/100,l=t[2]/100,f=c+l;switch(f>1&&(c/=f,l/=f),r=6*u-(e=Math.floor(6*u)),0!=(1&e)&&(r=1-r),i=c+r*((n=1-l)-c),e){default:case 6:case 0:o=n,a=i,s=c;break;case 1:o=i,a=n,s=c;break;case 2:o=c,a=n,s=i;break;case 3:o=c,a=i,s=n;break;case 4:o=i,a=c,s=n;break;case 5:o=n,a=c,s=i}return[255*o,255*a,255*s]},a.cmyk.rgb=function(t){var e=t[0]/100,n=t[1]/100,r=t[2]/100,i=t[3]/100;return[255*(1-Math.min(1,e*(1-i)+i)),255*(1-Math.min(1,n*(1-i)+i)),255*(1-Math.min(1,r*(1-i)+i))]},a.xyz.rgb=function(t){var e,n,r,i=t[0]/100,o=t[1]/100,a=t[2]/100;return n=-.9689*i+1.8758*o+.0415*a,r=.0557*i+-.204*o+1.057*a,e=(e=3.2406*i+-1.5372*o+-.4986*a)>.0031308?1.055*Math.pow(e,1/2.4)-.055:12.92*e,n=n>.0031308?1.055*Math.pow(n,1/2.4)-.055:12.92*n,r=r>.0031308?1.055*Math.pow(r,1/2.4)-.055:12.92*r,[255*(e=Math.min(Math.max(0,e),1)),255*(n=Math.min(Math.max(0,n),1)),255*(r=Math.min(Math.max(0,r),1))]},a.xyz.lab=function(t){var e=t[0],n=t[1],r=t[2];return n/=100,r/=108.883,e=(e/=95.047)>.008856?Math.pow(e,1/3):7.787*e+16/116,[116*(n=n>.008856?Math.pow(n,1/3):7.787*n+16/116)-16,500*(e-n),200*(n-(r=r>.008856?Math.pow(r,1/3):7.787*r+16/116))]},a.lab.xyz=function(t){var e,n,r,i=t[0];e=t[1]/500+(n=(i+16)/116),r=n-t[2]/200;var o=Math.pow(n,3),a=Math.pow(e,3),s=Math.pow(r,3);return n=o>.008856?o:(n-16/116)/7.787,e=a>.008856?a:(e-16/116)/7.787,r=s>.008856?s:(r-16/116)/7.787,[e*=95.047,n*=100,r*=108.883]},a.lab.lch=function(t){var e,n=t[0],r=t[1],i=t[2];return(e=360*Math.atan2(i,r)/2/Math.PI)<0&&(e+=360),[n,Math.sqrt(r*r+i*i),e]},a.lch.lab=function(t){var e,n=t[0],r=t[1];return e=t[2]/360*2*Math.PI,[n,r*Math.cos(e),r*Math.sin(e)]},a.rgb.ansi16=function(t){var e=t[0],n=t[1],r=t[2],i=1 in arguments?arguments[1]:a.rgb.hsv(t)[2];if(0===(i=Math.round(i/50)))return 30;var o=30+(Math.round(r/255)<<2|Math.round(n/255)<<1|Math.round(e/255));return 2===i&&(o+=60),o},a.hsv.ansi16=function(t){return a.rgb.ansi16(a.hsv.rgb(t),t[2])},a.rgb.ansi256=function(t){var e=t[0],n=t[1],r=t[2];return e===n&&n===r?e<8?16:e>248?231:Math.round((e-8)/247*24)+232:16+36*Math.round(e/255*5)+6*Math.round(n/255*5)+Math.round(r/255*5)},a.ansi16.rgb=function(t){var e=t%10;if(0===e||7===e)return t>50&&(e+=3.5),[e=e/10.5*255,e,e];var n=.5*(1+~~(t>50));return[(1&e)*n*255,(e>>1&1)*n*255,(e>>2&1)*n*255]},a.ansi256.rgb=function(t){if(t>=232){var e=10*(t-232)+8;return[e,e,e]}var n;return t-=16,[Math.floor(t/36)/5*255,Math.floor((n=t%36)/6)/5*255,n%6/5*255]},a.rgb.hex=function(t){var e=(((255&Math.round(t[0]))<<16)+((255&Math.round(t[1]))<<8)+(255&Math.round(t[2]))).toString(16).toUpperCase();return"000000".substring(e.length)+e},a.hex.rgb=function(t){var e=t.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i);if(!e)return[0,0,0];var n=e[0];3===e[0].length&&(n=n.split("").map((function(t){return t+t})).join(""));var r=parseInt(n,16);return[r>>16&255,r>>8&255,255&r]},a.rgb.hcg=function(t){var e,n=t[0]/255,r=t[1]/255,i=t[2]/255,o=Math.max(Math.max(n,r),i),a=Math.min(Math.min(n,r),i),s=o-a;return e=s<=0?0:o===n?(r-i)/s%6:o===r?2+(i-n)/s:4+(n-r)/s+4,e/=6,[360*(e%=1),100*s,100*(s<1?a/(1-s):0)]},a.hsl.hcg=function(t){var e=t[1]/100,n=t[2]/100,r=1,i=0;return(r=n<.5?2*e*n:2*e*(1-n))<1&&(i=(n-.5*r)/(1-r)),[t[0],100*r,100*i]},a.hsv.hcg=function(t){var e=t[1]/100,n=t[2]/100,r=e*n,i=0;return r<1&&(i=(n-r)/(1-r)),[t[0],100*r,100*i]},a.hcg.rgb=function(t){var e=t[0]/360,n=t[1]/100,r=t[2]/100;if(0===n)return[255*r,255*r,255*r];var i,o=[0,0,0],a=e%1*6,s=a%1,u=1-s;switch(Math.floor(a)){case 0:o[0]=1,o[1]=s,o[2]=0;break;case 1:o[0]=u,o[1]=1,o[2]=0;break;case 2:o[0]=0,o[1]=1,o[2]=s;break;case 3:o[0]=0,o[1]=u,o[2]=1;break;case 4:o[0]=s,o[1]=0,o[2]=1;break;default:o[0]=1,o[1]=0,o[2]=u}return i=(1-n)*r,[255*(n*o[0]+i),255*(n*o[1]+i),255*(n*o[2]+i)]},a.hcg.hsv=function(t){var e=t[1]/100,n=e+t[2]/100*(1-e),r=0;return n>0&&(r=e/n),[t[0],100*r,100*n]},a.hcg.hsl=function(t){var e=t[1]/100,n=t[2]/100*(1-e)+.5*e,r=0;return n>0&&n<.5?r=e/(2*n):n>=.5&&n<1&&(r=e/(2*(1-n))),[t[0],100*r,100*n]},a.hcg.hwb=function(t){var e=t[1]/100,n=e+t[2]/100*(1-e);return[t[0],100*(n-e),100*(1-n)]},a.hwb.hcg=function(t){var e=t[1]/100,n=1-t[2]/100,r=n-e,i=0;return r<1&&(i=(n-r)/(1-r)),[t[0],100*r,100*i]},a.apple.rgb=function(t){return[t[0]/65535*255,t[1]/65535*255,t[2]/65535*255]},a.rgb.apple=function(t){return[t[0]/255*65535,t[1]/255*65535,t[2]/255*65535]},a.gray.rgb=function(t){return[t[0]/100*255,t[0]/100*255,t[0]/100*255]},a.gray.hsl=a.gray.hsv=function(t){return[0,0,t[0]]},a.gray.hwb=function(t){return[0,100,t[0]]},a.gray.cmyk=function(t){return[0,0,0,t[0]]},a.gray.lab=function(t){return[t[0],0,0]},a.gray.hex=function(t){var e=255&Math.round(t[0]/100*255),n=((e<<16)+(e<<8)+e).toString(16).toUpperCase();return"000000".substring(n.length)+n},a.rgb.gray=function(t){return[(t[0]+t[1]+t[2])/3/255*100]}},function(t,e,n){"use strict";var r,i=this&&this.__extends||(r=function(t,e){return(r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n])})(t,e)},function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Class extends value "+String(e)+" is not a constructor or null");function n(){this.constructor=t}r(t,e),t.prototype=null===e?Object.create(e):(n.prototype=e.prototype,new n)});Object.defineProperty(e,"__esModule",{value:!0}),e.getLayoutByName=e.unRegisterLayout=e.registerLayout=void 0;var o=n(18),a=n(15),s=new Map;e.registerLayout=function(t,e){if(s.get(t)&&console.warn("The layout with the name ".concat(t," exists already, it will be overridden")),(0,a.isObject)(e)){var n=function(t){function n(n){var r,i,o=r=t.call(this)||this,a={},s=Object.assign({},o.getDefaultCfg(),(null===(i=e.getDefaultCfg)||void 0===i?void 0:i.call(e))||{});return Object.assign(a,s,e,n),Object.keys(a).forEach((function(t){var e=a[t];o[t]=e})),r}return i(n,t),n}(o.Base);s.set(t,n)}else s.set(t,e);return s.get(t)};e.unRegisterLayout=function(t){s.has(t)&&s.delete(t)};e.getLayoutByName=function(t){return s.has(t)?s.get(t):null}},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.isArray=void 0,e.isArray=Array.isArray},function(t,e,n){"use strict";function r(t){return(r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}var i=this&&this.__assign||function(){return(i=Object.assign||function(t){for(var e,n=1,r=arguments.length;nt.cells)((x=t.small())-1)*(b=t.large())>=t.cells?t.small(x-1):(b-1)*x>=t.cells&&t.large(b-1);else for(;t.cols*t.rows=t.cells?t.large(b+1):t.small(x+1)}if(t.cellWidth=s/t.cols,t.cellHeight=u/t.rows,c&&(t.cellWidth=0,t.cellHeight=0),f||h){var w=(0,o.getFuncByUnknownType)(10,h),_=(0,o.getFuncByUnknownType)(30,d,!1);p.forEach((function(e){e.x&&e.y||(e.x=0,e.y=0);var n,r,i=_(e)||30;(0,o.isArray)(i)?(n=i[0],r=i[1]):(n=i,r=i);var a=void 0!==w?w(e):l,s=n+a,u=r+a;t.cellWidth=Math.max(t.cellWidth,s),t.cellHeight=Math.max(t.cellHeight,u)}))}t.cellUsed={},t.row=0,t.col=0,t.id2manPos={};for(var E=0;E=t&&(this.col=0,this.row++)},e.prototype.getPos=function(t){var e,n,r=this.begin,i=this.cellWidth,o=this.cellHeight,a=this.id2manPos[t.id];if(a)e=a.col*i+i/2+r[0],n=a.row*o+o/2+r[1];else{for(;this.used(this.row,this.col);)this.moveToNextCell();e=this.col*i+i/2+r[0],n=this.row*o+o/2+r[1],this.use(this.row,this.col),this.moveToNextCell()}t.x=e,t.y=n},e.prototype.getType=function(){return"grid"},e}(n(18).Base);e.GridLayout=a},function(t,e,n){"use strict";var r,i=this&&this.__extends||(r=function(t,e){return(r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n])})(t,e)},function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Class extends value "+String(e)+" is not a constructor or null");function n(){this.constructor=t}r(t,e),t.prototype=null===e?Object.create(e):(n.prototype=e.prototype,new n)});Object.defineProperty(e,"__esModule",{value:!0}),e.RandomLayout=void 0;var o=function(t){function e(e){var n=t.call(this)||this;return n.center=[0,0],n.width=300,n.height=300,n.nodes=[],n.edges=[],n.onLayoutEnd=function(){},n.updateCfg(e),n}return i(e,t),e.prototype.getDefaultCfg=function(){return{center:[0,0],width:300,height:300}},e.prototype.execute=function(){var t=this,e=t.nodes,n=t.center;return t.width||"undefined"==typeof window||(t.width=window.innerWidth),t.height||"undefined"==typeof window||(t.height=window.innerHeight),e&&e.forEach((function(e){e.x=.9*(Math.random()-.5)*t.width+n[0],e.y=.9*(Math.random()-.5)*t.height+n[1]})),t.onLayoutEnd&&t.onLayoutEnd(),{nodes:e,edges:this.edges}},e.prototype.getType=function(){return"random"},e}(n(18).Base);e.RandomLayout=o},function(t,e,n){"use strict";var r,i=this&&this.__extends||(r=function(t,e){return(r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n])})(t,e)},function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Class extends value "+String(e)+" is not a constructor or null");function n(){this.constructor=t}r(t,e),t.prototype=null===e?Object.create(e):(n.prototype=e.prototype,new n)});Object.defineProperty(e,"__esModule",{value:!0}),e.GForceLayout=void 0;var o=n(18),a=n(15),s=function(t,e){return t?(0,a.isNumber)(t)?function(e){return t}:t:function(t){return e||1}},u=function(t){function e(e){var n=t.call(this)||this;return n.maxIteration=500,n.workerEnabled=!1,n.edgeStrength=200,n.nodeStrength=1e3,n.coulombDisScale=.005,n.damping=.9,n.maxSpeed=1e3,n.minMovement=.5,n.interval=.02,n.factor=1,n.linkDistance=1,n.gravity=10,n.preventOverlap=!0,n.collideStrength=1,n.tick=function(){},n.nodes=[],n.edges=[],n.width=300,n.height=300,n.nodeMap={},n.nodeIdxMap={},n.animate=!0,n.updateCfg(e),n}return i(e,t),e.prototype.getDefaultCfg=function(){return{maxIteration:500,gravity:10,enableTick:!0,animate:!0}},e.prototype.execute=function(){var t,e,n=this,r=n.nodes;if(void 0!==n.timeInterval&&"undefined"!=typeof window&&window.clearInterval(n.timeInterval),r&&0!==r.length){n.width||"undefined"==typeof window||(n.width=window.innerWidth),n.height||"undefined"==typeof window||(n.height=window.innerHeight),n.center||(n.center=[n.width/2,n.height/2]);var i=n.center;if(1===r.length)return r[0].x=i[0],r[0].y=i[1],void(null===(e=n.onLayoutEnd)||void 0===e||e.call(n));var o={},u={};r.forEach((function(t,e){(0,a.isNumber)(t.x)||(t.x=Math.random()*n.width),(0,a.isNumber)(t.y)||(t.y=Math.random()*n.height),o[t.id]=t,u[t.id]=e})),n.nodeMap=o,n.nodeIdxMap=u,n.linkDistance=s(n.linkDistance,1),n.nodeStrength=s(n.nodeStrength,1),n.edgeStrength=s(n.edgeStrength,1);var c,l=n.nodeSize;if(n.preventOverlap){var f,h=n.nodeSpacing;f=(0,a.isNumber)(h)?function(){return h}:(0,a.isFunction)(h)?h:function(){return 0},c=l?(0,a.isArray)(l)?function(t){return Math.max(l[0],l[1])+f(t)}:function(t){return l+f(t)}:function(t){return t.size?(0,a.isArray)(t.size)?Math.max(t.size[0],t.size[1])+f(t):(0,a.isObject)(t.size)?Math.max(t.size.width,t.size.height)+f(t):t.size+f(t):10+f(t)}}n.nodeSize=c;var d=n.edges;n.degrees=(0,a.getDegree)(r.length,n.nodeIdxMap,d),n.getMass||(n.getMass=function(t){return t.mass||n.degrees[n.nodeIdxMap[t.id]].all||1}),n.run()}else null===(t=n.onLayoutEnd)||void 0===t||t.call(n)},e.prototype.run=function(){var t,e=this,n=e.maxIteration,r=e.nodes,i=e.workerEnabled,o=e.minMovement,a=e.animate;if(r)if(i||!a){for(var s=0;s=n&&(null===(i=e.onLayoutEnd)||void 0===i||i.call(e),window.clearInterval(e.timeInterval))}}),0)}},e.prototype.reachMoveThreshold=function(t,e,n){var r=0;return t.forEach((function(t,n){var i=t.x-e[n].x,o=t.y-e[n].y;r+=Math.sqrt(i*i+o*o)})),(r/=t.length)=h)){var d=a.x-e.x,p=a.y-e.y;0===d&&0===p&&(d=.01*Math.random(),p=.01*Math.random());var g=d*d+p*p,v=Math.sqrt(g),y=(v+.1)*i,m=d/v,b=p/v,x=.5*(u(a)+u(e))*r/(y*y),w=n?n(e):1;if(t[2*l]+=m*x,t[2*l+1]+=b*x,t[2*h]-=m*x,t[2*h+1]-=b*x,o&&(c(a)+c(e))/2>v){var _=s*(u(a)+u(e))*.5/g;t[2*l]+=m*_/f,t[2*l+1]+=b*_/f,t[2*h]-=m*_/w,t[2*h+1]-=b*_/w}}}))}))},e.prototype.calAttractive=function(t,e){var n=this.nodeMap,r=this.nodeIdxMap,i=this.linkDistance,o=this.edgeStrength,s=this.nodeSize,u=this.getMass;e.forEach((function(e,c){var l=(0,a.getEdgeTerminal)(e,"source"),f=(0,a.getEdgeTerminal)(e,"target"),h=n[l],d=n[f],p=d.x-h.x,g=d.y-h.y;0===p&&0===g&&(p=.01*Math.random(),g=.01*Math.random());var v=Math.sqrt(p*p+g*g),y=p/v,m=g/v,b=((i(e,h,d)||1+(s(h)+s(d)||0)/2)-v)*o(e),x=r[l],w=r[f],_=u?u(h):1,E=u?u(d):1;t[2*x]-=y*b/_,t[2*x+1]-=m*b/_,t[2*w]+=y*b/E,t[2*w+1]+=m*b/E}))},e.prototype.calGravity=function(t,e){for(var n=this.center,r=this.gravity,i=this.degrees,o=e.length,s=0;si.maxSpeed){var c=i.maxSpeed/u;a*=c,s*=c}e[2*r]=a,e[2*r+1]=s}))},e.prototype.updatePosition=function(t,e,n){n.forEach((function(n,r){if((0,a.isNumber)(n.fx)&&(0,a.isNumber)(n.fy))return n.x=n.fx,void(n.y=n.fy);var i=t[2*r]*e,o=t[2*r+1]*e;n.x+=i,n.y+=o}))},e.prototype.stop=function(){this.timeInterval&&"undefined"!=typeof window&&window.clearInterval(this.timeInterval)},e.prototype.destroy=function(){this.stop(),this.tick=null,this.nodes=null,this.edges=null,this.destroyed=!0},e.prototype.getType=function(){return"gForce"},e}(o.Base);e.GForceLayout=u},function(t,e,n){"use strict";var r,i=this&&this.__extends||(r=function(t,e){return(r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n])})(t,e)},function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Class extends value "+String(e)+" is not a constructor or null");function n(){this.constructor=t}r(t,e),t.prototype=null===e?Object.create(e):(n.prototype=e.prototype,new n)}),o=this&&this.__assign||function(){return(o=Object.assign||function(t){for(var e,n=1,r=arguments.length;n1&&(o=(0,s.getAvgNodePosition)(c))}else o=void 0;return{x:null==o?void 0:o.x,y:null==o?void 0:o.y}}}}if(r){t||(t=this.getSameTypeLeafMap());var d=Array.from(new Set(a.map((function(t,e){return t[i]})))).filter((function(t){return void 0!==t})),p={};d.forEach((function(t){var e=a.filter((function(e){return e[i]===t})).map((function(t){return u[t.id]}));p[t]=(0,s.getAvgNodePosition)(e)})),f={single:function(t){return l(t)},leaf:function(t){return l(t)},others:function(t){return l(t)},center:function(t,e,n){var r=p[t[i]];return{x:null==r?void 0:r.x,y:null==r?void 0:r.y}}}}this.centripetalOptions=o(o({},this.centripetalOptions),f);var g=this.centripetalOptions,v=g.leaf,y=g.single,m=g.others;v&&"function"!=typeof v&&(this.centripetalOptions.leaf=function(){return v}),y&&"function"!=typeof y&&(this.centripetalOptions.single=function(){return y}),m&&"function"!=typeof m&&(this.centripetalOptions.others=function(){return m})},e.prototype.updateCfg=function(t){t&&Object.assign(this,t)},e.prototype.getDefaultCfg=function(){return{maxIteration:500,gravity:10,enableTick:!0,animate:!0}},e.prototype.execute=function(){var t=this;t.stop();var e=t.nodes,n=t.edges,r=t.defSpringLen;if(t.judgingDistance=0,e&&0!==e.length){t.width||"undefined"==typeof window||(t.width=window.innerWidth),t.height||"undefined"==typeof window||(t.height=window.innerHeight),t.center||(t.center=[t.width/2,t.height/2]);var i=t.center;if(1===e.length)return e[0].x=i[0],e[0].y=i[1],void t.onLayoutEnd([o({},e[0])]);t.degreesMap=(0,s.getDegreeMap)(e,n),t.propsGetMass?t.getMass=t.propsGetMass:t.getMass=function(e){var n=1;(0,s.isNumber)(e.mass)&&(n=e.mass);var r=t.degreesMap[e.id].all;return!r||r<5?n:5*r*n};var a,u=t.nodeSize;if(t.preventOverlap){var l,f=t.nodeSpacing;l=(0,s.isNumber)(f)?function(){return f}:(0,s.isFunction)(f)?f:function(){return 0},a=u?(0,s.isArray)(u)?function(t){return Math.max(u[0],u[1])+l(t)}:function(t){return u+l(t)}:function(t){return t.size?(0,s.isArray)(t.size)?Math.max(t.size[0],t.size[1])+l(t):(0,s.isObject)(t.size)?Math.max(t.size.width,t.size.height)+l(t):t.size+l(t):10+l(t)}}t.nodeSize=a,t.linkDistance=c(t.linkDistance,1),t.nodeStrength=c(t.nodeStrength,1),t.edgeStrength=c(t.edgeStrength,1);var h={},d={};e.forEach((function(e,r){(0,s.isNumber)(e.x)||(e.x=Math.random()*t.width),(0,s.isNumber)(e.y)||(e.y=Math.random()*t.height);var i=t.degreesMap[e.id];h[e.id]=o(o({},e),{data:o(o({},e.data),{size:t.nodeSize(e)||30,layout:{inDegree:i.in,outDegree:i.out,degree:i.all,tDegree:i.in,sDegree:i.out,force:{mass:t.getMass(e),nodeStrength:t.nodeStrength(e,n)}}})}),d[e.id]=r})),t.nodeMap=h,t.nodeIdxMap=d,t.edgeInfos=[],null==n||n.forEach((function(e){var n=h[e.source],i=h[e.target];n&&i?t.edgeInfos.push({edgeStrength:t.edgeStrength(e),linkDistance:r?r(o(o({},e),{source:n,target:i}),n,i):t.linkDistance(e,n,i)||1+(u(n)+u(n)||0)/2}):elf.edgeInfos.push({})})),this.getCentripetalOptions(),t.onLayoutEnd=t.onLayoutEnd||function(){},t.run()}else t.onLayoutEnd([])},e.prototype.run=function(){var t=this,e=t.maxIteration,n=t.nodes,r=t.edges,i=t.workerEnabled,o=t.minMovement,a=t.animate,s=t.nodeMap,u=t.height;if(t.currentMinY=0,t.currentMaxY=u,n){var c=[];if(n.forEach((function(t,e){c[2*e]=0,c[2*e+1]=0})),this.defSideCoe&&"function"==typeof this.defSideCoe){var l={};r.forEach((function(t){var e=t.source,n=t.target;l[e]=l[e]||[],l[e].push(t),l[n]=l[n]||[],l[n].push(t)})),this.relatedEdges=l}var f=e;if(i||!a){for(var h=0;(t.judgingDistance>o||h<1)&&h=f||t.judgingDistanceo){var l=o/c;s*=l,u*=l}e[2*a]=s,e[2*a+1]=u}))},e.prototype.updatePosition=function(t,e){var n=this,r=n.nodes,i=n.distanceThresholdMode,o=n.nodeMap;if(null==r?void 0:r.length){var a=0;"max"===i?n.judgingDistance=-1/0:"min"===i&&(n.judgingDistance=1/0);var u=1/0,c=-1/0;r.forEach((function(r,l){var f=o[r.id];if((0,s.isNumber)(r.fx)&&(0,s.isNumber)(r.fy))return r.x=r.fx,r.y=r.fy,f.x=r.x,void(f.y=r.y);var h=t[2*l]*e,d=t[2*l+1]*e;r.x+=h,r.y+=d,f.x=r.x,f.y=r.y,r.yc&&(c=r.y);var p=Math.sqrt(h*h+d*d);switch(i){case"max":n.judgingDistancep&&(n.judgingDistance=p);break;default:a+=p}})),this.currentMinY=u,this.currentMaxY=c,i&&"mean"!==i||(n.judgingDistance=a/r.length)}else this.judgingDistance=0},e.prototype.stop=function(){this.timeInterval&&"undefined"!=typeof window&&window.clearInterval(this.timeInterval)},e.prototype.destroy=function(){this.stop(),this.tick=null,this.nodes=null,this.edges=null,this.destroyed=!0},e.prototype.getType=function(){return"force2"},e.prototype.getSameTypeLeafMap=function(){var t=this,e=t.nodeClusterBy,n=t.nodes,r=t.edges,i=t.nodeMap,o=t.degreesMap;if(null==n?void 0:n.length){var a={};return n.forEach((function(t,n){1===o[t.id].all&&(a[t.id]=(0,s.getCoreNodeAndRelativeLeafNodes)("leaf",t,r,e,o,i))})),a}},e}(a.Base);e.Force2Layout=l},function(t,e,n){"use strict";var r=this&&this.__createBinding||(Object.create?function(t,e,n,r){void 0===r&&(r=n);var i=Object.getOwnPropertyDescriptor(e,n);i&&!("get"in i?!e.__esModule:i.writable||i.configurable)||(i={enumerable:!0,get:function(){return e[n]}}),Object.defineProperty(t,r,i)}:function(t,e,n,r){void 0===r&&(r=n),t[r]=e[n]}),i=this&&this.__exportStar||function(t,e){for(var n in t)"default"===n||Object.prototype.hasOwnProperty.call(e,n)||r(e,t,n)};Object.defineProperty(e,"__esModule",{value:!0}),i(n(156),e)},function(t,e,n){"use strict";var r,i=this&&this.__extends||(r=function(t,e){return(r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n])})(t,e)},function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Class extends value "+String(e)+" is not a constructor or null");function n(){this.constructor=t}r(t,e),t.prototype=null===e?Object.create(e):(n.prototype=e.prototype,new n)});Object.defineProperty(e,"__esModule",{value:!0}),e.CircularLayout=void 0;var o=n(18),a=n(15);function s(t,e){var n=t.degree,r=e.degree;return nr?1:0}var u=function(t){function e(e){var n=t.call(this)||this;return n.radius=null,n.nodeSize=void 0,n.startRadius=null,n.endRadius=null,n.startAngle=0,n.endAngle=2*Math.PI,n.clockwise=!0,n.divisions=1,n.ordering=null,n.angleRatio=1,n.nodes=[],n.edges=[],n.nodeMap={},n.degrees=[],n.width=300,n.height=300,n.updateCfg(e),n}return i(e,t),e.prototype.getDefaultCfg=function(){return{radius:null,startRadius:null,endRadius:null,startAngle:0,endAngle:2*Math.PI,clockwise:!0,divisions:1,ordering:null,angleRatio:1}},e.prototype.execute=function(){var t,e=this.nodes,n=this.edges,r=e.length;if(0!==r){this.width||"undefined"==typeof window||(this.width=window.innerWidth),this.height||"undefined"==typeof window||(this.height=window.innerHeight),this.center||(this.center=[this.width/2,this.height/2]);var i=this.center;if(1===r)return e[0].x=i[0],e[0].y=i[1],void(this.onLayoutEnd&&this.onLayoutEnd());var o=this.radius,s=this.startRadius,u=this.endRadius,c=this.divisions,l=this.startAngle,f=this.endAngle,h=this.angleRatio,d=this.ordering,p=this.clockwise,g=this.nodeSpacing,v=this.nodeSize,y=(f-l)/r,m={};e.forEach((function(t,e){m[t.id]=e})),this.nodeMap=m;var b=(0,a.getDegree)(e.length,m,n);if(this.degrees=b,g){var x=(0,a.getFuncByUnknownType)(10,g),w=(0,a.getFuncByUnknownType)(10,v),_=-1/0;e.forEach((function(t){var e=w(t);_this.width?this.width/2:this.height/2;var S=y*h,M=[];M="topology"===d?this.topologyOrdering():"topology-directed"===d?this.topologyOrdering(!0):"degree"===d?this.degreeOrdering():e;for(var O=Math.ceil(r/c),k=0;kt.x&&(i=t.x),o>t.y&&(o=t.y)})),e.forEach((function(t){t.points.forEach((function(t){i>t.x&&(i=t.x),o>t.y&&(o=t.y)}))})),r[0]=n[0]-i,r[1]=n[1]-o}return r},e.prototype.updateNodePosition=function(t,e){var n=this.combos,r=this.nodes,i=this.edges,o=this.anchorPoint,a=this.graphSettings,s=this.getBegin(t,e);t.forEach((function(t){var c,l=t.x,f=t.y,h=t.id,d=t.type,p=t.coreBox;if(d===u.HierarchyNodeType.META&&h!==u.ROOT_NAME){var g=n.findIndex((function(t){return t.id===h})),v=null===(c=null==a?void 0:a.subScene)||void 0===c?void 0:c.meta;n[g].offsetX=l+s[0],n[g].offsetY=f+s[1],n[g].fixSize=[p.width,p.height],n[g].fixCollapseSize=[p.width,p.height],t.expanded?n[g].padding=[null==v?void 0:v.paddingTop,null==v?void 0:v.paddingRight,null==v?void 0:v.paddingBottom,null==v?void 0:v.paddingLeft]:n[g].padding=[0,0,0,0]}else if(d===u.HierarchyNodeType.OP){g=r.findIndex((function(t){return t.id===h}));if(r[g].x=l+s[0],r[g].y=f+s[1],o){var y=[],m=e.filter((function(t){return t.v===h})),b=e.filter((function(t){return t.w===h}));m.length>0&&m.forEach((function(e){var n=e.points[0],r=(n.x-l)/t.width+.5,o=(n.y-f)/t.height+.5;y.push([r,o]),e.baseEdgeList.forEach((function(t){var e=i.find((function(e){return e.source===t.v&&e.target===t.w}));e&&(e.sourceAnchor=y.length-1)}))})),b.length>0&&b.forEach((function(e){var n=e.points[e.points.length-1],r=(n.x-l)/t.width+.5,o=(n.y-f)/t.height+.5;y.push([r,o]),e.baseEdgeList.forEach((function(t){var e=i.find((function(e){return e.source===t.v&&e.target===t.w}));e&&(e.targetAnchor=y.length-1)}))})),r[g].anchorPoints=y.length>0?y:r[g].anchorPoints||[]}}}))},e.prototype.updateEdgePosition=function(t,e){var n=this,r=n.combos,i=n.edges,s=n.controlPoints,c=this.getBegin(t,e);s&&(r.forEach((function(t){t.inEdges=[],t.outEdges=[]})),i.forEach((function(e){var i,s,l,f,h=t.find((function(t){return t.id===e.source})),d=t.find((function(t){return t.id===e.target})),p=[],g=[];if(h&&d)g=(0,u.getEdges)(null==h?void 0:h.id,null==d?void 0:d.id,t);else if(!h||!d){var v=n.getNodePath(e.source),y=n.getNodePath(e.target),m=v.reverse().slice(h?0:1).find((function(e){return t.find((function(t){return t.id===e}))})),b=y.reverse().slice(d?0:1).find((function(e){return t.find((function(t){return t.id===e}))}));h=t.find((function(t){return t.id===m})),d=t.find((function(t){return t.id===b})),g=(0,u.getEdges)(null==h?void 0:h.id,null==d?void 0:d.id,t,{v:e.source,w:e.target})}if(p=(p=g.reduce((function(t,e){return a(a([],t,!0),e.points.map((function(t){return o(o({},t),{x:t.x+c[0],y:t.y+c[1]})})),!0)}),[])).slice(1,-1),e.controlPoints=p,(null==d?void 0:d.type)===u.NodeType.META){var x=r.findIndex((function(t){return t.id===(null==d?void 0:d.id)}));if(!r[x]||(null===(i=r[x].inEdges)||void 0===i?void 0:i.some((function(t){return t.source===h.id&&t.target===d.id}))))return;null===(s=r[x].inEdges)||void 0===s||s.push({source:h.id,target:d.id,controlPoints:p})}if((null==h?void 0:h.type)===u.NodeType.META){x=r.findIndex((function(t){return t.id===(null==h?void 0:h.id)}));if(!r[x]||(null===(l=r[x].outEdges)||void 0===l?void 0:l.some((function(t){return t.source===h.id&&t.target===d.id}))))return;null===(f=r[x].outEdges)||void 0===f||f.push({source:h.id,target:d.id,controlPoints:p})}})))},e.prototype.getType=function(){return"dagreCompound"},e.prototype.getDataByOrder=function(t){return t.every((function(t){return void 0!==t.layoutOrder}))||t.forEach((function(t,e){t.layoutOrder=e})),t.sort((function(t,e){return t.layoutOrder-e.layoutOrder}))},e}(s.Base);e.DagreCompoundLayout=l},function(t,e){function n(t){return(n="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}var r;r=function(){return this}();try{r=r||new Function("return this")()}catch(t){"object"===("undefined"==typeof window?"undefined":n(window))&&(r=window)}t.exports=r},function(t,e,n){"use strict";var r=this&&this.__createBinding||(Object.create?function(t,e,n,r){void 0===r&&(r=n);var i=Object.getOwnPropertyDescriptor(e,n);i&&!("get"in i?!e.__esModule:i.writable||i.configurable)||(i={enumerable:!0,get:function(){return e[n]}}),Object.defineProperty(t,r,i)}:function(t,e,n,r){void 0===r&&(r=n),t[r]=e[n]}),i=this&&this.__exportStar||function(t,e){for(var n in t)"default"===n||Object.prototype.hasOwnProperty.call(e,n)||r(e,t,n)};Object.defineProperty(e,"__esModule",{value:!0}),i(n(183),e)},function(t,e,n){"use strict";var r,i=this&&this.__extends||(r=function(t,e){return(r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n])})(t,e)},function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Class extends value "+String(e)+" is not a constructor or null");function n(){this.constructor=t}r(t,e),t.prototype=null===e?Object.create(e):(n.prototype=e.prototype,new n)});Object.defineProperty(e,"__esModule",{value:!0}),e.ConcentricLayout=void 0;var o=n(15),a=function(t){function e(e){var n=t.call(this)||this;return n.nodeSize=30,n.minNodeSpacing=10,n.nodeSpacing=10,n.preventOverlap=!1,n.equidistant=!1,n.startAngle=1.5*Math.PI,n.clockwise=!0,n.sortBy="degree",n.nodes=[],n.edges=[],n.width=300,n.height=300,n.onLayoutEnd=function(){},n.updateCfg(e),n}return i(e,t),e.prototype.getDefaultCfg=function(){return{nodeSize:30,minNodeSpacing:10,nodeSpacing:10,preventOverlap:!1,sweep:void 0,equidistant:!1,startAngle:1.5*Math.PI,clockwise:!0,maxLevelDiff:void 0,sortBy:"degree"}},e.prototype.execute=function(){var t,e,n=this,r=n.nodes,i=n.edges,a=r.length;if(0!==a){n.width||"undefined"==typeof window||(n.width=window.innerWidth),n.height||"undefined"==typeof window||(n.height=window.innerHeight),n.center||(n.center=[n.width/2,n.height/2]);var s=n.center;if(1===a)return r[0].x=s[0],r[0].y=s[1],void(null===(e=n.onLayoutEnd)||void 0===e||e.call(n));var u,c=n.nodeSize,l=n.nodeSpacing,f=[],h=0;u=(0,o.isArray)(c)?Math.max(c[0],c[1]):c,(0,o.isArray)(l)?h=Math.max(l[0],l[1]):(0,o.isNumber)(l)&&(h=l),r.forEach((function(t){f.push(t);var e=u;(0,o.isArray)(t.size)?e=Math.max(t.size[0],t.size[1]):(0,o.isNumber)(t.size)?e=t.size:(0,o.isObject)(t.size)&&(e=Math.max(t.size.width,t.size.height)),u=Math.max(u,e),(0,o.isFunction)(l)&&(h=Math.max(l(t),h))})),n.clockwise=void 0!==n.counterclockwise?!n.counterclockwise:n.clockwise;var d={},p={};if(f.forEach((function(t,e){d[t.id]=t,p[t.id]=e})),!("degree"!==n.sortBy&&(0,o.isString)(n.sortBy)&&void 0!==f[0][n.sortBy]||(n.sortBy="degree",(0,o.isNumber)(r[0].degree)))){var g=(0,o.getDegree)(r.length,p,i);f.forEach((function(t,e){t.degree=g[e].all}))}f.sort((function(t,e){return e[n.sortBy]-t[n.sortBy]})),n.maxValueNode=f[0],n.maxLevelDiff=n.maxLevelDiff||n.maxValueNode[n.sortBy]/4;var v=[[]],y=v[0];f.forEach((function(t){if(y.length>0){var e=Math.abs(y[0][n.sortBy]-t[n.sortBy]);n.maxLevelDiff&&e>=n.maxLevelDiff&&(y=[],v.push(y))}y.push(t)}));var m=u+(h||n.minNodeSpacing);if(!n.preventOverlap){var b=v.length>0&&v[0].length>1,x=(Math.min(n.width,n.height)/2-m)/(v.length+(b?1:0));m=Math.min(m,x)}var w=0;if(v.forEach((function(t){var e=n.sweep;void 0===e&&(e=2*Math.PI-2*Math.PI/t.length);var r=t.dTheta=e/Math.max(1,t.length-1);if(t.length>1&&n.preventOverlap){var i=Math.cos(r)-Math.cos(0),o=Math.sin(r)-Math.sin(0),a=Math.sqrt(m*m/(i*i+o*o));w=Math.max(a,w)}t.r=w,w+=m})),n.equidistant){for(var _=0,E=0,S=0;S=i&&(null===(t=e.onLayoutEnd)||void 0===t||t.call(e),window.clearInterval(e.timeInterval))}),0)}return{nodes:n,edges:r}}},e.prototype.runOneStep=function(t){var e,n=this.nodes;if(n){var r=this.edges,i=this.center,o=this.gravity,s=this.speed,u=this.clustering,c=this.height*this.width,l=Math.sqrt(c)/10,f=c/(n.length+1),h=Math.sqrt(f),d=[];if(n.forEach((function(t,e){d[e]={x:0,y:0}})),this.applyCalculate(n,r,d,h,f),u){for(var p in t)t[p].cx=0,t[p].cy=0,t[p].count=0;for(var p in n.forEach((function(e){var n=t[e.cluster];(0,a.isNumber)(e.x)&&(n.cx+=e.x),(0,a.isNumber)(e.y)&&(n.cy+=e.y),n.count++})),t)t[p].cx/=t[p].count,t[p].cy/=t[p].count;var g=this.clusterGravity||o;n.forEach((function(e,n){if((0,a.isNumber)(e.x)&&(0,a.isNumber)(e.y)){var r=t[e.cluster],i=Math.sqrt((e.x-r.cx)*(e.x-r.cx)+(e.y-r.cy)*(e.y-r.cy)),o=h*g;d[n].x-=o*(e.x-r.cx)/i,d[n].y-=o*(e.y-r.cy)/i}}))}n.forEach((function(t,e){if((0,a.isNumber)(t.x)&&(0,a.isNumber)(t.y)){var n=.01*h*o;d[e].x-=n*(t.x-i[0]),d[e].y-=n*(t.y-i[1])}})),n.forEach((function(t,e){if((0,a.isNumber)(t.fx)&&(0,a.isNumber)(t.fy))return t.x=t.fx,void(t.y=t.fy);if((0,a.isNumber)(t.x)&&(0,a.isNumber)(t.y)){var n=Math.sqrt(d[e].x*d[e].x+d[e].y*d[e].y);if(n>0){var r=Math.min(l*(s/800),n);t.x+=d[e].x/n*r,t.y+=d[e].y/n*r}}})),null===(e=this.tick)||void 0===e||e.call(this)}},e.prototype.applyCalculate=function(t,e,n,r,i){this.calRepulsive(t,n,i),e&&this.calAttractive(e,n,r)},e.prototype.calRepulsive=function(t,e,n){t.forEach((function(r,i){e[i]={x:0,y:0},t.forEach((function(t,o){if(i!==o&&(0,a.isNumber)(r.x)&&(0,a.isNumber)(t.x)&&(0,a.isNumber)(r.y)&&(0,a.isNumber)(t.y)){var s=r.x-t.x,u=r.y-t.y,c=s*s+u*u;if(0===c){c=1;var l=i>o?1:-1;s=.01*l,u=.01*l}var f=n/c;e[i].x+=s*f,e[i].y+=u*f}}))}))},e.prototype.calAttractive=function(t,e,n){var r=this;t.forEach((function(t){var i=(0,a.getEdgeTerminal)(t,"source"),o=(0,a.getEdgeTerminal)(t,"target");if(i&&o){var s=r.nodeIdxMap[i],u=r.nodeIdxMap[o];if(s!==u){var c=r.nodeMap[i],l=r.nodeMap[o];if((0,a.isNumber)(l.x)&&(0,a.isNumber)(c.x)&&(0,a.isNumber)(l.y)&&(0,a.isNumber)(c.y)){var f=l.x-c.x,h=l.y-c.y,d=Math.sqrt(f*f+h*h),p=d*d/n;e[u].x-=f/d*p,e[u].y-=h/d*p,e[s].x+=f/d*p,e[s].y+=h/d*p}}}}))},e.prototype.stop=function(){this.timeInterval&&"undefined"!=typeof window&&window.clearInterval(this.timeInterval)},e.prototype.destroy=function(){this.stop(),this.tick=null,this.nodes=null,this.edges=null,this.destroyed=!0},e.prototype.getType=function(){return"fruchterman"},e}(o.Base);e.FruchtermanLayout=s},function(t,e,n){"use strict";var r,i=this&&this.__extends||(r=function(t,e){return(r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n])})(t,e)},function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Class extends value "+String(e)+" is not a constructor or null");function n(){this.constructor=t}r(t,e),t.prototype=null===e?Object.create(e):(n.prototype=e.prototype,new n)}),o=this&&this.__awaiter||function(t,e,n,r){return new(n||(n=Promise))((function(i,o){function a(t){try{u(r.next(t))}catch(t){o(t)}}function s(t){try{u(r.throw(t))}catch(t){o(t)}}function u(t){var e;t.done?i(t.value):(e=t.value,e instanceof n?e:new n((function(t){t(e)}))).then(a,s)}u((r=r.apply(t,e||[])).next())}))},a=this&&this.__generator||function(t,e){var n,r,i,o,a={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return o={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function s(s){return function(u){return function(s){if(n)throw new TypeError("Generator is already executing.");for(;o&&(o=0,s[0]&&(a=0)),a;)try{if(n=1,r&&(i=2&s[0]?r.return:s[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,s[1])).done)return i;switch(r=0,i&&(s=[2&s[0],i.value]),s[0]){case 0:case 1:i=s;break;case 4:return a.label++,{value:s[1],done:!1};case 5:a.label++,r=s[1],s=[0];continue;case 7:s=a.ops.pop(),a.trys.pop();continue;default:if(!(i=a.trys,(i=i.length>0&&i[i.length-1])||6!==s[0]&&2!==s[0])){a=0;continue}if(3===s[0]&&(!i||s[1]>i[0]&&s[1]t.length)&&(e=t.length);for(var n=0,r=new Array(e);n0&&i[i.length-1])||6!==s[0]&&2!==s[0])){a=0;continue}if(3===s[0]&&(!i||s[1]>i[0]&&s[1]v[1]?v[0]:v[1])/2;p=function(t){return m}}else{var b=v/2;p=function(t){return b}}else p=function(t){return t.size?(0,a.isArray)(t.size)?(t.size[0]>t.size[1]?t.size[0]:t.size[1])/2:(0,a.isObject)(t.size)?(t.size.width>t.size.height?t.size.width:t.size.height)/2:t.size/2:10};this.nodeSize=p;var x,w=this.comboSpacing;x=(0,a.isNumber)(w)?function(){return w}:(0,a.isFunction)(w)?w:function(){return 0},this.comboSpacing=x;var _,E=this.comboPadding;_=(0,a.isNumber)(E)?function(){return E}:(0,a.isArray)(E)?function(){return Math.max.apply(null,E)}:(0,a.isFunction)(E)?E:function(){return 0},this.comboPadding=_;var S,M=this.linkDistance;M||(M=10),S=(0,a.isNumber)(M)?function(t){return M}:M,this.linkDistance=S;var O,k=this.edgeStrength;k||(k=1),O=(0,a.isNumber)(k)?function(t){return k}:k,this.edgeStrength=O;var A,C=this.nodeStrength;C||(C=30),A=(0,a.isNumber)(C)?function(t){return C}:C,this.nodeStrength=A},e.prototype.initPos=function(t){this.nodes.forEach((function(e,n){var r=e.comboId,i=t[r];r&&i?(e.x=i.cx+100/(n+1),e.y=i.cy+100/(n+1)):(e.x=100/(n+1),e.y=100/(n+1))}))},e.prototype.getComboMap=function(){var t=this,e=t.nodeMap,n=t.comboTrees,r=t.oriComboMap,i={};return(n||[]).forEach((function(n){var o=[];(0,a.traverseTreeUp)(n,(function(n){if("node"===n.itemType)return!0;if(!r[n.id])return!0;if(void 0===i[n.id]){var s={id:n.id,name:n.id,cx:0,cy:0,count:0,depth:t.oriComboMap[n.id].depth||0,children:[]};i[n.id]=s}var u=n.children;u&&u.forEach((function(t){if(!i[t.id]&&!e[t.id])return!0;o.push(t)}));var c=i[n.id];if(c.cx=0,c.cy=0,0===o.length){c.empty=!0;var l=r[n.id];c.cx=l.x,c.cy=l.y}return o.forEach((function(t){if(c.count++,"node"!==t.itemType){var n=i[t.id];return(0,a.isNumber)(n.cx)&&(c.cx+=n.cx),void((0,a.isNumber)(n.cy)&&(c.cy+=n.cy))}var r=e[t.id];r&&((0,a.isNumber)(r.x)&&(c.cx+=r.x),(0,a.isNumber)(r.y)&&(c.cy+=r.y))})),c.cx/=c.count||1,c.cy/=c.count||1,c.children=o,!0}))})),i},e.prototype.applyComboCenterForce=function(t){var e=this.gravity,n=this.comboGravity||e,r=this.alpha,i=this.comboTrees,o=this.indexMap,s=this.nodeMap,u=this.comboMap;(i||[]).forEach((function(e){(0,a.traverseTreeUp)(e,(function(e){if("node"===e.itemType)return!0;if(!u[e.id])return!0;var i=u[e.id],c=(i.depth+1)/10*.5,l=i.cx,f=i.cy;return i.cx=0,i.cy=0,i.children.forEach((function(e){if("node"!==e.itemType){var h=u[e.id];return h&&(0,a.isNumber)(h.cx)&&(i.cx+=h.cx),void(h&&(0,a.isNumber)(h.cy)&&(i.cy+=h.cy))}var d=s[e.id],p=d.x-l||.005,g=d.y-f||.005,v=Math.sqrt(p*p+g*g),y=o[d.id],m=n*r/v*c;t[y].x-=p*m,t[y].y-=g*m,(0,a.isNumber)(d.x)&&(i.cx+=d.x),(0,a.isNumber)(d.y)&&(i.cy+=d.y)})),i.cx/=i.count||1,i.cy/=i.count||1,!0}))}))},e.prototype.applyCalculate=function(t){var e=this.comboMap,n=this.nodes,r={};n.forEach((function(t,e){n.forEach((function(n,i){if(!(eo&&(c.minX=o),c.minY>a&&(c.minY=a),c.maxX1&&a.forEach((function(n,s){if("node"===n.itemType)return!1;var u=e[n.id];u&&a.forEach((function(a,c){if(s<=c)return!1;if("node"===a.itemType)return!1;var l=e[a.id];if(!l)return!1;var f=u.cx-l.cx||.005,h=u.cy-l.cy||.005,d=f*f+h*h,p=u.r||1,g=l.r||1,v=p+g,y=g*g,m=p*p;if(di)){var y=e["".concat(d.id,"-").concat(n.id)],m=y.vx,b=y.vy,x=Math.log(Math.abs(n.depth-d.depth)/10)+1||1;x=x<1?1:x,n.comboId!==d.comboId&&(x+=1);var w=x?Math.pow(f,x):1,_=o(n)*a/g*w;if(t[p].x+=m*_,t[p].y+=b*_,p=0;E--)_(E);return{nodes:e,edges:n,combos:r,comboEdges:i}},e.prototype.getInnerGraphs=function(t){var e=this.comboTrees,n=this.nodeSize,r=this.edges,i=this.comboPadding,a=this.spacing,s={},l=this.innerLayout||new c.ConcentricLayout({type:"concentric",sortBy:"id"});return l.center=[0,0],l.preventOverlap=!0,l.nodeSpacing=a,(e||[]).forEach((function(e){(0,u.traverseTreeUp)(e,(function(e){var a,c=(null==i?void 0:i(e))||10;if((0,u.isArray)(c)&&(c=Math.max.apply(Math,c)),null===(a=e.children)||void 0===a?void 0:a.length){var f=e.children.map((function(e){if("combo"===e.itemType)return s[e.id];var n=t[e.id]||{};return o(o({},n),e)})),h=f.map((function(t){return t.id})),d={nodes:f,edges:r.filter((function(t){return h.includes(t.source)&&h.includes(t.target)}))},p=1/0;f.forEach((function(t){var e;t.size||(t.size=(null===(e=s[t.id])||void 0===e?void 0:e.size)||(null==n?void 0:n(t))||[30,30]),(0,u.isNumber)(t.size)&&(t.size=[t.size,t.size]),p>t.size[0]&&(p=t.size[0]),p>t.size[1]&&(p=t.size[1])})),l.layout(d);var g=(0,u.getLayoutBBox)(f),v=g.minX,y=g.minY,m=g.maxX,b=g.maxY,x={x:(m+v)/2,y:(b+y)/2};d.nodes.forEach((function(t){t.x-=x.x,t.y-=x.y}));var w=Math.max(m-v,p)+2*c,_=Math.max(b-y,p)+2*c;s[e.id]={id:e.id,nodes:f,size:[w,_]}}else if("combo"===e.itemType){var E=c?[2*c,2*c]:[30,30];s[e.id]={id:e.id,nodes:[],size:E}}return!0}))})),s},e.prototype.initVals=function(){var t,e,n=this.nodeSize,r=this.spacing;if(e=(0,u.isNumber)(r)?function(){return r}:(0,u.isFunction)(r)?r:function(){return 0},this.spacing=e,n)if((0,u.isFunction)(n))t=function(t){var r=n(t),i=e(t);return(0,u.isArray)(t.size)?((t.size[0]>t.size[1]?t.size[0]:t.size[1])+i)/2:((r||10)+i)/2};else if((0,u.isArray)(n)){var i=(n[0]>n[1]?n[0]:n[1])/2;t=function(t){return i+e(t)/2}}else{var o=n/2;t=function(t){return o+e(t)/2}}else t=function(t){var n=e(t);return t.size?(0,u.isArray)(t.size)?((t.size[0]>t.size[1]?t.size[0]:t.size[1])+n)/2:(0,u.isObject)(t.size)?((t.size.width>t.size.height?t.size.width:t.size.height)+n)/2:(t.size+n)/2:10+n/2};this.nodeSize=t;var a,s=this.comboPadding;a=(0,u.isNumber)(s)?function(){return s}:(0,u.isArray)(s)?function(){return Math.max.apply(null,s)}:(0,u.isFunction)(s)?s:function(){return 0},this.comboPadding=a},e.prototype.getType=function(){return"comboCombined"},e}(s.Base);e.ComboCombinedLayout=l},function(t,e,n){"use strict";var r,i=this&&this.__extends||(r=function(t,e){return(r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n])})(t,e)},function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Class extends value "+String(e)+" is not a constructor or null");function n(){this.constructor=t}r(t,e),t.prototype=null===e?Object.create(e):(n.prototype=e.prototype,new n)}),o=this&&this.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(e,"__esModule",{value:!0}),e.ForceAtlas2Layout=void 0;var a=n(18),s=n(15),u=o(n(203)),c=o(n(204)),l=o(n(205)),f=function(t){function e(e){var n=t.call(this)||this;return n.center=[0,0],n.width=300,n.height=300,n.nodes=[],n.edges=[],n.kr=5,n.kg=1,n.mode="normal",n.preventOverlap=!1,n.dissuadeHubs=!1,n.barnesHut=void 0,n.maxIteration=0,n.ks=.1,n.ksmax=10,n.tao=.1,n.onLayoutEnd=function(){},n.prune=void 0,n.updateCfg(e),n}return i(e,t),e.prototype.getDefaultCfg=function(){return{}},e.prototype.execute=function(){var t=this.nodes,e=this.onLayoutEnd,n=this.prune,r=this.maxIteration;this.width||"undefined"==typeof window||(this.width=window.innerWidth),this.height||"undefined"==typeof window||(this.height=window.innerHeight);for(var i=[],o=t.length,a=0;a250&&(this.barnesHut=!0),void 0===this.prune&&o>100&&(this.prune=!0),0!==this.maxIteration||this.prune?0===this.maxIteration&&n&&(r=100,o<=200&&o>100?r=500:o>200&&(r=950),this.maxIteration=r):(r=250,o<=200&&o>100?r=1e3:o>200&&(r=1200),this.maxIteration=r),this.kr||(this.kr=50,o>100&&o<=500?this.kr=20:o>500&&(this.kr=1)),this.kg||(this.kg=20,o>100&&o<=500?this.kg=10:o>500&&(this.kg=1)),this.nodes=this.updateNodesByForces(i),e()},e.prototype.updateNodesByForces=function(t){for(var e=this.edges,n=this.maxIteration,r=this.nodes,i=e.filter((function(t){return(0,s.getEdgeTerminal)(t,"source")!==(0,s.getEdgeTerminal)(t,"target")})),o=r.length,a=i.length,u=[],c={},l={},f=[],h=0;h0;){for(y=0;y50||!c)?this.getOptRepGraForces(p,v,i):this.getRepGraForces(d,50,p,100,o,i);var b=this.updatePos(p,g,h,i);a=b.nodes,h=b.sg,d--,this.tick&&this.tick()}return a},e.prototype.getAttrForces=function(t,e,n,r,i,o,a,s){for(var u=this.nodes,c=this.preventOverlap,l=this.dissuadeHubs,f=this.mode,h=this.prune,d=0;d0&&(x=b,w=b),s[2*r[p.id]]+=x*m[0],s[2*r[v.id]]-=w*m[0],s[2*r[p.id]+1]+=x*m[1],s[2*r[v.id]+1]-=w*m[1]}}return s},e.prototype.getRepGraForces=function(t,e,n,r,i,o){for(var a=this.nodes,s=this.preventOverlap,u=this.kr,c=this.kg,l=this.center,f=this.prune,h=a.length,d=0;d0&&(y=u*(o[d]+1)*(o[p]+1)/v),n[2*d]-=y*g[0],n[2*p]+=y*g[0],n[2*d+1]-=y*g[1],n[2*p+1]+=y*g[1]}var m=[a[d].x-l[0],a[d].y-l[1]],b=Math.hypot(m[0],m[1]);m[0]=m[0]/b,m[1]=m[1]/b;var x=c*(o[d]+1);n[2*d]-=x*m[0],n[2*d+1]-=x*m[1]}return n},e.prototype.getOptRepGraForces=function(t,e,n){for(var r=this.nodes,i=this.kg,o=this.center,a=this.prune,s=r.length,u=9e10,f=-9e10,h=9e10,d=-9e10,p=0;p=f&&(f=r[p].x),r[p].x<=u&&(u=r[p].x),r[p].y>=d&&(d=r[p].y),r[p].y<=h&&(h=r[p].y));var g={xmid:(f+u)/2,ymid:(d+h)/2,length:Math.max(f-u,d-h),massCenter:o,mass:s},v=new c.default(g),y=new l.default(v);for(p=0;p1.5*x?1.5*x:n);for(g=0;gE?E:w)*t[2*g],M=w*t[2*g+1];i[g].x+=S,i[g].y+=M}return{nodes:i,sg:n}},e}(a.Base);e.ForceAtlas2Layout=f},function(t,e,n){"use strict";var r,i=this&&this.__extends||(r=function(t,e){return(r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n])})(t,e)},function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Class extends value "+String(e)+" is not a constructor or null");function n(){this.constructor=t}r(t,e),t.prototype=null===e?Object.create(e):(n.prototype=e.prototype,new n)}),o=this&&this.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(e,"__esModule",{value:!0}),e.ERLayout=void 0;var a=n(18),s=o(n(206)),u=function(t){function e(e){var n=t.call(this)||this;return n.width=300,n.height=300,n.nodeMinGap=50,n.onLayoutEnd=function(){},e&&n.updateCfg(e),n}return i(e,t),e.prototype.getDefaultCfg=function(){return{width:300,height:300,nodeMinGap:50}},e.prototype.execute=function(){var t=this,e=t.nodes,n=t.edges;return null==e||e.forEach((function(t){t.size||(t.size=[50,50])})),(0,s.default)({nodes:e,edges:n},{width:this.width,height:this.height,nodeMinGap:this.nodeMinGap}).then((function(){t.onLayoutEnd&&t.onLayoutEnd()}))},e.prototype.getType=function(){return"er"},e}(a.Base);e.ERLayout=u},function(t,e,n){"use strict";function r(t){return[parseInt(t.substr(1,2),16),parseInt(t.substr(3,2),16),parseInt(t.substr(5,2),16)]}function i(t){var e=Math.round(t).toString(16);return 1===e.length?"0"+e:e}function o(t){return"#"+i(t[0])+i(t[1])+i(t[2])}n.r(e),n.d(e,"rgb2arr",(function(){return r})),n.d(e,"gradient",(function(){return l})),n.d(e,"toRGB",(function(){return u})),n.d(e,"toCSSGradient",(function(){return p})),n.d(e,"transform",(function(){return b})),n.d(e,"direction",(function(){return x})),n.d(e,"angleTo",(function(){return w})),n.d(e,"vertical",(function(){return _})),n.d(e,"path2String",(function(){return E})),n.d(e,"path2Curve",(function(){return q})),n.d(e,"path2Absolute",(function(){return z})),n.d(e,"clonePath",(function(){return Z})),n.d(e,"normalizePath",(function(){return Y})),n.d(e,"reverseCurve",(function(){return K})),n.d(e,"arcToCubic",(function(){return X})),n.d(e,"getPathBBox",(function(){return st})),n.d(e,"getTotalLength",(function(){return ut})),n.d(e,"getPathBBoxTotalLength",(function(){return ct})),n.d(e,"getRotatedCurve",(function(){return lt})),n.d(e,"getPathArea",(function(){return ft})),n.d(e,"getDrawDirection",(function(){return ht})),n.d(e,"getPointAtLength",(function(){return dt})),n.d(e,"isPointInStroke",(function(){return gt})),n.d(e,"distanceSquareRoot",(function(){return Q})),n.d(e,"equalizeSegments",(function(){return yt})),n.d(e,"contains",(function(){return bt})),n.d(e,"includes",(function(){return bt})),n.d(e,"difference",(function(){return wt})),n.d(e,"find",(function(){return Dt})),n.d(e,"findIndex",(function(){return Lt})),n.d(e,"firstValue",(function(){return Rt})),n.d(e,"flatten",(function(){return Bt})),n.d(e,"flattenDeep",(function(){return Ft})),n.d(e,"getRange",(function(){return Yt})),n.d(e,"pull",(function(){return Vt})),n.d(e,"pullAt",(function(){return qt})),n.d(e,"reduce",(function(){return Zt})),n.d(e,"remove",(function(){return Kt})),n.d(e,"sortBy",(function(){return $t})),n.d(e,"union",(function(){return te})),n.d(e,"uniq",(function(){return Jt})),n.d(e,"valuesOfKey",(function(){return ee})),n.d(e,"head",(function(){return ne})),n.d(e,"last",(function(){return re})),n.d(e,"startsWith",(function(){return ie})),n.d(e,"endsWith",(function(){return oe})),n.d(e,"filter",(function(){return xt})),n.d(e,"every",(function(){return ae})),n.d(e,"some",(function(){return se})),n.d(e,"group",(function(){return fe})),n.d(e,"groupBy",(function(){return ce})),n.d(e,"groupToMap",(function(){return le})),n.d(e,"getWrapBehavior",(function(){return he})),n.d(e,"wrapBehavior",(function(){return de})),n.d(e,"number2color",(function(){return ge})),n.d(e,"parseRadius",(function(){return ve})),n.d(e,"clamp",(function(){return ye})),n.d(e,"fixedBase",(function(){return me})),n.d(e,"isDecimal",(function(){return xe})),n.d(e,"isEven",(function(){return we})),n.d(e,"isInteger",(function(){return _e})),n.d(e,"isNegative",(function(){return Ee})),n.d(e,"isNumberEqual",(function(){return Se})),n.d(e,"isOdd",(function(){return Me})),n.d(e,"isPositive",(function(){return Oe})),n.d(e,"max",(function(){return zt})),n.d(e,"maxBy",(function(){return ke})),n.d(e,"min",(function(){return Gt})),n.d(e,"minBy",(function(){return Ae})),n.d(e,"mod",(function(){return Ce})),n.d(e,"toDegree",(function(){return Ie})),n.d(e,"toInteger",(function(){return Te})),n.d(e,"toRadian",(function(){return Pe})),n.d(e,"forIn",(function(){return De})),n.d(e,"has",(function(){return Le})),n.d(e,"hasKey",(function(){return Re})),n.d(e,"hasValue",(function(){return Fe})),n.d(e,"keys",(function(){return jt})),n.d(e,"isMatch",(function(){return It})),n.d(e,"values",(function(){return Be})),n.d(e,"lowerCase",(function(){return Ge})),n.d(e,"lowerFirst",(function(){return Ye})),n.d(e,"substitute",(function(){return Ue})),n.d(e,"upperCase",(function(){return Xe})),n.d(e,"upperFirst",(function(){return We})),n.d(e,"getType",(function(){return He})),n.d(e,"isArguments",(function(){return qe})),n.d(e,"isArray",(function(){return Ot})),n.d(e,"isArrayLike",(function(){return mt})),n.d(e,"isBoolean",(function(){return Ze})),n.d(e,"isDate",(function(){return Ke})),n.d(e,"isError",(function(){return Qe})),n.d(e,"isFunction",(function(){return _t})),n.d(e,"isFinite",(function(){return $e})),n.d(e,"isNil",(function(){return Et})),n.d(e,"isNull",(function(){return Je})),n.d(e,"isNumber",(function(){return be})),n.d(e,"isObject",(function(){return At})),n.d(e,"isObjectLike",(function(){return Nt})),n.d(e,"isPlainObject",(function(){return Pt})),n.d(e,"isPrototype",(function(){return en})),n.d(e,"isRegExp",(function(){return nn})),n.d(e,"isString",(function(){return Qt})),n.d(e,"isType",(function(){return Mt})),n.d(e,"isUndefined",(function(){return rn})),n.d(e,"isElement",(function(){return on})),n.d(e,"requestAnimationFrame",(function(){return an})),n.d(e,"clearAnimationFrame",(function(){return sn})),n.d(e,"augment",(function(){return ln})),n.d(e,"clone",(function(){return hn})),n.d(e,"debounce",(function(){return dn})),n.d(e,"memoize",(function(){return pn})),n.d(e,"deepMix",(function(){return yn})),n.d(e,"each",(function(){return Ct})),n.d(e,"extend",(function(){return mn})),n.d(e,"indexOf",(function(){return bn})),n.d(e,"isEmpty",(function(){return wn})),n.d(e,"isEqual",(function(){return _n})),n.d(e,"isEqualWith",(function(){return En})),n.d(e,"map",(function(){return Sn})),n.d(e,"mapValues",(function(){return On})),n.d(e,"mix",(function(){return cn})),n.d(e,"assign",(function(){return cn})),n.d(e,"get",(function(){return kn})),n.d(e,"set",(function(){return An})),n.d(e,"pick",(function(){return jn})),n.d(e,"omit",(function(){return In})),n.d(e,"throttle",(function(){return Tn})),n.d(e,"toArray",(function(){return Nn})),n.d(e,"toString",(function(){return ze})),n.d(e,"uniqueId",(function(){return Dn})),n.d(e,"noop",(function(){return Ln})),n.d(e,"identity",(function(){return Rn})),n.d(e,"size",(function(){return Bn})),n.d(e,"Cache",(function(){return Fn})),n.d(e,"isPointInPolygon",(function(){return Yn})),n.d(e,"isPolygonsIntersect",(function(){return Hn}));var a,s=/rgba?\(([\s.,0-9]+)\)/;function u(t){if("#"===t[0]&&7===t.length)return t;var e;a||((e=document.createElement("i")).title="Web Colour Picker",e.style.display="none",document.body.appendChild(e),a=e),a.style.color=t;var n=document.defaultView.getComputedStyle(a,"").getPropertyValue("color");return n=o(s.exec(n)[1].split(/\s*,\s*/).map((function(t){return Number(t)})))}function c(t,e,n,r){return t[r]+(e[r]-t[r])*n}function l(t){var e=("string"==typeof t?t.split("-"):t).map((function(t){return r(-1===t.indexOf("#")?u(t):t)}));return function(t){return function(t,e){var n=isNaN(Number(e))||e<0?0:e>1?1:Number(e),r=t.length-1,i=Math.floor(r*n),a=r*n-i,s=t[i],u=i===r?s:t[i+1];return o([c(s,u,a,0),c(s,u,a,1),c(s,u,a,2)])}(e,t)}}var f=/^l\s*\(\s*([\d.]+)\s*\)\s*(.*)/i,h=/^r\s*\(\s*([\d.]+)\s*,\s*([\d.]+)\s*,\s*([\d.]+)\s*\)\s*(.*)/i,d=/[\d.]+:(#[^\s]+|[^)]+\))/gi;function p(t){if(/^[r,R,L,l]{1}[\s]*\(/.test(t)){var e,n=void 0;if("l"===t[0]){var r=+(i=f.exec(t))[1]+90;n=i[2],e="linear-gradient("+r+"deg, "}else if("r"===t[0]){var i;e="radial-gradient(",n=(i=h.exec(t))[4]}var o=n.match(d);return o.forEach((function(t,n){var r=t.split(":");e+=r[1]+" "+100*Number(r[0])+"%",n!==o.length-1&&(e+=", ")})),e+=")"}return t}var g=n(8);function v(t,e,n){var r=[0,0,0,0,0,0,0,0,0];return g.mat3.fromRotation(r,n),g.mat3.multiply(t,r,e)}function y(t,e,n){var r=[0,0,0,0,0,0,0,0,0];return g.mat3.fromScaling(r,n),g.mat3.multiply(t,r,e)}function m(t,e,n){return g.mat3.multiply(t,n,e)}function b(t,e){for(var n,r,i,o,a=t?[].concat(t):[1,0,0,0,1,0,0,0,1],s=0,u=e.length;s=0;return n?i?2*Math.PI-r:r:i?r:2*Math.PI-r}function _(t,e,n){return n?(t[0]=e[1],t[1]=-1*e[0]):(t[0]=-1*e[1],t[1]=e[0]),t}function E(t,e){return void 0===e&&(e="off"),function(t,e){if("off"===e)return[].concat(t);var n="number"==typeof e&&e>=1?Math.pow(10,e):1;return t.map((function(t){var r=t.slice(1).map(Number).map((function(t){return e?Math.round(t*n)/n:Math.round(t)}));return[t[0]].concat(r)}))}(t,e).map((function(t){return t[0]+t.slice(1).join(" ")})).join("")}var S=n(1),M={x1:0,y1:0,x2:0,y2:0,x:0,y:0,qx:null,qy:null};function O(t,e,n){if(t[n].length>7){t[n].shift();for(var r=t[n],i=n;r.length;)e[n]="A",t.splice(i+=1,0,["C"].concat(r.splice(0,6)));t.splice(n,1)}}var k={a:7,c:6,h:1,l:2,m:2,r:4,q:4,s:4,t:2,v:1,z:0};function A(t){return Array.isArray(t)&&t.every((function(t){var e=t[0].toLowerCase();return k[e]===t.length-1&&"achlmqstvz".includes(e)}))}function C(t){return A(t)&&t.every((function(t){var e=t[0];return e===e.toUpperCase()}))}function j(t){return C(t)&&t.every((function(t){var e=t[0];return"ACLMQZ".includes(e)}))}function I(t){for(var e=t.pathValue[t.segmentStart],n=e.toLowerCase(),r=t.data;r.length>=k[n]&&("m"===n&&r.length>2?(t.segments.push([e].concat(r.splice(0,2))),n="l",e="m"===e?"l":"L"):t.segments.push([e].concat(r.splice(0,k[n]))),k[n]););}function T(t){var e=t.index,n=t.pathValue,r=n.charCodeAt(e);return 48===r?(t.param=0,void(t.index+=1)):49===r?(t.param=1,void(t.index+=1)):void(t.err='[path-util]: invalid Arc flag "'+n[e]+'", expecting 0 or 1 at index '+e)}function N(t){return t>=48&&t<=57||43===t||45===t||46===t}function P(t){return t>=48&&t<=57}function D(t){var e,n=t.max,r=t.pathValue,i=t.index,o=i,a=!1,s=!1,u=!1,c=!1;if(o>=n)t.err="[path-util]: Invalid path value at index "+o+', "pathValue" is missing param';else if(43!==(e=r.charCodeAt(o))&&45!==e||(o+=1,e=r.charCodeAt(o)),P(e)||46===e){if(46!==e){if(a=48===e,o+=1,e=r.charCodeAt(o),a&&o=5760&&[5760,6158,8192,8193,8194,8195,8196,8197,8198,8199,8200,8201,8202,8239,8287,12288,65279].includes(e));)t.index+=1}function R(t){var e=t.max,n=t.pathValue,r=t.index,i=n.charCodeAt(r),o=k[n[r].toLowerCase()];if(t.segmentStart=r,function(t){switch(32|t){case 109:case 122:case 108:case 104:case 118:case 99:case 115:case 113:case 116:case 97:return!0;default:return!1}}(i))if(t.index+=1,L(t),t.data=[],o){for(;;){for(var a=o;a>0;a-=1){if(97!=(32|i)||3!==a&&4!==a?D(t):T(t),t.err.length)return;t.data.push(t.param),L(t),t.index=t.max)break;if(!N(n.charCodeAt(t.index)))break}I(t)}else I(t);else t.err='[path-util]: Invalid path value "'+n[r]+'" is not a path command'}var B=function(t){this.pathValue=t,this.segments=[],this.max=t.length,this.index=0,this.param=0,this.segmentStart=0,this.data=[],this.err=""};function F(t){if(A(t))return[].concat(t);var e=new B(t);for(L(e);e.index1&&(y*=O=Math.sqrt(O),m*=O);var k=y*y,A=m*m,C=(o===a?-1:1)*Math.sqrt(Math.abs((k*A-k*M*M-A*S*S)/(k*M*M+A*S*S)));d=C*y*M/m+(g+b)/2,p=C*-m*S/y+(v+x)/2,f=Math.asin(((v-p)/m*Math.pow(10,9)>>0)/Math.pow(10,9)),h=Math.asin(((x-p)/m*Math.pow(10,9)>>0)/Math.pow(10,9)),f=gh&&(f-=2*Math.PI),!a&&h>f&&(h-=2*Math.PI)}var j=h-f;if(Math.abs(j)>w){var I=h,T=b,N=x;h=f+w*(a&&h>f?1:-1),E=X(b=d+y*Math.cos(h),x=p+m*Math.sin(h),y,m,i,0,a,T,N,[h,I,d,p])}j=h-f;var P=Math.cos(f),D=Math.sin(f),L=Math.cos(h),R=Math.sin(h),B=Math.tan(j/4),F=4/3*y*B,z=4/3*m*B,G=[g,v],Y=[g+F*D,v-z*P],W=[b+F*R,x-z*L],V=[b,x];if(Y[0]=2*G[0]-Y[0],Y[1]=2*G[1]-Y[1],c)return Y.concat(W,V,E);for(var H=[],q=0,Z=(E=Y.concat(W,V,E)).length;q=o)a={x:n,y:r};else{var s=W([t,e],[n,r],i/o);a={x:s[0],y:s[1]}}return{length:o,point:a,min:{x:Math.min(t,n),y:Math.min(e,r)},max:{x:Math.max(t,n),y:Math.max(e,r)}}}function J(t,e){var n=t.x,r=t.y,i=e.x,o=e.y,a=n*i+r*o,s=Math.sqrt((Math.pow(n,2)+Math.pow(r,2))*(Math.pow(i,2)+Math.pow(o,2)));return(n*o-r*i<0?-1:1)*Math.acos(a/s)}function tt(t,e,n,r,i,o,a,s,u,c){var l=Math.abs,f=Math.sin,h=Math.cos,d=Math.sqrt,p=Math.PI,g=l(n),v=l(r),y=(i%360+360)%360*(p/180);if(t===s&&e===u)return{x:t,y:e};if(0===g||0===v)return $(t,e,s,u,c).point;var m=(t-s)/2,b=(e-u)/2,x={x:h(y)*m+f(y)*b,y:-f(y)*m+h(y)*b},w=Math.pow(x.x,2)/Math.pow(g,2)+Math.pow(x.y,2)/Math.pow(v,2);w>1&&(g*=d(w),v*=d(w));var _=(Math.pow(g,2)*Math.pow(v,2)-Math.pow(g,2)*Math.pow(x.y,2)-Math.pow(v,2)*Math.pow(x.x,2))/(Math.pow(g,2)*Math.pow(x.y,2)+Math.pow(v,2)*Math.pow(x.x,2)),E=(o!==a?1:-1)*d(_=_<0?0:_),S=E*(g*x.y/v),M=E*(-v*x.x/g),O=h(y)*S-f(y)*M+(t+s)/2,k=f(y)*S+h(y)*M+(e+u)/2,A={x:(x.x-S)/g,y:(x.y-M)/v},C=J({x:1,y:0},A),j=J(A,{x:(-x.x-S)/g,y:(-x.y-M)/v});!a&&j>0?j-=2*p:a&&j<0&&(j+=2*p);var I=C+(j%=2*p)*c,T=g*h(I),N=v*f(I);return{x:h(y)*T-f(y)*N+O,y:f(y)*T+h(y)*N+k}}function et(t,e,n,r,i,o,a,s,u,c,l){var f,h=l.bbox,d=void 0===h||h,p=l.length,g=void 0===p||p,v=l.sampleSize,y=void 0===v?30:v,m="number"==typeof c,b=t,x=e,w=0,_=[b,x,w],E=[b,x],S={x:0,y:0},M=[{x:b,y:x}];m&&c<=0&&(S={x:b,y:x});for(var O=0;O<=y;O+=1){if(b=(f=tt(t,e,n,r,i,o,a,s,u,O/y)).x,x=f.y,d&&M.push({x:b,y:x}),g&&(w+=Q(E,[b,x])),E=[b,x],m&&w>=c&&c>_[2]){var k=(w-c)/(w-_[2]);S={x:E[0]*(1-k)+_[0]*k,y:E[1]*(1-k)+_[1]*k}}_=[b,x,w]}return m&&c>=w&&(S={x:s,y:u}),{length:w,point:S,min:{x:Math.min.apply(null,M.map((function(t){return t.x}))),y:Math.min.apply(null,M.map((function(t){return t.y})))},max:{x:Math.max.apply(null,M.map((function(t){return t.x}))),y:Math.max.apply(null,M.map((function(t){return t.y})))}}}function nt(t,e,n,r,i,o,a,s,u){var c=1-u;return{x:Math.pow(c,3)*t+3*Math.pow(c,2)*u*n+3*c*Math.pow(u,2)*i+Math.pow(u,3)*a,y:Math.pow(c,3)*e+3*Math.pow(c,2)*u*r+3*c*Math.pow(u,2)*o+Math.pow(u,3)*s}}function rt(t,e,n,r,i,o,a,s,u,c){var l,f=c.bbox,h=void 0===f||f,d=c.length,p=void 0===d||d,g=c.sampleSize,v=void 0===g?10:g,y="number"==typeof u,m=t,b=e,x=0,w=[m,b,x],_=[m,b],E={x:0,y:0},S=[{x:m,y:b}];y&&u<=0&&(E={x:m,y:b});for(var M=0;M<=v;M+=1){if(m=(l=nt(t,e,n,r,i,o,a,s,M/v)).x,b=l.y,h&&S.push({x:m,y:b}),p&&(x+=Q(_,[m,b])),_=[m,b],y&&x>=u&&u>w[2]){var O=(x-u)/(x-w[2]);E={x:_[0]*(1-O)+w[0]*O,y:_[1]*(1-O)+w[1]*O}}w=[m,b,x]}return y&&u>=x&&(E={x:a,y:s}),{length:x,point:E,min:{x:Math.min.apply(null,S.map((function(t){return t.x}))),y:Math.min.apply(null,S.map((function(t){return t.y})))},max:{x:Math.max.apply(null,S.map((function(t){return t.x}))),y:Math.max.apply(null,S.map((function(t){return t.y})))}}}function it(t,e,n,r,i,o,a){var s=1-a;return{x:Math.pow(s,2)*t+2*s*a*n+Math.pow(a,2)*i,y:Math.pow(s,2)*e+2*s*a*r+Math.pow(a,2)*o}}function ot(t,e,n,r,i,o,a,s){var u,c=s.bbox,l=void 0===c||c,f=s.length,h=void 0===f||f,d=s.sampleSize,p=void 0===d?10:d,g="number"==typeof a,v=t,y=e,m=0,b=[v,y,m],x=[v,y],w={x:0,y:0},_=[{x:v,y:y}];g&&a<=0&&(w={x:v,y:y});for(var E=0;E<=p;E+=1){if(v=(u=it(t,e,n,r,i,o,E/p)).x,y=u.y,l&&_.push({x:v,y:y}),h&&(m+=Q(x,[v,y])),x=[v,y],g&&m>=a&&a>b[2]){var S=(m-a)/(m-b[2]);w={x:x[0]*(1-S)+b[0]*S,y:x[1]*(1-S)+b[1]*S}}b=[v,y,m]}return g&&a>=m&&(w={x:i,y:o}),{length:m,point:w,min:{x:Math.min.apply(null,_.map((function(t){return t.x}))),y:Math.min.apply(null,_.map((function(t){return t.y})))},max:{x:Math.max.apply(null,_.map((function(t){return t.x}))),y:Math.max.apply(null,_.map((function(t){return t.y})))}}}function at(t,e,n){for(var r,i,o,a,s,u,c,l,f,h=Y(t),d="number"==typeof e,p=[],g=0,v=0,y=0,m=0,b=[],x=[],w=0,_={x:0,y:0},E=_,S=_,M=_,O=0,k=0,A=h.length;k=e&&(M=S),x.push(E),b.push(_),O+=w,g=(u="Z"!==l?f.slice(-2):[y,m])[0],v=u[1];return d&&e>=O&&(M={x:g,y:v}),{length:O,point:M,min:{x:Math.min.apply(null,b.map((function(t){return t.x}))),y:Math.min.apply(null,b.map((function(t){return t.y})))},max:{x:Math.max.apply(null,x.map((function(t){return t.x}))),y:Math.max.apply(null,x.map((function(t){return t.y})))}}}function st(t,e){if(!t)return{x:0,y:0,width:0,height:0,x2:0,y2:0,cx:0,cy:0,cz:0};var n=at(t,void 0,Object(S.__assign)(Object(S.__assign)({},e),{length:!1})),r=n.min,i=r.x,o=r.y,a=n.max,s=a.x,u=a.y,c=s-i,l=u-o;return{width:c,height:l,x:i,y:o,x2:s,y2:u,cx:i+c/2,cy:o+l/2,cz:Math.max(c,l)+Math.min(c,l)/2}}function ut(t,e){return at(t,void 0,Object(S.__assign)(Object(S.__assign)({},e),{bbox:!1,length:!0})).length}function ct(t,e){if(!t)return{length:0,x:0,y:0,width:0,height:0,x2:0,y2:0,cx:0,cy:0,cz:0};var n=at(t,void 0,Object(S.__assign)(Object(S.__assign)({},e),{bbox:!0,length:!0})),r=n.length,i=n.min,o=i.x,a=i.y,s=n.max,u=s.x,c=s.y,l=u-o,f=c-a;return{length:r,width:l,height:f,x:o,y:a,x2:u,y2:c,cx:o+l/2,cy:a+f/2,cz:Math.max(l,f)+Math.min(l,f)/2}}function lt(t,e){var n=t.length-1,r=[],i=0,o=function(t){var e=t.length,n=e-1;return t.map((function(r,i){return t.map((function(r,o){var a,s=i+o;return 0===o||t[s]&&"M"===t[s][0]?(a=t[s],["M"].concat(a.slice(-2))):(s>=e&&(s-=n),t[s])}))}))}(t);return o.forEach((function(o,a){t.slice(1).forEach((function(r,o){i+=Q(t[(a+o)%n].slice(-2),e[o%n].slice(-2))})),r[a]=i,i=0})),o[r.indexOf(Math.min.apply(null,r))]}function ft(t){var e=0,n=0,r=0;return q(t).map((function(t){var i;switch(t[0]){case"M":return e=t[1],n=t[2],0;default:var o=t.slice(1),a=o[0],s=o[1],u=o[2],c=o[3],l=o[4],f=o[5];return r=function(t,e,n,r,i,o,a,s){return 3*((s-e)*(n+i)-(a-t)*(r+o)+r*(t-i)-n*(e-o)+s*(i+t/3)-a*(o+e/3))/20}(e,n,a,s,u,c,l,f),i=t.slice(-2),e=i[0],n=i[1],r}})).reduce((function(t,e){return t+e}),0)}function ht(t){return ft(t)>=0}function dt(t,e,n){return at(t,e,Object(S.__assign)(Object(S.__assign)({},n),{bbox:!1,length:!0})).point}function pt(t,e){for(var n,r,i,o,a=F(t),s=Y(a),u=ut(a),c=function(t){var n=t.x-e.x,r=t.y-e.y;return n*n+r*r},l=8,f=0,h=0,d=1/0,p=0;p<=u;p+=l)(f=c(n=dt(s,p))).5;)y=c(i=dt(s,g=h-l)),m=c(o=dt(s,v=h+l)),g>=0&&y=i)return s=i-(a=ut(r=n.slice(0,-1))),{segment:n[o],index:o,length:s,lengthAtSegment:a};for(var f=[];o>0;)u=r[o],s=i-(a=ut(r=r.slice(0,-1))),i=a,f.push({segment:u,index:o,length:s,lengthAtSegment:a}),o-=1;return f.find((function(t){return t.lengthAtSegment<=e}))}(a,h);return{closest:r,distance:Math.sqrt(d),segment:b}}function gt(t,e){var n=pt(t,e).distance;return Math.abs(n)<.001}function vt(t){return t.map((function(t,e,n){var r=e&&n[e-1].slice(-2).concat(t.slice(1)),i=e?rt(r[0],r[1],r[2],r[3],r[4],r[5],r[6],r[7],r[8],{bbox:!1}).length:0;return{s:t,ss:e?i?function(t,e){void 0===e&&(e=.5);var n=t.slice(0,2),r=t.slice(2,4),i=t.slice(4,6),o=t.slice(6,8),a=W(n,r,e),s=W(r,i,e),u=W(i,o,e),c=W(a,s,e),l=W(s,u,e),f=W(c,l,e);return[["C"].concat(a,c,f),["C"].concat(l,u,o)]}(r):[t,t]:[t],l:i}}))}function yt(t,e,n){var r=vt(t),i=vt(e),o=r.length,a=i.length,s=r.filter((function(t){return t.l})).length,u=i.filter((function(t){return t.l})).length,c=r.filter((function(t){return t.l})).reduce((function(t,e){return t+e.l}),0)/s||0,l=i.filter((function(t){return t.l})).reduce((function(t,e){return t+e.l}),0)/u||0,f=n||Math.max(o,a),h=[c,l],d=[f-o,f-a],p=0,g=[r,i].map((function(t,e){return t.l===f?t.map((function(t){return t.s})):t.map((function(t,n){return p=n&&d[e]&&t.l>=h[e],d[e]-=p?1:0,p?t.ss:[t.s]})).flat()}));return g[0].length===g[1].length?g:yt(g[0],g[1],f)}var mt=function(t){return null!==t&&"function"!=typeof t&&isFinite(t.length)},bt=function(t,e){return!!mt(t)&&t.indexOf(e)>-1},xt=function(t,e){if(!mt(t))return t;for(var n=[],r=0;r-1;)Xt.call(t,o,1);return t},Ht=Array.prototype.splice,qt=function(t,e){if(!mt(t))return[];for(var n=t?e.length:0,r=n-1;n--;){var i=void 0,o=e[n];n!==r&&o===i||(i=o,Ht.call(t,o,1))}return t},Zt=function(t,e,n){if(!Ot(t)&&!Pt(t))return t;var r=n;return Ct(t,(function(t,n){r=e(r,t,n)})),r},Kt=function(t,e){var n=[];if(!mt(t))return n;for(var r=-1,i=[],o=t.length;++re[i])return 1;if(t[i]n?n:t},me=function(t,e){var n=e.toString(),r=n.indexOf(".");if(-1===r)return Math.round(t);var i=n.substr(r+1).length;return i>20&&(i=20),parseFloat(t.toFixed(i))},be=function(t){return Mt(t,"Number")},xe=function(t){return be(t)&&t%1!=0},we=function(t){return be(t)&&t%2==0},_e=Number.isInteger?Number.isInteger:function(t){return be(t)&&t%1==0},Ee=function(t){return be(t)&&t<0};function Se(t,e,n){return void 0===n&&(n=1e-5),Math.abs(t-e)0},ke=function(t,e){if(Ot(t)){for(var n,r=-1/0,i=0;ir&&(n=o,r=a)}return n}},Ae=function(t,e){if(Ot(t)){for(var n,r=1/0,i=0;ie?(r&&(clearTimeout(r),r=null),s=c,a=t.apply(i,o),r||(i=o=null)):r||!1===n.trailing||(r=setTimeout(u,l)),a};return c.cancel=function(){clearTimeout(r),s=0,r=i=o=null},c},Nn=function(t){return mt(t)?Array.prototype.slice.call(t):[]},Pn={},Dn=function(t){return Pn[t=t||"g"]?Pn[t]+=1:Pn[t]=1,t+Pn[t]},Ln=function(){},Rn=function(t){return t};function Bn(t){return Et(t)?0:mt(t)?t.length:Object.keys(t).length}var Fn=function(){function t(){this.map={}}return t.prototype.has=function(t){return void 0!==this.map[t]},t.prototype.get=function(t,e){var n=this.map[t];return void 0===n?e:n},t.prototype.set=function(t,e){this.map[t]=e},t.prototype.clear=function(){this.map={}},t.prototype.delete=function(t){delete this.map[t]},t.prototype.size=function(){return Object.keys(this.map).length},t}();function zn(t){return Math.abs(t)<1e-6?0:t<0?-1:1}function Gn(t,e,n){return(n[0]-t[0])*(e[1]-t[1])==(e[0]-t[0])*(n[1]-t[1])&&Math.min(t[0],e[0])<=n[0]&&n[0]<=Math.max(t[0],e[0])&&Math.min(t[1],e[1])<=n[1]&&n[1]<=Math.max(t[1],e[1])}function Yn(t,e,n){var r=!1,i=t.length;if(i<=2)return!1;for(var o=0;o0!=zn(s[1]-n)>0&&zn(e-(n-a[1])*(a[0]-s[0])/(a[1]-s[1])-a[0])<0&&(r=!r)}return r}var Un=function(t,e,n){return t>=e&&t<=n};function Xn(t){for(var e=[],n=t.length,r=0;r1){var a=t[0],s=t[n-1];e.push({from:{x:s[0],y:s[1]},to:{x:a[0],y:a[1]}})}return e}function Wn(t,e){var n=!1;return t.forEach((function(t){if(function(t,e,n,r){var i=n.x-t.x,o=n.y-t.y,a=e.x-t.x,s=e.y-t.y,u=r.x-n.x,c=r.y-n.y,l=a*c-s*u,f=null;if(l*l>.001*(a*a+s*s)*(u*u+c*c)){var h=(i*c-o*u)/l,d=(i*s-o*a)/l;Un(h,0,1)&&Un(d,0,1)&&(f={x:t.x+h*a,y:t.y+h*s})}return f}(t.from,t.to,e.from,e.to))return n=!0,!1})),n}function Vn(t){var e=t.map((function(t){return t[0]})),n=t.map((function(t){return t[1]}));return{minX:Math.min.apply(null,e),maxX:Math.max.apply(null,e),minY:Math.min.apply(null,n),maxY:Math.max.apply(null,n)}}function Hn(t,e){if(t.length<2||e.length<2)return!1;var n,r,i=Vn(t),o=Vn(e);if(n=i,(r=o).minX>n.maxX||r.maxXn.maxY||r.maxY1&&void 0!==arguments[1]?arguments[1]:{};if(!i(t))throw new TypeError("input must be an array");if(0===t.length)throw new TypeError("input must not be empty");var n=e.fromIndex,r=void 0===n?0:n,o=e.toIndex,a=void 0===o?t.length:o;if(r<0||r>=t.length||!Number.isInteger(r))throw new Error("fromIndex must be a positive integer smaller than length");if(a<=r||a>t.length||!Number.isInteger(a))throw new Error("toIndex must be an integer greater than fromIndex and at most equal to length");for(var s=t[r],u=r+1;us&&(s=t[u]);return s}function a(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};if(!i(t))throw new TypeError("input must be an array");if(0===t.length)throw new TypeError("input must not be empty");var n=e.fromIndex,r=void 0===n?0:n,o=e.toIndex,a=void 0===o?t.length:o;if(r<0||r>=t.length||!Number.isInteger(r))throw new Error("fromIndex must be a positive integer smaller than length");if(a<=r||a>t.length||!Number.isInteger(a))throw new Error("toIndex must be an integer greater than fromIndex and at most equal to length");for(var s=t[r],u=r+1;u1&&void 0!==arguments[1]?arguments[1]:{};if(!i(t))throw new TypeError("input must be an array");if(0===t.length)throw new TypeError("input must not be empty");if(void 0!==n.output){if(!i(n.output))throw new TypeError("output option must be an array if specified");e=n.output}else e=new Array(t.length);var r=a(t),s=o(t);if(r===s)throw new RangeError("minimum and maximum input values are equal. Cannot rescale a constant array");var u=n.min,c=void 0===u?n.autoMinMax?r:0:u,l=n.max,f=void 0===l?n.autoMinMax?s:1:l;if(c>=f)throw new RangeError("min option must be smaller than max option");for(var h=(f-c)/(s-r),d=0;d1&&void 0!==arguments[1]?arguments[1]:{},n=e.maxRows,r=void 0===n?15:n,i=e.maxColumns,o=void 0===i?10:i,a=e.maxNumSize,s=void 0===a?8:a,l=e.padMinus,h=void 0===l?"auto":l;return"".concat(t.constructor.name," {\n").concat(u,"[\n").concat(c).concat(f(t,r,o,s,h),"\n").concat(u,"]\n").concat(u,"rows: ").concat(t.rows,"\n").concat(u,"columns: ").concat(t.columns,"\n}")}function f(t,e,n,r,i){var o=t.rows,a=t.columns,s=Math.min(o,e),u=Math.min(a,n),l=[];if("auto"===i){i=!1;t:for(var f=0;f=0&&n?" ".concat(d(t,e-1)):d(t,e)).padEnd(e)}function d(t,e){var n=t.toString();if(n.length<=e)return n;var r=t.toFixed(e);if(r.length>e&&(r=t.toFixed(Math.max(0,e-(r.length-e)))),r.length<=e&&!r.startsWith("0.000")&&!r.startsWith("-0.000"))return r;var i=t.toExponential(e);return i.length>e&&(i=t.toExponential(Math.max(0,e-(i.length-e)))),i.slice(0)}function p(t,e,n){var r=n?t.rows:t.rows-1;if(e<0||e>r)throw new RangeError("Row index out of range")}function g(t,e,n){var r=n?t.columns:t.columns-1;if(e<0||e>r)throw new RangeError("Column index out of range")}function v(t,e){if(e.to1DArray&&(e=e.to1DArray()),e.length!==t.columns)throw new RangeError("vector size must be the same as the number of columns");return e}function y(t,e){if(e.to1DArray&&(e=e.to1DArray()),e.length!==t.rows)throw new RangeError("vector size must be the same as the number of rows");return e}function m(t,e){if(!i(e))throw new TypeError("row indices must be an array");for(var n=0;n=t.rows)throw new RangeError("row indices are out of range")}function b(t,e){if(!i(e))throw new TypeError("column indices must be an array");for(var n=0;n=t.columns)throw new RangeError("column indices are out of range")}function x(t,e,n,r,i){if(5!==arguments.length)throw new RangeError("expected 4 arguments");if(_("startRow",e),_("endRow",n),_("startColumn",r),_("endColumn",i),e>n||r>i||e<0||e>=t.rows||n<0||n>=t.rows||r<0||r>=t.columns||i<0||i>=t.columns)throw new RangeError("Submatrix indices are out of range")}function w(t){for(var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0,n=[],r=0;rn?(i=!0,n=e):(r=!1,i=!0);t++}return r}},{key:"isReducedEchelonForm",value:function(){for(var t=0,e=0,n=-1,r=!0,i=!1;tn?(i=!0,n=e):(r=!1,i=!0);for(var o=e+1;ot.get(r,n)&&(r=i);if(0===t.get(r,n))n++;else{t.swapRows(e,r);for(var o=t.get(e,n),a=n;a=0;)if(0===t.maxRow(r))r--;else{for(var i=0,o=!1;i0&&void 0!==arguments[0]?arguments[0]:{};if("object"!==z(t))throw new TypeError("options must be an object");var e=t.rows,n=void 0===e?1:e,r=t.columns,i=void 0===r?1:r;if(!Number.isInteger(n)||n<=0)throw new TypeError("rows must be a positive integer");if(!Number.isInteger(i)||i<=0)throw new TypeError("columns must be a positive integer");for(var o=new q(this.rows*n,this.columns*i),a=0;ae[n]&&(e[n]=this.get(n,r));return e;case"column":for(var i=new Array(this.columns).fill(Number.NEGATIVE_INFINITY),o=0;oi[a]&&(i[a]=this.get(o,a));return i;case void 0:for(var s=this.get(0,0),u=0;us&&(s=this.get(u,c));return s;default:throw new Error("invalid option: ".concat(t))}}},{key:"maxIndex",value:function(){E(this);for(var t=this.get(0,0),e=[0,0],n=0;nt&&(t=this.get(n,r),e[0]=n,e[1]=r);return e}},{key:"min",value:function(t){if(this.isEmpty())return NaN;switch(t){case"row":for(var e=new Array(this.rows).fill(Number.POSITIVE_INFINITY),n=0;ne&&(e=this.get(t,n));return e}},{key:"maxRowIndex",value:function(t){p(this,t),E(this);for(var e=this.get(t,0),n=[t,0],r=1;re&&(e=this.get(t,r),n[1]=r);return n}},{key:"minRow",value:function(t){if(p(this,t),this.isEmpty())return NaN;for(var e=this.get(t,0),n=1;ne&&(e=this.get(n,t));return e}},{key:"maxColumnIndex",value:function(t){g(this,t),E(this);for(var e=this.get(0,t),n=[0,t],r=1;re&&(e=this.get(r,t),n[0]=r);return n}},{key:"minColumn",value:function(t){if(g(this,t),this.isEmpty())return NaN;for(var e=this.get(0,t),n=1;n0&&void 0!==arguments[0]?arguments[0]:"frobenius",e=0;if("max"===t)return this.max();if("frobenius"===t){for(var n=0;n0&&void 0!==arguments[0]?arguments[0]:{};if("object"!==z(t))throw new TypeError("options must be an object");var e=t.min,n=void 0===e?0:e,r=t.max,i=void 0===r?1:r;if(!Number.isFinite(n))throw new TypeError("min must be a number");if(!Number.isFinite(i))throw new TypeError("max must be a number");if(n>=i)throw new RangeError("min must be smaller than max");for(var o=new q(this.rows,this.columns),a=0;a0&&s(u,{min:n,max:i,output:u}),o.setRow(a,u)}return o}},{key:"scaleColumns",value:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};if("object"!==z(t))throw new TypeError("options must be an object");var e=t.min,n=void 0===e?0:e,r=t.max,i=void 0===r?1:r;if(!Number.isFinite(n))throw new TypeError("min must be a number");if(!Number.isFinite(i))throw new TypeError("max must be a number");if(n>=i)throw new RangeError("min must be smaller than max");for(var o=new q(this.rows,this.columns),a=0;a0&&void 0!==arguments[0]?arguments[0]:W,e=0;e0&&void 0!==arguments[0]?arguments[0]:W,e=0;en||e<0||e>=this.columns||n<0||n>=this.columns)throw new RangeError("Argument out of range");for(var r=new q(t.length,n-e+1),i=0;i=this.rows)throw new RangeError("Row index out of range: ".concat(t[i]));r.set(i,o-e,this.get(t[i],o))}return r}},{key:"subMatrixColumn",value:function(t,e,n){if(void 0===e&&(e=0),void 0===n&&(n=this.rows-1),e>n||e<0||e>=this.rows||n<0||n>=this.rows)throw new RangeError("Argument out of range");for(var r=new q(n-e+1,t.length),i=0;i=this.columns)throw new RangeError("Column index out of range: ".concat(t[i]));r.set(o-e,i,this.get(o,t[i]))}return r}},{key:"setSubMatrix",value:function(t,e,n){if((t=q.checkMatrix(t)).isEmpty())return this;x(this,e,e+t.rows-1,n,n+t.columns-1);for(var r=0;r1&&void 0!==arguments[1]?arguments[1]:{};if("object"===z(t)&&(e=t,t=void 0),"object"!==z(e))throw new TypeError("options must be an object");var n=e,r=n.unbiased,o=void 0===r||r,a=n.mean,s=void 0===a?this.mean(t):a;if("boolean"!=typeof o)throw new TypeError("unbiased must be a boolean");switch(t){case"row":if(!i(s))throw new TypeError("mean must be an array");return S(this,o,s);case"column":if(!i(s))throw new TypeError("mean must be an array");return M(this,o,s);case void 0:if("number"!=typeof s)throw new TypeError("mean must be a number");return O(this,o,s);default:throw new Error("invalid option: ".concat(t))}}},{key:"standardDeviation",value:function(t,e){"object"===z(t)&&(e=t,t=void 0);var n=this.variance(t,e);if(void 0===t)return Math.sqrt(n);for(var r=0;r1&&void 0!==arguments[1]?arguments[1]:{};if("object"===z(t)&&(e=t,t=void 0),"object"!==z(e))throw new TypeError("options must be an object");var n=e,r=n.center,o=void 0===r?this.mean(t):r;switch(t){case"row":if(!i(o))throw new TypeError("center must be an array");return k(this,o),this;case"column":if(!i(o))throw new TypeError("center must be an array");return A(this,o),this;case void 0:if("number"!=typeof o)throw new TypeError("center must be a number");return C(this,o),this;default:throw new Error("invalid option: ".concat(t))}}},{key:"scale",value:function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};if("object"===z(t)&&(e=t,t=void 0),"object"!==z(e))throw new TypeError("options must be an object");var n=e.scale;switch(t){case"row":if(void 0===n)n=j(this);else if(!i(n))throw new TypeError("scale must be an array");return I(this,n),this;case"column":if(void 0===n)n=T(this);else if(!i(n))throw new TypeError("scale must be an array");return N(this,n),this;case void 0:if(void 0===n)n=P(this);else if("number"!=typeof n)throw new TypeError("scale must be a number");return D(this,n),this;default:throw new Error("invalid option: ".concat(t))}}},{key:"toString",value:function(t){return l(this,t)}}],[{key:"from1DArray",value:function(t,e,n){if(t*e!==n.length)throw new RangeError("data length does not match given dimensions");for(var r=new q(t,e),i=0;i2&&void 0!==arguments[2]?arguments[2]:{};if("object"!==z(n))throw new TypeError("options must be an object");for(var r=n.random,i=void 0===r?Math.random:r,o=new q(t,e),a=0;a2&&void 0!==arguments[2]?arguments[2]:{};if("object"!==z(n))throw new TypeError("options must be an object");var r=n.min,i=void 0===r?0:r,o=n.max,a=void 0===o?1e3:o,s=n.random,u=void 0===s?Math.random:s;if(!Number.isInteger(i))throw new TypeError("min must be an integer");if(!Number.isInteger(a))throw new TypeError("max must be an integer");if(i>=a)throw new RangeError("min must be smaller than max");for(var c=a-i,l=new q(t,e),f=0;f=0){if(o.data=[],!(Number.isInteger(r)&&r>=0))throw new TypeError("nColumns must be a positive integer");for(var a=0;a>t);return this},V.prototype.signPropagatingRightShiftM=function(t){if(t=H.checkMatrix(t),this.rows!==t.rows||this.columns!==t.columns)throw new RangeError("Matrices dimensions must be equal");for(var e=0;e>t.get(e,n));return this},V.signPropagatingRightShift=function(t,e){return new H(t).signPropagatingRightShift(e)},V.prototype.rightShift=function(t){return"number"==typeof t?this.rightShiftS(t):this.rightShiftM(t)},V.prototype.rightShiftS=function(t){for(var e=0;e>>t);return this},V.prototype.rightShiftM=function(t){if(t=H.checkMatrix(t),this.rows!==t.rows||this.columns!==t.columns)throw new RangeError("Matrices dimensions must be equal");for(var e=0;e>>t.get(e,n));return this},V.rightShift=function(t,e){return new H(t).rightShift(e)},V.prototype.zeroFillRightShift=V.prototype.rightShift,V.prototype.zeroFillRightShiftS=V.prototype.rightShiftS,V.prototype.zeroFillRightShiftM=V.prototype.rightShiftM,V.zeroFillRightShift=V.rightShift,V.prototype.not=function(){for(var t=0;t1&&void 0!==arguments[1]?arguments[1]:{};he(this,o);var r=n.rows,a=void 0===r?1:r;if(t.length%a!=0)throw new Error("the data length is not divisible by the number of rows");return(e=i.call(this)).rows=a,e.columns=t.length/a,e.data=t,e}return e=o,(n=[{key:"set",value:function(t,e,n){var r=this._calculateIndex(t,e);return this.data[r]=n,this}},{key:"get",value:function(t,e){var n=this._calculateIndex(t,e);return this.data[n]}},{key:"_calculateIndex",value:function(t,e){return t*this.columns+e}}])&&de(e.prototype,n),r&&de(e,r),Object.defineProperty(e,"prototype",{writable:!1}),o}(X);function be(t){return(be="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function xe(t,e){for(var n=0;nMath.abs(c[o])&&(o=n);if(o!==r){for(i=0;i=0;i--){for(r=0;ro?r.set(i,o,t.get(i,o)):i===o?r.set(i,o,1):r.set(i,o,0);return r}},{key:"upperTriangularMatrix",get:function(){for(var t=this.LU,e=t.rows,n=t.columns,r=new q(e,n),i=0;iMath.abs(e)?(n=e/t,Math.abs(t)*Math.sqrt(1+n*n)):0!==e?(n=t/e,Math.abs(e)*Math.sqrt(1+n*n)):0}function Ie(t){return(Ie="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Te(t,e){for(var n=0;n=0;o--){for(i=0;i=0;n--){for(t=0;t1&&void 0!==arguments[1]?arguments[1]:{};if(De(this,t),(e=Me.checkMatrix(e)).isEmpty())throw new Error("Matrix must be non-empty");var r,i=e.rows,o=e.columns,a=n.computeLeftSingularVectors,s=void 0===a||a,u=n.computeRightSingularVectors,c=void 0===u||u,l=n.autoTranspose,f=void 0!==l&&l,h=Boolean(s),d=Boolean(c),p=!1;if(i=0;Z--)if(0!==m[Z]){for(var K=Z+1;K=0;rt--){if(rt0;){var ft=void 0,ht=void 0;for(ft=W-2;ft>=-1&&-1!==ft;ft--){var dt=Number.MIN_VALUE+lt*Math.abs(m[ft]+Math.abs(m[ft+1]));if(Math.abs(w[ft])<=dt||Number.isNaN(w[ft])){w[ft]=0;break}}if(ft===W-2)ht=4;else{var pt=void 0;for(pt=W-1;pt>=ft&&pt!==ft;pt--){var gt=(pt!==W?Math.abs(w[pt]):0)+(pt!==ft+1?Math.abs(w[pt-1]):0);if(Math.abs(m[pt])<=lt*gt){m[pt]=0;break}}pt===ft?ht=3:pt===W-1?ht=1:(ht=2,ft=pt)}switch(ft++,ht){case 1:var vt=w[W-2];w[W-2]=0;for(var yt=W-2;yt>=ft;yt--){var mt=je(m[yt],vt),bt=m[yt]/mt,xt=vt/mt;if(m[yt]=mt,yt!==ft&&(vt=-xt*w[yt-1],w[yt-1]=bt*w[yt-1]),d)for(var wt=0;wt=m[ft+1]);){var Vt=m[ft];if(m[ft]=m[ft+1],m[ft+1]=Vt,d&&fte&&i.set(o,a,t.get(o,a)/this.s[a]);for(var s=this.U,u=s.rows,c=s.columns,l=new q(n,u),f=0;ft&&e++;return e}},{key:"diagonal",get:function(){return Array.from(this.s)}},{key:"threshold",get:function(){return Number.EPSILON/2*Math.max(this.m,this.n)*this.s[0]}},{key:"leftSingularVectors",get:function(){return this.U}},{key:"rightSingularVectors",get:function(){return this.V}},{key:"diagonalMatrix",get:function(){return q.diag(this.s)}}])&&Le(e.prototype,n),r&&Le(e,r),Object.defineProperty(e,"prototype",{writable:!1}),t}();function Be(t){var e=arguments.length>1&&void 0!==arguments[1]&&arguments[1];return t=Me.checkMatrix(t),e?new Re(t).inverse():Fe(t,q.eye(t.rows))}function Fe(t,e){var n=arguments.length>2&&void 0!==arguments[2]&&arguments[2];return t=Me.checkMatrix(t),e=Me.checkMatrix(e),n?new Re(t).solve(e):t.isSquare()?new Ce(t).solve(e):new Ne(t).solve(e)}function ze(t){var e,n,r,i,o,a;if((t=q.checkMatrix(t)).isSquare())return 0===t.columns?1:2===t.columns?(e=t.get(0,0),n=t.get(0,1),r=t.get(1,0),e*t.get(1,1)-n*r):3===t.columns?(i=new Kt(t,[1,2],[1,2]),o=new Kt(t,[1,2],[0,2]),a=new Kt(t,[1,2],[0,1]),e=t.get(0,0),n=t.get(0,1),r=t.get(0,2),e*ze(i)-n*ze(o)+r*ze(a)):new Ce(t).determinant;throw Error("determinant can only be calculated for a square matrix")}function Ge(t,e){for(var n=[],r=0;r3&&void 0!==arguments[3]?arguments[3]:1e-9,i=arguments.length>4&&void 0!==arguments[4]?arguments[4]:1e-9;if(t>i)return new Array(e.rows+1).fill(0);for(var o=e.addRow(n,[0]),a=0;a1&&void 0!==arguments[1]?arguments[1]:{},n=e.thresholdValue,r=void 0===n?1e-9:n,i=e.thresholdError,o=void 0===i?1e-9:i,a=(t=q.checkMatrix(t)).rows,s=new q(a,a),u=0;u1&&void 0!==arguments[1]?arguments[1]:Number.EPSILON;if((t=q.checkMatrix(t)).isEmpty())return t.transpose();for(var n=new Re(t,{autoTranspose:!0}),r=n.leftSingularVectors,i=n.rightSingularVectors,o=n.diagonal,a=0;ae?o[a]=1/o[a]:o[a]=0;return i.mmul(q.diag(o).mmul(r.transpose()))}function We(t){return(We="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Ve(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:t,n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};t=new q(t);var r=!1;if("object"!==We(e)||q.isMatrix(e)||i(e)?e=new q(e):(n=e,e=t,r=!0),t.rows!==e.rows)throw new TypeError("Both matrices must have the same number of rows");var o=n,a=o.center,s=void 0===a||a;s&&(t=t.center("column"),r||(e=e.center("column")));for(var u=t.transpose().mmul(e),c=0;c1&&void 0!==arguments[1]?arguments[1]:t,n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};t=new q(t);var r=!1;if("object"!==He(e)||q.isMatrix(e)||i(e)?e=new q(e):(n=e,e=t,r=!0),t.rows!==e.rows)throw new TypeError("Both matrices must have the same number of rows");var o=n,a=o.center,s=void 0===a||a,u=o.scale,c=void 0===u||u;s&&(t.center("column"),r||e.center("column")),c&&(t.scale("column"),r||e.scale("column"));for(var l=t.standardDeviation("column",{unbiased:!0}),f=r?l:e.standardDeviation("column",{unbiased:!0}),h=t.transpose().mmul(e),d=0;d1&&void 0!==arguments[1]?arguments[1]:{};Ke(this,t);var r=n.assumeSymmetric,i=void 0!==r&&r;if(!(e=Me.checkMatrix(e)).isSquare())throw new Error("Matrix is not a square matrix");if(e.isEmpty())throw new Error("Matrix must be non-empty");var o,a,s=e.columns,u=new q(s,s),c=new Float64Array(s),l=new Float64Array(s),f=e;if(!!i||e.isSymmetric()){for(o=0;o0?o.set(t,t+1,r[t]):r[t]<0&&o.set(t,t-1,r[t])}return o}}])&&Qe(e.prototype,n),r&&Qe(e,r),Object.defineProperty(e,"prototype",{writable:!1}),t}();function Je(t,e,n,r){var i,o,a,s,u,c,l,f;for(u=0;u0;s--){for(f=0,a=0,c=0;c0&&(o=-o),e[s]=f*o,a-=i*o,n[s-1]=i-o,u=0;uc){0;do{for(1,i=n[c],h=je(f=(n[c+1]-i)/(2*e[c]),1),f<0&&(h=-h),n[c]=e[c]/(f+h),n[c+1]=e[c]*(f+h),d=n[c+1],o=i-n[c],a=c+2;a=c;a--)for(v=g,g=p,b=m,i=p*e[a],o=p*f,h=je(f,e[a]),e[a+1]=m*h,m=e[a]/h,f=(p=f/h)*n[a]-m*i,n[a+1]=o+m*(p*i+m*n[a]),u=0;u_*w)}n[c]=n[c]+x,e[c]=0}for(a=0;a=c;s--)n[s]=e.get(s,c-1)/l,a+=n[s]*n[s];for(o=Math.sqrt(a),n[c]>0&&(o=-o),a-=n[c]*o,n[c]=n[c]-o,u=c;u=c;s--)i+=n[s]*e.get(s,u);for(i/=a,s=c;s<=f;s++)e.set(s,u,e.get(s,u)-i*n[s])}for(s=0;s<=f;s++){for(i=0,u=f;u>=c;u--)i+=n[u]*e.get(s,u);for(i/=a,u=c;u<=f;u++)e.set(s,u,e.get(s,u)-i*n[u])}n[c]=l*n[c],e.set(c,c-1,l*o)}}for(s=0;s=1;c--)if(0!==e.get(c,c-1)){for(s=c+1;s<=f;s++)n[s]=e.get(s,c-1);for(u=c;u<=f;u++){for(o=0,s=c;s<=f;s++)o+=n[s]*r.get(s,u);for(o=o/n[c]/e.get(c,c-1),s=c;s<=f;s++)r.set(s,u,r.get(s,u)+o*n[s])}}}function nn(t,e,n,r,i){var o,a,s,u,c,l,f,h,d,p,g,v,y,m,b,x=t-1,w=t-1,_=Number.EPSILON,E=0,S=0,M=0,O=0,k=0,A=0,C=0,j=0;for(o=0;ow)&&(n[o]=i.get(o,o),e[o]=0),a=Math.max(o-1,0);a=0;){for(u=x;u>0&&(0===(A=Math.abs(i.get(u-1,u-1))+Math.abs(i.get(u,u)))&&(A=S),!(Math.abs(i.get(u,u-1))<_*A));)u--;if(u===x)i.set(x,x,i.get(x,x)+E),n[x]=i.get(x,x),e[x]=0,x--,j=0;else if(u===x-1){if(f=i.get(x,x-1)*i.get(x-1,x),O=(M=(i.get(x-1,x-1)-i.get(x,x))/2)*M+f,C=Math.sqrt(Math.abs(O)),i.set(x,x,i.get(x,x)+E),i.set(x-1,x-1,i.get(x-1,x-1)+E),h=i.get(x,x),O>=0){for(C=M>=0?M+C:M-C,n[x-1]=h+C,n[x]=n[x-1],0!==C&&(n[x]=h-f/C),e[x-1]=0,e[x]=0,M=(h=i.get(x,x-1))/(A=Math.abs(h)+Math.abs(C)),O=C/A,M/=k=Math.sqrt(M*M+O*O),O/=k,a=x-1;a0){for(A=Math.sqrt(A),d=u&&(M=((k=h-(C=i.get(c,c)))*(A=d-C)-f)/i.get(c+1,c)+i.get(c,c+1),O=i.get(c+1,c+1)-C-k-A,k=i.get(c+2,c+1),M/=A=Math.abs(M)+Math.abs(O)+Math.abs(k),O/=A,k/=A,c!==u)&&!(Math.abs(i.get(c,c-1))*(Math.abs(O)+Math.abs(k))<_*(Math.abs(M)*(Math.abs(i.get(c-1,c-1))+Math.abs(C)+Math.abs(i.get(c+1,c+1)))));)c--;for(o=c+2;o<=x;o++)i.set(o,o-2,0),o>c+2&&i.set(o,o-3,0);for(s=c;s<=x-1&&(m=s!==x-1,s!==c&&(M=i.get(s,s-1),O=i.get(s+1,s-1),k=m?i.get(s+2,s-1):0,0!==(h=Math.abs(M)+Math.abs(O)+Math.abs(k))&&(M/=h,O/=h,k/=h)),0!==h);s++)if(A=Math.sqrt(M*M+O*O+k*k),M<0&&(A=-A),0!==A){for(s!==c?i.set(s,s-1,-A*h):u!==c&&i.set(s,s-1,-i.get(s,s-1)),h=(M+=A)/A,d=O/A,C=k/A,O/=M,k/=M,a=s;a=0;x--)if(M=n[x],0===(O=e[x]))for(u=x,i.set(x,x,1),o=x-1;o>=0;o--){for(f=i.get(o,o)-M,k=0,a=u;a<=x;a++)k+=i.get(o,a)*i.get(a,x);if(e[o]<0)C=f,A=k;else if(u=o,0===e[o]?i.set(o,x,0!==f?-k/f:-k/(_*S)):(h=i.get(o,o+1),d=i.get(o+1,o),l=(h*A-C*k)/(O=(n[o]-M)*(n[o]-M)+e[o]*e[o]),i.set(o,x,l),i.set(o+1,x,Math.abs(h)>Math.abs(C)?(-k-f*l)/h:(-A-d*l)/C)),_*(l=Math.abs(i.get(o,x)))*l>1)for(a=o;a<=x;a++)i.set(a,x,i.get(a,x)/l)}else if(O<0)for(u=x-1,Math.abs(i.get(x,x-1))>Math.abs(i.get(x-1,x))?(i.set(x-1,x-1,O/i.get(x,x-1)),i.set(x-1,x,-(i.get(x,x)-M)/i.get(x,x-1))):(b=rn(0,-i.get(x-1,x),i.get(x-1,x-1)-M,O),i.set(x-1,x-1,b[0]),i.set(x-1,x,b[1])),i.set(x,x-1,0),i.set(x,x,1),o=x-2;o>=0;o--){for(p=0,g=0,a=u;a<=x;a++)p+=i.get(o,a)*i.get(a,x-1),g+=i.get(o,a)*i.get(a,x);if(f=i.get(o,o)-M,e[o]<0)C=f,k=p,A=g;else if(u=o,0===e[o]?(b=rn(-p,-g,f,O),i.set(o,x-1,b[0]),i.set(o,x,b[1])):(h=i.get(o,o+1),d=i.get(o+1,o),v=(n[o]-M)*(n[o]-M)+e[o]*e[o]-O*O,y=2*(n[o]-M)*O,0===v&&0===y&&(v=_*S*(Math.abs(f)+Math.abs(O)+Math.abs(h)+Math.abs(d)+Math.abs(C))),b=rn(h*k-C*p+O*g,h*A-C*g-O*p,v,y),i.set(o,x-1,b[0]),i.set(o,x,b[1]),Math.abs(h)>Math.abs(C)+Math.abs(O)?(i.set(o+1,x-1,(-p-f*i.get(o,x-1)+O*i.get(o,x))/h),i.set(o+1,x,(-g-f*i.get(o,x)-O*i.get(o,x-1))/h)):(b=rn(-k-d*i.get(o,x-1),-A-d*i.get(o,x),C,O),i.set(o+1,x-1,b[0]),i.set(o+1,x,b[1]))),_*(l=Math.max(Math.abs(i.get(o,x-1)),Math.abs(i.get(o,x))))*l>1)for(a=o;a<=x;a++)i.set(a,x-1,i.get(a,x-1)/l),i.set(a,x,i.get(a,x)/l)}for(o=0;ow)for(a=o;a=0;a--)for(o=0;o<=w;o++){for(C=0,s=0;s<=Math.min(a,w);s++)C+=r.get(o,s)*i.get(s,a);r.set(o,a,C)}}}function rn(t,e,n,r){var i,o;return Math.abs(n)>Math.abs(r)?[(t+(i=r/n)*e)/(o=n+i*r),(e-i*t)/o]:[((i=n/r)*t+e)/(o=r+i*n),(i*e-t)/o]}function on(t){return(on="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function an(t,e){for(var n=0;n0,s.set(r,r,Math.sqrt(Math.max(c,0))),i=r+1;i=0;o--)for(i=0;i1&&void 0!==arguments[1]?arguments[1]:{};fn(this,t),e=Me.checkMatrix(e);var r,o=n.Y,a=n.scaleScores,s=void 0!==a&&a,u=n.maxIterations,c=void 0===u?1e3:u,l=n.terminationCriteria,f=void 0===l?1e-10:l;if(o){if((o=i(o)&&"number"==typeof o[0]?q.columnVector(o):Me.checkMatrix(o)).rows!==e.rows)throw new Error("Y should have the same number of rows as X");r=o.getColumnVector(0)}else r=e.getColumnVector(0);for(var h,d,p,g,v=1,y=0;yf;y++)p=(p=e.transpose().mmul(r).div(r.transpose().mmul(r).get(0,0))).div(p.norm()),h=e.mmul(p).div(p.transpose().mmul(p).get(0,0)),y>0&&(v=h.clone().sub(g).pow(2).sum()),g=h.clone(),o?(d=(d=o.transpose().mmul(h).div(h.transpose().mmul(h).get(0,0))).div(d.norm()),r=o.mmul(d).div(d.transpose().mmul(d).get(0,0))):r=h;if(o){var m=e.transpose().mmul(h).div(h.transpose().mmul(h).get(0,0));m=m.div(m.norm());var b=e.clone().sub(h.clone().mmul(m.transpose())),x=r.transpose().mmul(h).div(h.transpose().mmul(h).get(0,0)),w=o.clone().sub(h.clone().mulS(x.get(0,0)).mmul(d.transpose()));this.t=h,this.p=m.transpose(),this.w=p.transpose(),this.q=d,this.u=r,this.s=h.transpose().mmul(h),this.xResidual=b,this.yResidual=w,this.betas=x}else this.w=p.transpose(),this.s=h.transpose().mmul(h).sqrt(),this.t=s?h.clone().div(this.s.get(0,0)):h,this.xResidual=e.sub(h.mmul(p.transpose()))}))},function(t,e,n){"use strict";n.r(e),n.d(e,"World",(function(){return At})),n.d(e,"Kernel",(function(){return W}));var r=n(25),i=n.n(r),o=n(3),a=n.n(o),s=n(13),u=n.n(s),c=n(14),l=n.n(c),f=n(34),h=n.n(f),d=n(116),p=n.n(d),g=n(117),v=n.n(g),y=n(17),m=n.n(y),b=1;function x(){return b++}var w,_;(_=w||(w={}))[_.DEPTH_BUFFER_BIT=256]="DEPTH_BUFFER_BIT",_[_.STENCIL_BUFFER_BIT=1024]="STENCIL_BUFFER_BIT",_[_.COLOR_BUFFER_BIT=16384]="COLOR_BUFFER_BIT",_[_.POINTS=0]="POINTS",_[_.LINES=1]="LINES",_[_.LINE_LOOP=2]="LINE_LOOP",_[_.LINE_STRIP=3]="LINE_STRIP",_[_.TRIANGLES=4]="TRIANGLES",_[_.TRIANGLE_STRIP=5]="TRIANGLE_STRIP",_[_.TRIANGLE_FAN=6]="TRIANGLE_FAN",_[_.ZERO=0]="ZERO",_[_.ONE=1]="ONE",_[_.SRC_COLOR=768]="SRC_COLOR",_[_.ONE_MINUS_SRC_COLOR=769]="ONE_MINUS_SRC_COLOR",_[_.SRC_ALPHA=770]="SRC_ALPHA",_[_.ONE_MINUS_SRC_ALPHA=771]="ONE_MINUS_SRC_ALPHA",_[_.DST_ALPHA=772]="DST_ALPHA",_[_.ONE_MINUS_DST_ALPHA=773]="ONE_MINUS_DST_ALPHA",_[_.DST_COLOR=774]="DST_COLOR",_[_.ONE_MINUS_DST_COLOR=775]="ONE_MINUS_DST_COLOR",_[_.SRC_ALPHA_SATURATE=776]="SRC_ALPHA_SATURATE",_[_.FUNC_ADD=32774]="FUNC_ADD",_[_.BLEND_EQUATION=32777]="BLEND_EQUATION",_[_.BLEND_EQUATION_RGB=32777]="BLEND_EQUATION_RGB",_[_.BLEND_EQUATION_ALPHA=34877]="BLEND_EQUATION_ALPHA",_[_.FUNC_SUBTRACT=32778]="FUNC_SUBTRACT",_[_.FUNC_REVERSE_SUBTRACT=32779]="FUNC_REVERSE_SUBTRACT",_[_.MAX_EXT=32776]="MAX_EXT",_[_.MIN_EXT=32775]="MIN_EXT",_[_.BLEND_DST_RGB=32968]="BLEND_DST_RGB",_[_.BLEND_SRC_RGB=32969]="BLEND_SRC_RGB",_[_.BLEND_DST_ALPHA=32970]="BLEND_DST_ALPHA",_[_.BLEND_SRC_ALPHA=32971]="BLEND_SRC_ALPHA",_[_.CONSTANT_COLOR=32769]="CONSTANT_COLOR",_[_.ONE_MINUS_CONSTANT_COLOR=32770]="ONE_MINUS_CONSTANT_COLOR",_[_.CONSTANT_ALPHA=32771]="CONSTANT_ALPHA",_[_.ONE_MINUS_CONSTANT_ALPHA=32772]="ONE_MINUS_CONSTANT_ALPHA",_[_.BLEND_COLOR=32773]="BLEND_COLOR",_[_.ARRAY_BUFFER=34962]="ARRAY_BUFFER",_[_.ELEMENT_ARRAY_BUFFER=34963]="ELEMENT_ARRAY_BUFFER",_[_.ARRAY_BUFFER_BINDING=34964]="ARRAY_BUFFER_BINDING",_[_.ELEMENT_ARRAY_BUFFER_BINDING=34965]="ELEMENT_ARRAY_BUFFER_BINDING",_[_.STREAM_DRAW=35040]="STREAM_DRAW",_[_.STATIC_DRAW=35044]="STATIC_DRAW",_[_.DYNAMIC_DRAW=35048]="DYNAMIC_DRAW",_[_.BUFFER_SIZE=34660]="BUFFER_SIZE",_[_.BUFFER_USAGE=34661]="BUFFER_USAGE",_[_.CURRENT_VERTEX_ATTRIB=34342]="CURRENT_VERTEX_ATTRIB",_[_.FRONT=1028]="FRONT",_[_.BACK=1029]="BACK",_[_.FRONT_AND_BACK=1032]="FRONT_AND_BACK",_[_.CULL_FACE=2884]="CULL_FACE",_[_.BLEND=3042]="BLEND",_[_.DITHER=3024]="DITHER",_[_.STENCIL_TEST=2960]="STENCIL_TEST",_[_.DEPTH_TEST=2929]="DEPTH_TEST",_[_.SCISSOR_TEST=3089]="SCISSOR_TEST",_[_.POLYGON_OFFSET_FILL=32823]="POLYGON_OFFSET_FILL",_[_.SAMPLE_ALPHA_TO_COVERAGE=32926]="SAMPLE_ALPHA_TO_COVERAGE",_[_.SAMPLE_COVERAGE=32928]="SAMPLE_COVERAGE",_[_.NO_ERROR=0]="NO_ERROR",_[_.INVALID_ENUM=1280]="INVALID_ENUM",_[_.INVALID_VALUE=1281]="INVALID_VALUE",_[_.INVALID_OPERATION=1282]="INVALID_OPERATION",_[_.OUT_OF_MEMORY=1285]="OUT_OF_MEMORY",_[_.CW=2304]="CW",_[_.CCW=2305]="CCW",_[_.LINE_WIDTH=2849]="LINE_WIDTH",_[_.ALIASED_POINT_SIZE_RANGE=33901]="ALIASED_POINT_SIZE_RANGE",_[_.ALIASED_LINE_WIDTH_RANGE=33902]="ALIASED_LINE_WIDTH_RANGE",_[_.CULL_FACE_MODE=2885]="CULL_FACE_MODE",_[_.FRONT_FACE=2886]="FRONT_FACE",_[_.DEPTH_RANGE=2928]="DEPTH_RANGE",_[_.DEPTH_WRITEMASK=2930]="DEPTH_WRITEMASK",_[_.DEPTH_CLEAR_VALUE=2931]="DEPTH_CLEAR_VALUE",_[_.DEPTH_FUNC=2932]="DEPTH_FUNC",_[_.STENCIL_CLEAR_VALUE=2961]="STENCIL_CLEAR_VALUE",_[_.STENCIL_FUNC=2962]="STENCIL_FUNC",_[_.STENCIL_FAIL=2964]="STENCIL_FAIL",_[_.STENCIL_PASS_DEPTH_FAIL=2965]="STENCIL_PASS_DEPTH_FAIL",_[_.STENCIL_PASS_DEPTH_PASS=2966]="STENCIL_PASS_DEPTH_PASS",_[_.STENCIL_REF=2967]="STENCIL_REF",_[_.STENCIL_VALUE_MASK=2963]="STENCIL_VALUE_MASK",_[_.STENCIL_WRITEMASK=2968]="STENCIL_WRITEMASK",_[_.STENCIL_BACK_FUNC=34816]="STENCIL_BACK_FUNC",_[_.STENCIL_BACK_FAIL=34817]="STENCIL_BACK_FAIL",_[_.STENCIL_BACK_PASS_DEPTH_FAIL=34818]="STENCIL_BACK_PASS_DEPTH_FAIL",_[_.STENCIL_BACK_PASS_DEPTH_PASS=34819]="STENCIL_BACK_PASS_DEPTH_PASS",_[_.STENCIL_BACK_REF=36003]="STENCIL_BACK_REF",_[_.STENCIL_BACK_VALUE_MASK=36004]="STENCIL_BACK_VALUE_MASK",_[_.STENCIL_BACK_WRITEMASK=36005]="STENCIL_BACK_WRITEMASK",_[_.VIEWPORT=2978]="VIEWPORT",_[_.SCISSOR_BOX=3088]="SCISSOR_BOX",_[_.COLOR_CLEAR_VALUE=3106]="COLOR_CLEAR_VALUE",_[_.COLOR_WRITEMASK=3107]="COLOR_WRITEMASK",_[_.UNPACK_ALIGNMENT=3317]="UNPACK_ALIGNMENT",_[_.PACK_ALIGNMENT=3333]="PACK_ALIGNMENT",_[_.MAX_TEXTURE_SIZE=3379]="MAX_TEXTURE_SIZE",_[_.MAX_VIEWPORT_DIMS=3386]="MAX_VIEWPORT_DIMS",_[_.SUBPIXEL_BITS=3408]="SUBPIXEL_BITS",_[_.RED_BITS=3410]="RED_BITS",_[_.GREEN_BITS=3411]="GREEN_BITS",_[_.BLUE_BITS=3412]="BLUE_BITS",_[_.ALPHA_BITS=3413]="ALPHA_BITS",_[_.DEPTH_BITS=3414]="DEPTH_BITS",_[_.STENCIL_BITS=3415]="STENCIL_BITS",_[_.POLYGON_OFFSET_UNITS=10752]="POLYGON_OFFSET_UNITS",_[_.POLYGON_OFFSET_FACTOR=32824]="POLYGON_OFFSET_FACTOR",_[_.TEXTURE_BINDING_2D=32873]="TEXTURE_BINDING_2D",_[_.SAMPLE_BUFFERS=32936]="SAMPLE_BUFFERS",_[_.SAMPLES=32937]="SAMPLES",_[_.SAMPLE_COVERAGE_VALUE=32938]="SAMPLE_COVERAGE_VALUE",_[_.SAMPLE_COVERAGE_INVERT=32939]="SAMPLE_COVERAGE_INVERT",_[_.COMPRESSED_TEXTURE_FORMATS=34467]="COMPRESSED_TEXTURE_FORMATS",_[_.DONT_CARE=4352]="DONT_CARE",_[_.FASTEST=4353]="FASTEST",_[_.NICEST=4354]="NICEST",_[_.GENERATE_MIPMAP_HINT=33170]="GENERATE_MIPMAP_HINT",_[_.BYTE=5120]="BYTE",_[_.UNSIGNED_BYTE=5121]="UNSIGNED_BYTE",_[_.SHORT=5122]="SHORT",_[_.UNSIGNED_SHORT=5123]="UNSIGNED_SHORT",_[_.INT=5124]="INT",_[_.UNSIGNED_INT=5125]="UNSIGNED_INT",_[_.FLOAT=5126]="FLOAT",_[_.DEPTH_COMPONENT=6402]="DEPTH_COMPONENT",_[_.ALPHA=6406]="ALPHA",_[_.RGB=6407]="RGB",_[_.RGBA=6408]="RGBA",_[_.LUMINANCE=6409]="LUMINANCE",_[_.LUMINANCE_ALPHA=6410]="LUMINANCE_ALPHA",_[_.UNSIGNED_SHORT_4_4_4_4=32819]="UNSIGNED_SHORT_4_4_4_4",_[_.UNSIGNED_SHORT_5_5_5_1=32820]="UNSIGNED_SHORT_5_5_5_1",_[_.UNSIGNED_SHORT_5_6_5=33635]="UNSIGNED_SHORT_5_6_5",_[_.FRAGMENT_SHADER=35632]="FRAGMENT_SHADER",_[_.VERTEX_SHADER=35633]="VERTEX_SHADER",_[_.MAX_VERTEX_ATTRIBS=34921]="MAX_VERTEX_ATTRIBS",_[_.MAX_VERTEX_UNIFORM_VECTORS=36347]="MAX_VERTEX_UNIFORM_VECTORS",_[_.MAX_VARYING_VECTORS=36348]="MAX_VARYING_VECTORS",_[_.MAX_COMBINED_TEXTURE_IMAGE_UNITS=35661]="MAX_COMBINED_TEXTURE_IMAGE_UNITS",_[_.MAX_VERTEX_TEXTURE_IMAGE_UNITS=35660]="MAX_VERTEX_TEXTURE_IMAGE_UNITS",_[_.MAX_TEXTURE_IMAGE_UNITS=34930]="MAX_TEXTURE_IMAGE_UNITS",_[_.MAX_FRAGMENT_UNIFORM_VECTORS=36349]="MAX_FRAGMENT_UNIFORM_VECTORS",_[_.SHADER_TYPE=35663]="SHADER_TYPE",_[_.DELETE_STATUS=35712]="DELETE_STATUS",_[_.LINK_STATUS=35714]="LINK_STATUS",_[_.VALIDATE_STATUS=35715]="VALIDATE_STATUS",_[_.ATTACHED_SHADERS=35717]="ATTACHED_SHADERS",_[_.ACTIVE_UNIFORMS=35718]="ACTIVE_UNIFORMS",_[_.ACTIVE_ATTRIBUTES=35721]="ACTIVE_ATTRIBUTES",_[_.SHADING_LANGUAGE_VERSION=35724]="SHADING_LANGUAGE_VERSION",_[_.CURRENT_PROGRAM=35725]="CURRENT_PROGRAM",_[_.NEVER=512]="NEVER",_[_.LESS=513]="LESS",_[_.EQUAL=514]="EQUAL",_[_.LEQUAL=515]="LEQUAL",_[_.GREATER=516]="GREATER",_[_.NOTEQUAL=517]="NOTEQUAL",_[_.GEQUAL=518]="GEQUAL",_[_.ALWAYS=519]="ALWAYS",_[_.KEEP=7680]="KEEP",_[_.REPLACE=7681]="REPLACE",_[_.INCR=7682]="INCR",_[_.DECR=7683]="DECR",_[_.INVERT=5386]="INVERT",_[_.INCR_WRAP=34055]="INCR_WRAP",_[_.DECR_WRAP=34056]="DECR_WRAP",_[_.VENDOR=7936]="VENDOR",_[_.RENDERER=7937]="RENDERER",_[_.VERSION=7938]="VERSION",_[_.NEAREST=9728]="NEAREST",_[_.LINEAR=9729]="LINEAR",_[_.NEAREST_MIPMAP_NEAREST=9984]="NEAREST_MIPMAP_NEAREST",_[_.LINEAR_MIPMAP_NEAREST=9985]="LINEAR_MIPMAP_NEAREST",_[_.NEAREST_MIPMAP_LINEAR=9986]="NEAREST_MIPMAP_LINEAR",_[_.LINEAR_MIPMAP_LINEAR=9987]="LINEAR_MIPMAP_LINEAR",_[_.TEXTURE_MAG_FILTER=10240]="TEXTURE_MAG_FILTER",_[_.TEXTURE_MIN_FILTER=10241]="TEXTURE_MIN_FILTER",_[_.TEXTURE_WRAP_S=10242]="TEXTURE_WRAP_S",_[_.TEXTURE_WRAP_T=10243]="TEXTURE_WRAP_T",_[_.TEXTURE_2D=3553]="TEXTURE_2D",_[_.TEXTURE=5890]="TEXTURE",_[_.TEXTURE_CUBE_MAP=34067]="TEXTURE_CUBE_MAP",_[_.TEXTURE_BINDING_CUBE_MAP=34068]="TEXTURE_BINDING_CUBE_MAP",_[_.TEXTURE_CUBE_MAP_POSITIVE_X=34069]="TEXTURE_CUBE_MAP_POSITIVE_X",_[_.TEXTURE_CUBE_MAP_NEGATIVE_X=34070]="TEXTURE_CUBE_MAP_NEGATIVE_X",_[_.TEXTURE_CUBE_MAP_POSITIVE_Y=34071]="TEXTURE_CUBE_MAP_POSITIVE_Y",_[_.TEXTURE_CUBE_MAP_NEGATIVE_Y=34072]="TEXTURE_CUBE_MAP_NEGATIVE_Y",_[_.TEXTURE_CUBE_MAP_POSITIVE_Z=34073]="TEXTURE_CUBE_MAP_POSITIVE_Z",_[_.TEXTURE_CUBE_MAP_NEGATIVE_Z=34074]="TEXTURE_CUBE_MAP_NEGATIVE_Z",_[_.MAX_CUBE_MAP_TEXTURE_SIZE=34076]="MAX_CUBE_MAP_TEXTURE_SIZE",_[_.TEXTURE0=33984]="TEXTURE0",_[_.TEXTURE1=33985]="TEXTURE1",_[_.TEXTURE2=33986]="TEXTURE2",_[_.TEXTURE3=33987]="TEXTURE3",_[_.TEXTURE4=33988]="TEXTURE4",_[_.TEXTURE5=33989]="TEXTURE5",_[_.TEXTURE6=33990]="TEXTURE6",_[_.TEXTURE7=33991]="TEXTURE7",_[_.TEXTURE8=33992]="TEXTURE8",_[_.TEXTURE9=33993]="TEXTURE9",_[_.TEXTURE10=33994]="TEXTURE10",_[_.TEXTURE11=33995]="TEXTURE11",_[_.TEXTURE12=33996]="TEXTURE12",_[_.TEXTURE13=33997]="TEXTURE13",_[_.TEXTURE14=33998]="TEXTURE14",_[_.TEXTURE15=33999]="TEXTURE15",_[_.TEXTURE16=34e3]="TEXTURE16",_[_.TEXTURE17=34001]="TEXTURE17",_[_.TEXTURE18=34002]="TEXTURE18",_[_.TEXTURE19=34003]="TEXTURE19",_[_.TEXTURE20=34004]="TEXTURE20",_[_.TEXTURE21=34005]="TEXTURE21",_[_.TEXTURE22=34006]="TEXTURE22",_[_.TEXTURE23=34007]="TEXTURE23",_[_.TEXTURE24=34008]="TEXTURE24",_[_.TEXTURE25=34009]="TEXTURE25",_[_.TEXTURE26=34010]="TEXTURE26",_[_.TEXTURE27=34011]="TEXTURE27",_[_.TEXTURE28=34012]="TEXTURE28",_[_.TEXTURE29=34013]="TEXTURE29",_[_.TEXTURE30=34014]="TEXTURE30",_[_.TEXTURE31=34015]="TEXTURE31",_[_.ACTIVE_TEXTURE=34016]="ACTIVE_TEXTURE",_[_.REPEAT=10497]="REPEAT",_[_.CLAMP_TO_EDGE=33071]="CLAMP_TO_EDGE",_[_.MIRRORED_REPEAT=33648]="MIRRORED_REPEAT",_[_.FLOAT_VEC2=35664]="FLOAT_VEC2",_[_.FLOAT_VEC3=35665]="FLOAT_VEC3",_[_.FLOAT_VEC4=35666]="FLOAT_VEC4",_[_.INT_VEC2=35667]="INT_VEC2",_[_.INT_VEC3=35668]="INT_VEC3",_[_.INT_VEC4=35669]="INT_VEC4",_[_.BOOL=35670]="BOOL",_[_.BOOL_VEC2=35671]="BOOL_VEC2",_[_.BOOL_VEC3=35672]="BOOL_VEC3",_[_.BOOL_VEC4=35673]="BOOL_VEC4",_[_.FLOAT_MAT2=35674]="FLOAT_MAT2",_[_.FLOAT_MAT3=35675]="FLOAT_MAT3",_[_.FLOAT_MAT4=35676]="FLOAT_MAT4",_[_.SAMPLER_2D=35678]="SAMPLER_2D",_[_.SAMPLER_CUBE=35680]="SAMPLER_CUBE",_[_.VERTEX_ATTRIB_ARRAY_ENABLED=34338]="VERTEX_ATTRIB_ARRAY_ENABLED",_[_.VERTEX_ATTRIB_ARRAY_SIZE=34339]="VERTEX_ATTRIB_ARRAY_SIZE",_[_.VERTEX_ATTRIB_ARRAY_STRIDE=34340]="VERTEX_ATTRIB_ARRAY_STRIDE",_[_.VERTEX_ATTRIB_ARRAY_TYPE=34341]="VERTEX_ATTRIB_ARRAY_TYPE",_[_.VERTEX_ATTRIB_ARRAY_NORMALIZED=34922]="VERTEX_ATTRIB_ARRAY_NORMALIZED",_[_.VERTEX_ATTRIB_ARRAY_POINTER=34373]="VERTEX_ATTRIB_ARRAY_POINTER",_[_.VERTEX_ATTRIB_ARRAY_BUFFER_BINDING=34975]="VERTEX_ATTRIB_ARRAY_BUFFER_BINDING",_[_.COMPILE_STATUS=35713]="COMPILE_STATUS",_[_.LOW_FLOAT=36336]="LOW_FLOAT",_[_.MEDIUM_FLOAT=36337]="MEDIUM_FLOAT",_[_.HIGH_FLOAT=36338]="HIGH_FLOAT",_[_.LOW_INT=36339]="LOW_INT",_[_.MEDIUM_INT=36340]="MEDIUM_INT",_[_.HIGH_INT=36341]="HIGH_INT",_[_.FRAMEBUFFER=36160]="FRAMEBUFFER",_[_.RENDERBUFFER=36161]="RENDERBUFFER",_[_.RGBA4=32854]="RGBA4",_[_.RGB5_A1=32855]="RGB5_A1",_[_.RGB565=36194]="RGB565",_[_.DEPTH_COMPONENT16=33189]="DEPTH_COMPONENT16",_[_.STENCIL_INDEX=6401]="STENCIL_INDEX",_[_.STENCIL_INDEX8=36168]="STENCIL_INDEX8",_[_.DEPTH_STENCIL=34041]="DEPTH_STENCIL",_[_.RENDERBUFFER_WIDTH=36162]="RENDERBUFFER_WIDTH",_[_.RENDERBUFFER_HEIGHT=36163]="RENDERBUFFER_HEIGHT",_[_.RENDERBUFFER_INTERNAL_FORMAT=36164]="RENDERBUFFER_INTERNAL_FORMAT",_[_.RENDERBUFFER_RED_SIZE=36176]="RENDERBUFFER_RED_SIZE",_[_.RENDERBUFFER_GREEN_SIZE=36177]="RENDERBUFFER_GREEN_SIZE",_[_.RENDERBUFFER_BLUE_SIZE=36178]="RENDERBUFFER_BLUE_SIZE",_[_.RENDERBUFFER_ALPHA_SIZE=36179]="RENDERBUFFER_ALPHA_SIZE",_[_.RENDERBUFFER_DEPTH_SIZE=36180]="RENDERBUFFER_DEPTH_SIZE",_[_.RENDERBUFFER_STENCIL_SIZE=36181]="RENDERBUFFER_STENCIL_SIZE",_[_.FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE=36048]="FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE",_[_.FRAMEBUFFER_ATTACHMENT_OBJECT_NAME=36049]="FRAMEBUFFER_ATTACHMENT_OBJECT_NAME",_[_.FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL=36050]="FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL",_[_.FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE=36051]="FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE",_[_.COLOR_ATTACHMENT0=36064]="COLOR_ATTACHMENT0",_[_.DEPTH_ATTACHMENT=36096]="DEPTH_ATTACHMENT",_[_.STENCIL_ATTACHMENT=36128]="STENCIL_ATTACHMENT",_[_.DEPTH_STENCIL_ATTACHMENT=33306]="DEPTH_STENCIL_ATTACHMENT",_[_.NONE=0]="NONE",_[_.FRAMEBUFFER_COMPLETE=36053]="FRAMEBUFFER_COMPLETE",_[_.FRAMEBUFFER_INCOMPLETE_ATTACHMENT=36054]="FRAMEBUFFER_INCOMPLETE_ATTACHMENT",_[_.FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT=36055]="FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT",_[_.FRAMEBUFFER_INCOMPLETE_DIMENSIONS=36057]="FRAMEBUFFER_INCOMPLETE_DIMENSIONS",_[_.FRAMEBUFFER_UNSUPPORTED=36061]="FRAMEBUFFER_UNSUPPORTED",_[_.FRAMEBUFFER_BINDING=36006]="FRAMEBUFFER_BINDING",_[_.RENDERBUFFER_BINDING=36007]="RENDERBUFFER_BINDING",_[_.MAX_RENDERBUFFER_SIZE=34024]="MAX_RENDERBUFFER_SIZE",_[_.INVALID_FRAMEBUFFER_OPERATION=1286]="INVALID_FRAMEBUFFER_OPERATION",_[_.UNPACK_FLIP_Y_WEBGL=37440]="UNPACK_FLIP_Y_WEBGL",_[_.UNPACK_PREMULTIPLY_ALPHA_WEBGL=37441]="UNPACK_PREMULTIPLY_ALPHA_WEBGL",_[_.CONTEXT_LOST_WEBGL=37442]="CONTEXT_LOST_WEBGL",_[_.UNPACK_COLORSPACE_CONVERSION_WEBGL=37443]="UNPACK_COLORSPACE_CONVERSION_WEBGL",_[_.BROWSER_DEFAULT_WEBGL=37444]="BROWSER_DEFAULT_WEBGL",_[_.COPY_SRC=1]="COPY_SRC",_[_.COPY_DST=2]="COPY_DST",_[_.SAMPLED=4]="SAMPLED",_[_.STORAGE=8]="STORAGE",_[_.RENDER_ATTACHMENT=16]="RENDER_ATTACHMENT";var E,S,M,O,k=function(){function t(){u()(this,t),this.config=void 0}return l()(t,[{key:"get",value:function(){return this.config}},{key:"set",value:function(t){this.config=t}}]),t}();"undefined"!=typeof navigator&&/Version\/[\d\.]+.*Safari/.test(navigator.userAgent);!function(t){t.Void="Void",t.Boolean="Boolean",t.Float="Float",t.Uint32="Uint32",t.Int32="Int32",t.Vector="Vector",t.Vector2Float="vec2",t.Vector3Float="vec3",t.Vector4Float="vec4