From e15be026e695ec4b3fb85c180f2b84e0800641cd Mon Sep 17 00:00:00 2001 From: renguanyu111 <80379958+renguanyu111@users.noreply.github.com> Date: Fri, 14 Jan 2022 10:08:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E7=BC=96=E5=86=99=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=89=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/package-lock.json | 776 +++++++++++- web/package.json | 11 +- web/src/api/comment.js | 43 + web/src/api/dataEntry.js | 460 +++++++ web/src/api/documentation.js | 156 +++ web/src/api/group.js | 30 + web/src/assets/diagram1.bpmn | 202 ++++ web/src/assets/global.css | 36 + web/src/components/complexTransfer/index.vue | 16 + web/src/components/dutyDialog/index.vue | 137 +++ web/src/components/projectDialog/index.vue | 149 +++ web/src/main.js | 9 +- web/src/mixins/infoList.js | 5 + web/src/permission.js | 3 +- web/src/router/index.js | 5 + web/src/view/login/index.vue | 6 + web/src/view/login/userLogin.vue | 178 +++ web/src/view/news/column/topColumn.vue | 280 +++-- web/src/view/news/information/comment.vue | 10 +- .../news/information/dynamicManagement.vue | 213 ++-- web/src/view/performance/assessment/index.vue | 385 ++++++ .../performance/dataEntry/beAssessed copy.vue | 443 +++++++ .../view/performance/dataEntry/beAssessed.vue | 543 +++++++++ .../view/performance/dataEntry/category.vue | 373 ++++++ web/src/view/performance/dataEntry/duty.vue | 602 ++++++++++ .../view/performance/dataEntry/project.vue | 395 ++++++ web/src/view/performance/index.vue | 17 + web/src/view/performance/plan/index.vue | 385 ++++++ web/src/view/process/bpmn/LF.vue | 367 ++++++ .../process/bpmn/LFComponents/AddPanel.vue | 108 ++ .../process/bpmn/LFComponents/Control.vue | 74 ++ .../process/bpmn/LFComponents/DataDialog.vue | 20 + .../process/bpmn/LFComponents/NodePanel.vue | 104 ++ .../bpmn/PropertySetting/CommonProperty.vue | 74 ++ .../bpmn/PropertySetting/PropertyDialog.vue | 43 + .../process/bpmn/PropertySetting/User.vue | 90 ++ web/src/view/process/bpmn/Test.vue | 21 + web/src/view/process/bpmn/TurboAdpter.vue | 167 +++ .../view/process/bpmn/Util/AdpterForTurbo.js | 166 +++ .../view/process/bpmn/background/click.png | Bin 0 -> 2666 bytes .../view/process/bpmn/background/download.png | Bin 0 -> 2028 bytes web/src/view/process/bpmn/background/end.png | Bin 0 -> 4889 bytes web/src/view/process/bpmn/background/push.png | Bin 0 -> 2286 bytes .../view/process/bpmn/background/start.png | Bin 0 -> 3950 bytes web/src/view/process/bpmn/background/time.png | Bin 0 -> 2988 bytes web/src/view/process/bpmn/background/user.png | Bin 0 -> 40754 bytes web/src/view/process/bpmn/config.js | 60 + web/src/view/process/bpmn/data.json | 346 ++++++ web/src/view/process/bpmn/dataLogicflow.json | 214 ++++ web/src/view/process/bpmn/dataTurbo.json | 240 ++++ .../process/bpmn/registerNode/Connect.vue | 43 + .../view/process/bpmn/registerNode/index.js | 13 + .../bpmn/registerNode/registerConnect.js | 58 + .../bpmn/registerNode/registerDownload.js | 92 ++ .../process/bpmn/registerNode/registerEnd.js | 101 ++ .../bpmn/registerNode/registerPolyline.js | 13 + .../process/bpmn/registerNode/registerPush.js | 139 +++ .../bpmn/registerNode/registerStart.js | 80 ++ .../process/bpmn/registerNode/registerTask.js | 30 + .../process/bpmn/registerNode/registerUser.js | 112 ++ web/src/view/process/bpmn1/CustomTranslate.js | 20 + web/src/view/process/bpmn1/index.vue | 210 ++++ web/src/view/process/bpmn1/translate.js | 258 ++++ web/src/view/process/guanli/layout.vue | 201 ++++ web/src/view/process/guanli/qiantao.vue | 51 + web/src/view/process/index.vue | 17 + web/src/view/process/liuCheng1/bpmn.vue | 182 +++ .../process/liuCheng1/custom-elements.json | 1057 +++++++++++++++++ .../liucheng/config/BackgroundConfig.js | 23 + .../liucheng/config/GridOptionsConfig.js | 18 + .../process/liucheng/config/StyleConfig.js | 35 + web/src/view/process/liucheng/img/delete.jpg | Bin 0 -> 12404 bytes web/src/view/process/liucheng/liucheng.vue | 357 ++++++ .../view/process/liucheng/node/myRectNode.js | 84 ++ web/yarn.lock | 331 +++++- 75 files changed, 11207 insertions(+), 280 deletions(-) create mode 100644 web/src/api/comment.js create mode 100644 web/src/api/dataEntry.js create mode 100644 web/src/api/documentation.js create mode 100644 web/src/assets/diagram1.bpmn create mode 100644 web/src/assets/global.css create mode 100644 web/src/components/complexTransfer/index.vue create mode 100644 web/src/components/dutyDialog/index.vue create mode 100644 web/src/components/projectDialog/index.vue create mode 100644 web/src/view/login/userLogin.vue create mode 100644 web/src/view/performance/assessment/index.vue create mode 100644 web/src/view/performance/dataEntry/beAssessed copy.vue create mode 100644 web/src/view/performance/dataEntry/beAssessed.vue create mode 100644 web/src/view/performance/dataEntry/category.vue create mode 100644 web/src/view/performance/dataEntry/duty.vue create mode 100644 web/src/view/performance/dataEntry/project.vue create mode 100644 web/src/view/performance/plan/index.vue create mode 100644 web/src/view/process/bpmn/LF.vue create mode 100644 web/src/view/process/bpmn/LFComponents/AddPanel.vue create mode 100644 web/src/view/process/bpmn/LFComponents/Control.vue create mode 100644 web/src/view/process/bpmn/LFComponents/DataDialog.vue create mode 100644 web/src/view/process/bpmn/LFComponents/NodePanel.vue create mode 100644 web/src/view/process/bpmn/PropertySetting/CommonProperty.vue create mode 100644 web/src/view/process/bpmn/PropertySetting/PropertyDialog.vue create mode 100644 web/src/view/process/bpmn/PropertySetting/User.vue create mode 100644 web/src/view/process/bpmn/Test.vue create mode 100644 web/src/view/process/bpmn/TurboAdpter.vue create mode 100644 web/src/view/process/bpmn/Util/AdpterForTurbo.js create mode 100644 web/src/view/process/bpmn/background/click.png create mode 100644 web/src/view/process/bpmn/background/download.png create mode 100644 web/src/view/process/bpmn/background/end.png create mode 100644 web/src/view/process/bpmn/background/push.png create mode 100644 web/src/view/process/bpmn/background/start.png create mode 100644 web/src/view/process/bpmn/background/time.png create mode 100644 web/src/view/process/bpmn/background/user.png create mode 100644 web/src/view/process/bpmn/config.js create mode 100644 web/src/view/process/bpmn/data.json create mode 100644 web/src/view/process/bpmn/dataLogicflow.json create mode 100644 web/src/view/process/bpmn/dataTurbo.json create mode 100644 web/src/view/process/bpmn/registerNode/Connect.vue create mode 100644 web/src/view/process/bpmn/registerNode/index.js create mode 100644 web/src/view/process/bpmn/registerNode/registerConnect.js create mode 100644 web/src/view/process/bpmn/registerNode/registerDownload.js create mode 100644 web/src/view/process/bpmn/registerNode/registerEnd.js create mode 100644 web/src/view/process/bpmn/registerNode/registerPolyline.js create mode 100644 web/src/view/process/bpmn/registerNode/registerPush.js create mode 100644 web/src/view/process/bpmn/registerNode/registerStart.js create mode 100644 web/src/view/process/bpmn/registerNode/registerTask.js create mode 100644 web/src/view/process/bpmn/registerNode/registerUser.js create mode 100644 web/src/view/process/bpmn1/CustomTranslate.js create mode 100644 web/src/view/process/bpmn1/index.vue create mode 100644 web/src/view/process/bpmn1/translate.js create mode 100644 web/src/view/process/guanli/layout.vue create mode 100644 web/src/view/process/guanli/qiantao.vue create mode 100644 web/src/view/process/liuCheng1/bpmn.vue create mode 100644 web/src/view/process/liuCheng1/custom-elements.json create mode 100644 web/src/view/process/liucheng/config/BackgroundConfig.js create mode 100644 web/src/view/process/liucheng/config/GridOptionsConfig.js create mode 100644 web/src/view/process/liucheng/config/StyleConfig.js create mode 100644 web/src/view/process/liucheng/img/delete.jpg create mode 100644 web/src/view/process/liucheng/liucheng.vue create mode 100644 web/src/view/process/liucheng/node/myRectNode.js diff --git a/web/package-lock.json b/web/package-lock.json index e2c626d..1a53aad 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -10,10 +10,16 @@ "dependencies": { "@babel/polyfill": "^7.12.1", "@element-plus/icons": "0.0.11", + "@logicflow/core": "^0.4.13", + "@logicflow/extension": "^0.4.13", "@tinymce/tinymce-vue": "^4.0.5", "axios": "^0.19.2", + "bpmn-js": "^4.0.4", + "bpmn-js-properties-panel": "^0.32.2", + "bpmn-moddle": "^6.0.0", + "camunda-bpmn-moddle": "^6.1.1", "core-js": "^3.6.5", - "echarts": "^5.2.2", + "echarts": "4.9.0", "element-plus": "^1.1.0-beta.24", "highlight.js": "^10.6.0", "marked": "^2.0.0", @@ -21,12 +27,15 @@ "path": "^0.12.7", "qs": "^6.8.0", "quill": "^1.3.7", + "raw-loader": "^4.0.2", "screenfull": "^5.0.2", "script-ext-html-webpack-plugin": "^2.1.4", "spark-md5": "^3.0.1", "tinymce": "^5.10.2", - "vue": "^3.2.0", + "vue": "^3.2.4", "vue-baidu-map": "^0.21.22", + "vue-bpmn": "^0.3.0", + "vue-json-pretty": "^1.8.2", "vue-particle-line": "^0.1.4", "vue-quill-editor": "^3.0.6", "vue-router": "^4.0.0-0", @@ -1755,6 +1764,26 @@ "webpack": "^4.0.0" } }, + "node_modules/@logicflow/core": { + "version": "0.4.15", + "resolved": "https://registry.npmjs.org/@logicflow/core/-/core-0.4.15.tgz", + "integrity": "sha512-JtgRL/ZM+FjjibrOkswkuKzeX3XMnozmq/h0YC/HBRpv0ZHynrlCQGqI1SQsD3tDIkaN4wBnHM9DIqIIwf7ZBQ==", + "dependencies": { + "@types/mousetrap": "^1.6.4", + "mousetrap": "^1.6.5", + "preact": "^10.4.8" + } + }, + "node_modules/@logicflow/extension": { + "version": "0.4.15", + "resolved": "https://registry.npmjs.org/@logicflow/extension/-/extension-0.4.15.tgz", + "integrity": "sha512-J6BRp5ZpOY/kyQmT8eCiLM+y+OWKClNDpWmiVSYdp0Rr8fGH1U4A8ITYvcte45nXorHLcg659PdHZaYqZtzJog==", + "dependencies": { + "@logicflow/core": "^0.4.15", + "ids": "^1.0.0", + "preact": "^10.4.8" + } + }, "node_modules/@mrmlnc/readdir-enhanced": { "version": "2.2.1", "resolved": "https://registry.npm.taobao.org/@mrmlnc/readdir-enhanced/download/@mrmlnc/readdir-enhanced-2.2.1.tgz", @@ -1965,8 +1994,7 @@ "node_modules/@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.nlark.com/@types/json-schema/download/@types/json-schema-7.0.9.tgz?cache=0&sync_timestamp=1629708189890&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40types%2Fjson-schema%2Fdownload%2F%40types%2Fjson-schema-7.0.9.tgz", - "integrity": "sha1-l+3JA36gw4WFMgsolk3eOznkZg0=", - "dev": true + "integrity": "sha1-l+3JA36gw4WFMgsolk3eOznkZg0=" }, "node_modules/@types/mime": { "version": "1.3.2", @@ -1986,6 +2014,11 @@ "integrity": "sha1-7nceK6Sz3Fs3KTXVSf2WF780W4w=", "dev": true }, + "node_modules/@types/mousetrap": { + "version": "1.6.8", + "resolved": "https://registry.npmjs.org/@types/mousetrap/-/mousetrap-1.6.8.tgz", + "integrity": "sha512-zTqjvgCUT5EoXqbqmd8iJMb4NJqyV/V7pK7AIKq7qcaAsJIpGlTVJS1HQM6YkdHCdnkNSbhcQI7MXYxFfE3iCA==" + }, "node_modules/@types/node": { "version": "16.7.1", "resolved": "https://registry.nlark.com/@types/node/download/@types/node-16.7.1.tgz", @@ -3864,6 +3897,109 @@ "resolved": "https://registry.npm.taobao.org/boolbase/download/boolbase-1.0.0.tgz", "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" }, + "node_modules/bpmn-font": { + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/bpmn-font/-/bpmn-font-0.9.3.tgz", + "integrity": "sha512-kzRGXGLzTROLRNCSskkOyj/+SbtTAn2unKfgB9tNt7RWJFybg/Wbe9YjK2ALotI3b64wwlCTkAalXiTiskP6dg==" + }, + "node_modules/bpmn-js": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/bpmn-js/-/bpmn-js-4.0.4.tgz", + "integrity": "sha512-LEKusdwTwgWk5YGjA6mxecpaa2AAKOBbhWCwA5e7mYJ6T+/A9gCjTmbGPtq5rQQVjdLO4pt5kVEOolrRJMd32g==", + "dependencies": { + "bpmn-font": "^0.9.3", + "bpmn-moddle": "^5.2.0", + "css.escape": "^1.5.1", + "diagram-js": "^4.0.3", + "diagram-js-direct-editing": "^1.5.0", + "ids": "^1.0.0", + "inherits": "^2.0.1", + "min-dash": "^3.5.0", + "min-dom": "^3.0.0", + "object-refs": "^0.3.0", + "tiny-svg": "^2.2.1" + } + }, + "node_modules/bpmn-js-properties-panel": { + "version": "0.32.2", + "resolved": "https://registry.npmjs.org/bpmn-js-properties-panel/-/bpmn-js-properties-panel-0.32.2.tgz", + "integrity": "sha512-nf2fFZUJfoChcKiiSvLJwutbnU0l/gPl2CopxisJo4dbZ7vYbqPnG/FYVU1MgYD6y+FtOxF2pGljd8wA+IYdmw==", + "dependencies": { + "ids": "^1.0.0", + "inherits": "^2.0.1", + "lodash": "^4.17.15", + "min-dom": "^3.1.1", + "scroll-tabs": "^1.0.1", + "selection-update": "^0.1.2" + }, + "peerDependencies": { + "bpmn-js": "^3.x || ^4.x" + } + }, + "node_modules/bpmn-js/node_modules/bpmn-moddle": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/bpmn-moddle/-/bpmn-moddle-5.2.0.tgz", + "integrity": "sha512-MZTlpIXWcHTelp09vR4hs23diCdeHl4JbwOXGmif10qf9v/kqreiCMeo0B9w8eEmZqdRdkulTIScKavTYOxTQw==", + "dependencies": { + "min-dash": "^3.0.0", + "moddle": "^4.1.0", + "moddle-xml": "^7.5.0" + } + }, + "node_modules/bpmn-js/node_modules/diagram-js": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/diagram-js/-/diagram-js-4.0.3.tgz", + "integrity": "sha512-BzcWUEnRfO2tpdc8XHvG/wsX+GrE/7qGRDf1khn5b0UrzrqqLhj1yiguvpgb0rQSTPeBtkot6PUA4wB2QAQutA==", + "dependencies": { + "css.escape": "^1.5.1", + "didi": "^4.0.0", + "hammerjs": "^2.0.1", + "inherits": "^2.0.1", + "min-dash": "^3.5.0", + "min-dom": "^3.0.0", + "object-refs": "^0.3.0", + "path-intersection": "^1.0.2", + "tiny-svg": "^2.2.1" + } + }, + "node_modules/bpmn-js/node_modules/didi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/didi/-/didi-4.0.0.tgz", + "integrity": "sha512-AzMElh8mCHOPWPCWfGjoJRla31fMXUT6+287W5ef3IPmtuBcyG9+MkFS7uPP6v3t2Cl086KwWfRB9mESa0OsHQ==" + }, + "node_modules/bpmn-js/node_modules/moddle": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/moddle/-/moddle-4.1.0.tgz", + "integrity": "sha512-asBaDLTTNpv4oC8iFdwonfMf/noPVvaBDXoSL7AsXZUDqwokgy8Lsf5eXwdnjXiDqm0olYi/S3Do544uVJSQDg==", + "dependencies": { + "min-dash": "^3.0.0" + } + }, + "node_modules/bpmn-js/node_modules/moddle-xml": { + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/moddle-xml/-/moddle-xml-7.5.0.tgz", + "integrity": "sha512-wPm3TD9910Iblp4lg1okHDRilY9gTvNBdo7ZHBmBzH4OioF5R2hvG3SMyn7cAUjOUg0kYUfChHgcUEO+qUc77Q==", + "dependencies": { + "min-dash": "^3.0.0", + "moddle": "^4.1.0", + "saxen": "^8.1.0" + } + }, + "node_modules/bpmn-js/node_modules/path-intersection": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/path-intersection/-/path-intersection-1.1.1.tgz", + "integrity": "sha512-EdeUuXCm0+tb/2gv8PmRhd9fYYOtbDeTYkwCnzkBuAEjevEZi2mWUi1DVFF5nqSObYsxKcchvKUhnRULWOFreQ==" + }, + "node_modules/bpmn-moddle": { + "version": "6.0.7", + "resolved": "https://registry.npmjs.org/bpmn-moddle/-/bpmn-moddle-6.0.7.tgz", + "integrity": "sha512-MD649c7/I7+AKl3OGLs8ed8guzKuIRIJhOvLeVBSyCHtd41iB8ZRi+NL2UeC8pNgpqcjMsZG3ye++x3fh6MQ+g==", + "dependencies": { + "min-dash": "^3.0.0", + "moddle": "^5.0.1", + "moddle-xml": "^8.0.8" + } + }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npm.taobao.org/brace-expansion/download/brace-expansion-1.1.11.tgz", @@ -4210,6 +4346,18 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/camunda-bpmn-moddle": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/camunda-bpmn-moddle/-/camunda-bpmn-moddle-6.1.1.tgz", + "integrity": "sha512-HbYXm9lNPVnGfq4jRRtvR4YgRgw6hGwJ2wFIBghyOQ8fYsqUAPAZ4MJ1pQASZM+XpxmEyRTowc4SiHcAcFbDYw==", + "dependencies": { + "min-dash": "^3.5.2" + }, + "peerDependencies": { + "bpmn-js": "^6.x || ^7.x || ^8.x", + "diagram-js": "^5.x || ^6.x || ^7.x" + } + }, "node_modules/caniuse-api": { "version": "3.0.0", "resolved": "https://registry.npm.taobao.org/caniuse-api/download/caniuse-api-3.0.0.tgz", @@ -4736,6 +4884,11 @@ "resolved": "https://registry.npm.taobao.org/component-emitter/download/component-emitter-1.3.0.tgz", "integrity": "sha1-FuQHD7qK4ptnnyIVhT7hgasuq8A=" }, + "node_modules/component-event": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/component-event/-/component-event-0.1.4.tgz", + "integrity": "sha1-PeePwoeCOBeH4kvyp8U2vwFCybQ=" + }, "node_modules/compressible": { "version": "2.0.18", "resolved": "https://registry.npm.taobao.org/compressible/download/compressible-2.0.18.tgz", @@ -5382,6 +5535,11 @@ "url": "https://github.com/sponsors/fb55" } }, + "node_modules/css.escape": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz", + "integrity": "sha1-QuJ9T6BK4y+TGktNQZH6nN3ul8s=" + }, "node_modules/cssesc": { "version": "3.0.0", "resolved": "https://registry.npm.taobao.org/cssesc/download/cssesc-3.0.0.tgz", @@ -5933,6 +6091,41 @@ "integrity": "sha1-yccHdaScPQO8LAbZpzvlUPl4+LE=", "dev": true }, + "node_modules/diagram-js": { + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/diagram-js/-/diagram-js-7.8.1.tgz", + "integrity": "sha512-Ziy5vTmB8V/kxuhgxQXdnNxSYnqlWxFrBih37MOOglDzyQ5mBIA8tFNssp/ncHpZmhTGC8sb54lYknovzyrrzg==", + "peer": true, + "dependencies": { + "css.escape": "^1.5.1", + "didi": "^5.2.1", + "hammerjs": "^2.0.1", + "inherits": "^2.0.4", + "min-dash": "^3.5.2", + "min-dom": "^3.1.3", + "object-refs": "^0.3.0", + "path-intersection": "^2.2.1", + "tiny-svg": "^2.2.2" + } + }, + "node_modules/diagram-js-direct-editing": { + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/diagram-js-direct-editing/-/diagram-js-direct-editing-1.6.3.tgz", + "integrity": "sha512-OwDpK4cNJ4QYuV855HvtZcB9/krfZRQ80uaE6bwaKbyb4584sD7nCtR5yWOyhJx4dIh1gMoqhF7d7G57M4tQVQ==", + "dependencies": { + "min-dash": "^3.5.2", + "min-dom": "^3.1.3" + }, + "peerDependencies": { + "diagram-js": "^0.x || ^1.x || ^2.x || ^3.x || ^4.x || ^5.x || ^6.x || ^7.x" + } + }, + "node_modules/didi": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/didi/-/didi-5.2.1.tgz", + "integrity": "sha512-IKNnajUlD4lWMy/Q9Emkk7H1qnzREgY4UyE3IhmOi/9IKua0JYtYldk928bOdt1yNxN8EiOy1sqtSozEYsmjCg==", + "peer": true + }, "node_modules/diffie-hellman": { "version": "5.0.3", "resolved": "https://registry.npm.taobao.org/diffie-hellman/download/diffie-hellman-5.0.3.tgz", @@ -6067,6 +6260,11 @@ } ] }, + "node_modules/domify": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/domify/-/domify-1.4.1.tgz", + "integrity": "sha512-x18nuiDHMCZGXr4KJSRMf/TWYtiaRo6RX8KN9fEbW54mvbQ6pieUuerC2ahBg+kEp1wycFj8MPUI0WkIOw5E9w==" + }, "node_modules/domutils": { "version": "1.7.0", "resolved": "https://registry.nlark.com/domutils/download/domutils-1.7.0.tgz", @@ -6141,19 +6339,13 @@ } }, "node_modules/echarts": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.2.2.tgz", - "integrity": "sha512-yxuBfeIH5c+0FsoRP60w4De6omXhA06c7eUYBsC1ykB6Ys2yK5fSteIYWvkJ4xJVLQgCvAdO8C4mN6MLeJpBaw==", + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/echarts/-/echarts-4.9.0.tgz", + "integrity": "sha512-+ugizgtJ+KmsJyyDPxaw2Br5FqzuBnyOWwcxPKO6y0gc5caYcfnEUIlNStx02necw8jmKmTafmpHhGo4XDtEIA==", "dependencies": { - "tslib": "2.3.0", - "zrender": "5.2.1" + "zrender": "4.3.2" } }, - "node_modules/echarts/node_modules/tslib": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz", - "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==" - }, "node_modules/ee-first": { "version": "1.1.1", "resolved": "https://registry.npm.taobao.org/ee-first/download/ee-first-1.1.1.tgz", @@ -7579,6 +7771,14 @@ "node": ">=6" } }, + "node_modules/hammerjs": { + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz", + "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE=", + "engines": { + "node": ">=0.8.0" + } + }, "node_modules/handle-thing": { "version": "2.0.1", "resolved": "https://registry.npm.taobao.org/handle-thing/download/handle-thing-2.0.1.tgz", @@ -8169,6 +8369,11 @@ "node": ">= 6" } }, + "node_modules/ids": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/ids/-/ids-1.0.0.tgz", + "integrity": "sha512-Zvtq1xUto4LttpstyOlFum8lKx+i1OmRfg+6A9drFS9iSZsDPMHG4Sof/qwNR4kCU7jBeWFPrY2ocHxiz7cCRw==" + }, "node_modules/ieee754": { "version": "1.2.1", "resolved": "https://registry.npm.taobao.org/ieee754/download/ieee754-1.2.1.tgz?cache=0&sync_timestamp=1603841204911&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fieee754%2Fdownload%2Fieee754-1.2.1.tgz", @@ -8327,6 +8532,11 @@ "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=", "dev": true }, + "node_modules/indexof": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz", + "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=" + }, "node_modules/infer-owner": { "version": "1.0.4", "resolved": "https://registry.npm.taobao.org/infer-owner/download/infer-owner-1.0.4.tgz", @@ -9140,7 +9350,6 @@ "version": "2.2.0", "resolved": "https://registry.npm.taobao.org/json5/download/json5-2.2.0.tgz", "integrity": "sha1-Lf7+cgxrpSXZ69kJlQ8FFTFsiaM=", - "dev": true, "dependencies": { "minimist": "^1.2.5" }, @@ -9505,6 +9714,11 @@ "node": ">= 10" } }, + "node_modules/matches-selector": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/matches-selector/-/matches-selector-1.2.0.tgz", + "integrity": "sha512-c4vLwYWyl+Ji+U43eU/G5FwxWd4ZH0ePUsFs5y0uwD9HUEFBXUQ1zUUan+78IpRD+y4pUfG0nAzNM292K7ItvA==" + }, "node_modules/md5.js": { "version": "1.3.5", "resolved": "https://registry.npm.taobao.org/md5.js/download/md5.js-1.3.5.tgz", @@ -9679,6 +9893,22 @@ "node": ">=4" } }, + "node_modules/min-dash": { + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/min-dash/-/min-dash-3.8.0.tgz", + "integrity": "sha512-a0TLbmL6p4RlNGblZcLd2yjPORp+bCYRlNGvwK5OMwWaMROWh1DlRgN9W8jJm2x9gVuscvD38BEosV7cnikKnw==" + }, + "node_modules/min-dom": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/min-dom/-/min-dom-3.1.3.tgz", + "integrity": "sha512-Lbi1NZjLV9Hg6/bEe2Lfk2Fzsv1MwheR61whqTLP+FxLndYo9TxpksEgM5Kr1khjfCtFTMr0waeEfwIpStkRdw==", + "dependencies": { + "component-event": "^0.1.4", + "domify": "^1.3.1", + "indexof": "0.0.1", + "matches-selector": "^1.2.0" + } + }, "node_modules/mini-css-extract-plugin": { "version": "0.9.0", "resolved": "https://registry.nlark.com/mini-css-extract-plugin/download/mini-css-extract-plugin-0.9.0.tgz?cache=0&sync_timestamp=1628094167664&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fmini-css-extract-plugin%2Fdownload%2Fmini-css-extract-plugin-0.9.0.tgz", @@ -9829,6 +10059,29 @@ "mkdirp": "bin/cmd.js" } }, + "node_modules/moddle": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/moddle/-/moddle-5.0.2.tgz", + "integrity": "sha512-nBEyKt7sDw6MlM6e85lTCEXButw+p7hubEoRo/JyX+dBzDcGjDoktPuby9QE+ylW1ABZqNvRy8pK0h+23tIW2g==", + "dependencies": { + "min-dash": "^3.0.0" + } + }, + "node_modules/moddle-xml": { + "version": "8.0.8", + "resolved": "https://registry.npmjs.org/moddle-xml/-/moddle-xml-8.0.8.tgz", + "integrity": "sha512-JzW8wUCH7Qze7eh0T8A1exi7QJg6hRgq+uw8goHNP5Q7pWTGrLj83S+NgA/94M2I0JmqnK9hw3sCbyiKVOjc4Q==", + "dependencies": { + "min-dash": "^3.0.0", + "moddle": "^5.0.1", + "saxen": "^8.1.2" + } + }, + "node_modules/mousetrap": { + "version": "1.6.5", + "resolved": "https://registry.npmjs.org/mousetrap/-/mousetrap-1.6.5.tgz", + "integrity": "sha512-QNo4kEepaIBwiT8CDhP98umTetp+JNfQYBWvC1pc6/OAibuXtRcxZ58Qz8skvEHYvURne/7R8T5VoOI7rDsEUA==" + }, "node_modules/move-concurrently": { "version": "1.0.1", "resolved": "https://registry.npm.taobao.org/move-concurrently/download/move-concurrently-1.0.1.tgz", @@ -10192,6 +10445,11 @@ "node": ">= 0.4" } }, + "node_modules/object-refs": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/object-refs/-/object-refs-0.3.0.tgz", + "integrity": "sha512-eP0ywuoWOaDoiake/6kTJlPJhs+k0qNm4nYRzXLNHj6vh+5M3i9R1epJTdxIPGlhWc4fNRQ7a6XJNCX+/L4FOQ==" + }, "node_modules/object-visit": { "version": "1.0.1", "resolved": "https://registry.npm.taobao.org/object-visit/download/object-visit-1.0.1.tgz", @@ -10623,6 +10881,12 @@ "node": ">=8" } }, + "node_modules/path-intersection": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/path-intersection/-/path-intersection-2.2.1.tgz", + "integrity": "sha512-9u8xvMcSfuOiStv9bPdnRJQhGQXLKurew94n4GPQCdH1nj9QKC9ObbNoIpiRq8skiOBxKkt277PgOoFgAt3/rA==", + "peer": true + }, "node_modules/path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npm.taobao.org/path-is-absolute/download/path-is-absolute-1.0.1.tgz", @@ -11561,6 +11825,15 @@ "node": ">=6" } }, + "node_modules/preact": { + "version": "10.6.4", + "resolved": "https://registry.npmjs.org/preact/-/preact-10.6.4.tgz", + "integrity": "sha512-WyosM7pxGcndU8hY0OQlLd54tOU+qmG45QXj2dAYrL11HoyU/EzOSTlpJsirbBr1QW7lICxSsVJJmcmUglovHQ==", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/preact" + } + }, "node_modules/prelude-ls": { "version": "1.1.2", "resolved": "https://registry.npm.taobao.org/prelude-ls/download/prelude-ls-1.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fprelude-ls%2Fdownload%2Fprelude-ls-1.1.2.tgz", @@ -11852,6 +12125,55 @@ "node": ">= 0.8" } }, + "node_modules/raw-loader": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-4.0.2.tgz", + "integrity": "sha512-ZnScIV3ag9A4wPX/ZayxL/jZH+euYb6FcUinPcgiQW0+UBtEv0O6Q3lGd3cqJ+GHH+rksEv3Pj99oxJ3u3VIKA==", + "dependencies": { + "loader-utils": "^2.0.0", + "schema-utils": "^3.0.0" + }, + "engines": { + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^4.0.0 || ^5.0.0" + } + }, + "node_modules/raw-loader/node_modules/loader-utils": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz", + "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==", + "dependencies": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + }, + "engines": { + "node": ">=8.9.0" + } + }, + "node_modules/raw-loader/node_modules/schema-utils": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", + "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", + "dependencies": { + "@types/json-schema": "^7.0.8", + "ajv": "^6.12.5", + "ajv-keywords": "^3.5.2" + }, + "engines": { + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + } + }, "node_modules/read-pkg": { "version": "5.2.0", "resolved": "https://registry.nlark.com/read-pkg/download/read-pkg-5.2.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fread-pkg%2Fdownload%2Fread-pkg-5.2.0.tgz", @@ -12429,6 +12751,11 @@ "integrity": "sha1-KBYjTiN4vdxOU1T6tcqold9xANk=", "dev": true }, + "node_modules/saxen": { + "version": "8.1.2", + "resolved": "https://registry.npmjs.org/saxen/-/saxen-8.1.2.tgz", + "integrity": "sha512-xUOiiFbc3Ow7p8KMxwsGICPx46ZQvy3+qfNVhrkwfz3Vvq45eGt98Ft5IQaA1R/7Tb5B5MKh9fUR9x3c3nDTxw==" + }, "node_modules/schema-utils": { "version": "2.7.1", "resolved": "https://registry.nlark.com/schema-utils/download/schema-utils-2.7.1.tgz?cache=0&sync_timestamp=1626694740261&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fschema-utils%2Fdownload%2Fschema-utils-2.7.1.tgz", @@ -12473,12 +12800,32 @@ "webpack": "^1.0.0 || ^2.0.0 || ^3.0.0 || ^4.0.0" } }, + "node_modules/scroll-tabs": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/scroll-tabs/-/scroll-tabs-1.0.1.tgz", + "integrity": "sha512-W4xjEwNS4QAyQnaJ450vQTcKpbnalBAfsTDV926WrxEMOqjyj2To8uv2d0Cp0oxMdk5TkygtzXmctPNc2zgBcg==", + "dependencies": { + "min-dash": "^3.1.0", + "min-dom": "^3.1.0", + "mitt": "^1.1.3" + } + }, + "node_modules/scroll-tabs/node_modules/mitt": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mitt/-/mitt-1.2.0.tgz", + "integrity": "sha512-r6lj77KlwqLhIUku9UWYes7KJtsczvolZkzp8hbaDPPaE24OmWl5s539Mytlj22siEQKosZ26qCBgda2PKwoJw==" + }, "node_modules/select-hose": { "version": "2.0.0", "resolved": "https://registry.npm.taobao.org/select-hose/download/select-hose-2.0.0.tgz", "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=", "dev": true }, + "node_modules/selection-update": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/selection-update/-/selection-update-0.1.2.tgz", + "integrity": "sha1-gDoETcxu2rWjrmSPXwNX6JrWa5Y=" + }, "node_modules/selfsigned": { "version": "1.10.11", "resolved": "https://registry.nlark.com/selfsigned/download/selfsigned-1.10.11.tgz", @@ -13756,6 +14103,11 @@ "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=", "dev": true }, + "node_modules/tiny-svg": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/tiny-svg/-/tiny-svg-2.2.2.tgz", + "integrity": "sha512-u6zCuMkDR/3VAh83X7hDRn/pi0XhwG2ycuNS0cTFtQjGdOG2tSvEb8ds65VeGWc3H6PUjJKeunueXqgkZqtMsg==" + }, "node_modules/tinymce": { "version": "5.10.2", "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-5.10.2.tgz", @@ -14416,6 +14768,11 @@ "vue": "^2.1.8" } }, + "node_modules/vue-bpmn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/vue-bpmn/-/vue-bpmn-0.3.0.tgz", + "integrity": "sha512-gp43Qx34HzOIbhzxFL3gXmkc28NDQE79boPcqMHbQ6y351Jys7tPk+mdsKATIN5IAM2UfraIQxhylvb4/vubgA==" + }, "node_modules/vue-demi": { "version": "0.11.4", "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.11.4.tgz", @@ -14484,6 +14841,15 @@ "integrity": "sha1-UylVzB6yCKPZkLOp+acFdGV+CPI=", "dev": true }, + "node_modules/vue-json-pretty": { + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/vue-json-pretty/-/vue-json-pretty-1.8.2.tgz", + "integrity": "sha512-8DbgvyXpBrhDdBzz8RTe+POZ+HI6nSa33DqsPMWhMkv0u0ATklgxErUM3XRRvTzOQ/02Sh1LNWJ/rkqTow2rbA==", + "engines": { + "node": ">= 10.0.0", + "npm": ">= 5.0.0" + } + }, "node_modules/vue-loader": { "version": "15.9.8", "resolved": "https://registry.nlark.com/vue-loader/download/vue-loader-15.9.8.tgz?cache=0&sync_timestamp=1628666767864&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fvue-loader%2Fdownload%2Fvue-loader-15.9.8.tgz", @@ -15788,17 +16154,9 @@ "dev": true }, "node_modules/zrender": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.2.1.tgz", - "integrity": "sha512-M3bPGZuyLTNBC6LiNKXJwSCtglMp8XUEqEBG+2MdICDI3d1s500Y4P0CzldQGsqpRVB7fkvf3BKQQRxsEaTlsw==", - "dependencies": { - "tslib": "2.3.0" - } - }, - "node_modules/zrender/node_modules/tslib": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz", - "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==" + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/zrender/-/zrender-4.3.2.tgz", + "integrity": "sha512-bIusJLS8c4DkIcdiK+s13HiQ/zjQQVgpNohtd8d94Y2DnJqgM1yjh/jpDb8DoL6hd7r8Awagw8e3qK/oLaWr3g==" } }, "dependencies": { @@ -16993,6 +17351,26 @@ "postcss": "^7.0.0" } }, + "@logicflow/core": { + "version": "0.4.15", + "resolved": "https://registry.npmjs.org/@logicflow/core/-/core-0.4.15.tgz", + "integrity": "sha512-JtgRL/ZM+FjjibrOkswkuKzeX3XMnozmq/h0YC/HBRpv0ZHynrlCQGqI1SQsD3tDIkaN4wBnHM9DIqIIwf7ZBQ==", + "requires": { + "@types/mousetrap": "^1.6.4", + "mousetrap": "^1.6.5", + "preact": "^10.4.8" + } + }, + "@logicflow/extension": { + "version": "0.4.15", + "resolved": "https://registry.npmjs.org/@logicflow/extension/-/extension-0.4.15.tgz", + "integrity": "sha512-J6BRp5ZpOY/kyQmT8eCiLM+y+OWKClNDpWmiVSYdp0Rr8fGH1U4A8ITYvcte45nXorHLcg659PdHZaYqZtzJog==", + "requires": { + "@logicflow/core": "^0.4.15", + "ids": "^1.0.0", + "preact": "^10.4.8" + } + }, "@mrmlnc/readdir-enhanced": { "version": "2.2.1", "resolved": "https://registry.npm.taobao.org/@mrmlnc/readdir-enhanced/download/@mrmlnc/readdir-enhanced-2.2.1.tgz", @@ -17172,8 +17550,7 @@ "@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.nlark.com/@types/json-schema/download/@types/json-schema-7.0.9.tgz?cache=0&sync_timestamp=1629708189890&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40types%2Fjson-schema%2Fdownload%2F%40types%2Fjson-schema-7.0.9.tgz", - "integrity": "sha1-l+3JA36gw4WFMgsolk3eOznkZg0=", - "dev": true + "integrity": "sha1-l+3JA36gw4WFMgsolk3eOznkZg0=" }, "@types/mime": { "version": "1.3.2", @@ -17193,6 +17570,11 @@ "integrity": "sha1-7nceK6Sz3Fs3KTXVSf2WF780W4w=", "dev": true }, + "@types/mousetrap": { + "version": "1.6.8", + "resolved": "https://registry.npmjs.org/@types/mousetrap/-/mousetrap-1.6.8.tgz", + "integrity": "sha512-zTqjvgCUT5EoXqbqmd8iJMb4NJqyV/V7pK7AIKq7qcaAsJIpGlTVJS1HQM6YkdHCdnkNSbhcQI7MXYxFfE3iCA==" + }, "@types/node": { "version": "16.7.1", "resolved": "https://registry.nlark.com/@types/node/download/@types/node-16.7.1.tgz", @@ -18737,6 +19119,108 @@ "resolved": "https://registry.npm.taobao.org/boolbase/download/boolbase-1.0.0.tgz", "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" }, + "bpmn-font": { + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/bpmn-font/-/bpmn-font-0.9.3.tgz", + "integrity": "sha512-kzRGXGLzTROLRNCSskkOyj/+SbtTAn2unKfgB9tNt7RWJFybg/Wbe9YjK2ALotI3b64wwlCTkAalXiTiskP6dg==" + }, + "bpmn-js": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/bpmn-js/-/bpmn-js-4.0.4.tgz", + "integrity": "sha512-LEKusdwTwgWk5YGjA6mxecpaa2AAKOBbhWCwA5e7mYJ6T+/A9gCjTmbGPtq5rQQVjdLO4pt5kVEOolrRJMd32g==", + "requires": { + "bpmn-font": "^0.9.3", + "bpmn-moddle": "^5.2.0", + "css.escape": "^1.5.1", + "diagram-js": "^4.0.3", + "diagram-js-direct-editing": "^1.5.0", + "ids": "^1.0.0", + "inherits": "^2.0.1", + "min-dash": "^3.5.0", + "min-dom": "^3.0.0", + "object-refs": "^0.3.0", + "tiny-svg": "^2.2.1" + }, + "dependencies": { + "bpmn-moddle": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/bpmn-moddle/-/bpmn-moddle-5.2.0.tgz", + "integrity": "sha512-MZTlpIXWcHTelp09vR4hs23diCdeHl4JbwOXGmif10qf9v/kqreiCMeo0B9w8eEmZqdRdkulTIScKavTYOxTQw==", + "requires": { + "min-dash": "^3.0.0", + "moddle": "^4.1.0", + "moddle-xml": "^7.5.0" + } + }, + "diagram-js": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/diagram-js/-/diagram-js-4.0.3.tgz", + "integrity": "sha512-BzcWUEnRfO2tpdc8XHvG/wsX+GrE/7qGRDf1khn5b0UrzrqqLhj1yiguvpgb0rQSTPeBtkot6PUA4wB2QAQutA==", + "requires": { + "css.escape": "^1.5.1", + "didi": "^4.0.0", + "hammerjs": "^2.0.1", + "inherits": "^2.0.1", + "min-dash": "^3.5.0", + "min-dom": "^3.0.0", + "object-refs": "^0.3.0", + "path-intersection": "^1.0.2", + "tiny-svg": "^2.2.1" + } + }, + "didi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/didi/-/didi-4.0.0.tgz", + "integrity": "sha512-AzMElh8mCHOPWPCWfGjoJRla31fMXUT6+287W5ef3IPmtuBcyG9+MkFS7uPP6v3t2Cl086KwWfRB9mESa0OsHQ==" + }, + "moddle": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/moddle/-/moddle-4.1.0.tgz", + "integrity": "sha512-asBaDLTTNpv4oC8iFdwonfMf/noPVvaBDXoSL7AsXZUDqwokgy8Lsf5eXwdnjXiDqm0olYi/S3Do544uVJSQDg==", + "requires": { + "min-dash": "^3.0.0" + } + }, + "moddle-xml": { + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/moddle-xml/-/moddle-xml-7.5.0.tgz", + "integrity": "sha512-wPm3TD9910Iblp4lg1okHDRilY9gTvNBdo7ZHBmBzH4OioF5R2hvG3SMyn7cAUjOUg0kYUfChHgcUEO+qUc77Q==", + "requires": { + "min-dash": "^3.0.0", + "moddle": "^4.1.0", + "saxen": "^8.1.0" + } + }, + "path-intersection": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/path-intersection/-/path-intersection-1.1.1.tgz", + "integrity": "sha512-EdeUuXCm0+tb/2gv8PmRhd9fYYOtbDeTYkwCnzkBuAEjevEZi2mWUi1DVFF5nqSObYsxKcchvKUhnRULWOFreQ==" + } + } + }, + "bpmn-js-properties-panel": { + "version": "0.32.2", + "resolved": "https://registry.npmjs.org/bpmn-js-properties-panel/-/bpmn-js-properties-panel-0.32.2.tgz", + "integrity": "sha512-nf2fFZUJfoChcKiiSvLJwutbnU0l/gPl2CopxisJo4dbZ7vYbqPnG/FYVU1MgYD6y+FtOxF2pGljd8wA+IYdmw==", + "requires": { + "ids": "^1.0.0", + "inherits": "^2.0.1", + "lodash": "^4.17.15", + "min-dom": "^3.1.1", + "scroll-tabs": "^1.0.1", + "selection-update": "^0.1.2" + } + }, + "bpmn-moddle": { + "version": "6.0.7", + "resolved": "https://registry.npmjs.org/bpmn-moddle/-/bpmn-moddle-6.0.7.tgz", + "integrity": "sha512-MD649c7/I7+AKl3OGLs8ed8guzKuIRIJhOvLeVBSyCHtd41iB8ZRi+NL2UeC8pNgpqcjMsZG3ye++x3fh6MQ+g==", + "requires": { + "min-dash": "^3.0.0", + "moddle": "^5.0.1", + "moddle-xml": "^8.0.8" + } + }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npm.taobao.org/brace-expansion/download/brace-expansion-1.1.11.tgz", @@ -19024,6 +19508,14 @@ "integrity": "sha1-kkr4gcnVJaydh/QNlk5c6pgqGAk=", "dev": true }, + "camunda-bpmn-moddle": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/camunda-bpmn-moddle/-/camunda-bpmn-moddle-6.1.1.tgz", + "integrity": "sha512-HbYXm9lNPVnGfq4jRRtvR4YgRgw6hGwJ2wFIBghyOQ8fYsqUAPAZ4MJ1pQASZM+XpxmEyRTowc4SiHcAcFbDYw==", + "requires": { + "min-dash": "^3.5.2" + } + }, "caniuse-api": { "version": "3.0.0", "resolved": "https://registry.npm.taobao.org/caniuse-api/download/caniuse-api-3.0.0.tgz", @@ -19447,6 +19939,11 @@ "resolved": "https://registry.npm.taobao.org/component-emitter/download/component-emitter-1.3.0.tgz", "integrity": "sha1-FuQHD7qK4ptnnyIVhT7hgasuq8A=" }, + "component-event": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/component-event/-/component-event-0.1.4.tgz", + "integrity": "sha1-PeePwoeCOBeH4kvyp8U2vwFCybQ=" + }, "compressible": { "version": "2.0.18", "resolved": "https://registry.npm.taobao.org/compressible/download/compressible-2.0.18.tgz", @@ -19971,6 +20468,11 @@ "integrity": "sha1-6nAm/LAXd+295SEk4h8yfnrpUOQ=", "dev": true }, + "css.escape": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz", + "integrity": "sha1-QuJ9T6BK4y+TGktNQZH6nN3ul8s=" + }, "cssesc": { "version": "3.0.0", "resolved": "https://registry.npm.taobao.org/cssesc/download/cssesc-3.0.0.tgz", @@ -20395,6 +20897,38 @@ "integrity": "sha1-yccHdaScPQO8LAbZpzvlUPl4+LE=", "dev": true }, + "diagram-js": { + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/diagram-js/-/diagram-js-7.8.1.tgz", + "integrity": "sha512-Ziy5vTmB8V/kxuhgxQXdnNxSYnqlWxFrBih37MOOglDzyQ5mBIA8tFNssp/ncHpZmhTGC8sb54lYknovzyrrzg==", + "peer": true, + "requires": { + "css.escape": "^1.5.1", + "didi": "^5.2.1", + "hammerjs": "^2.0.1", + "inherits": "^2.0.4", + "min-dash": "^3.5.2", + "min-dom": "^3.1.3", + "object-refs": "^0.3.0", + "path-intersection": "^2.2.1", + "tiny-svg": "^2.2.2" + } + }, + "diagram-js-direct-editing": { + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/diagram-js-direct-editing/-/diagram-js-direct-editing-1.6.3.tgz", + "integrity": "sha512-OwDpK4cNJ4QYuV855HvtZcB9/krfZRQ80uaE6bwaKbyb4584sD7nCtR5yWOyhJx4dIh1gMoqhF7d7G57M4tQVQ==", + "requires": { + "min-dash": "^3.5.2", + "min-dom": "^3.1.3" + } + }, + "didi": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/didi/-/didi-5.2.1.tgz", + "integrity": "sha512-IKNnajUlD4lWMy/Q9Emkk7H1qnzREgY4UyE3IhmOi/9IKua0JYtYldk928bOdt1yNxN8EiOy1sqtSozEYsmjCg==", + "peer": true + }, "diffie-hellman": { "version": "5.0.3", "resolved": "https://registry.npm.taobao.org/diffie-hellman/download/diffie-hellman-5.0.3.tgz", @@ -20507,6 +21041,11 @@ } } }, + "domify": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/domify/-/domify-1.4.1.tgz", + "integrity": "sha512-x18nuiDHMCZGXr4KJSRMf/TWYtiaRo6RX8KN9fEbW54mvbQ6pieUuerC2ahBg+kEp1wycFj8MPUI0WkIOw5E9w==" + }, "domutils": { "version": "1.7.0", "resolved": "https://registry.nlark.com/domutils/download/domutils-1.7.0.tgz", @@ -20572,19 +21111,11 @@ } }, "echarts": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.2.2.tgz", - "integrity": "sha512-yxuBfeIH5c+0FsoRP60w4De6omXhA06c7eUYBsC1ykB6Ys2yK5fSteIYWvkJ4xJVLQgCvAdO8C4mN6MLeJpBaw==", + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/echarts/-/echarts-4.9.0.tgz", + "integrity": "sha512-+ugizgtJ+KmsJyyDPxaw2Br5FqzuBnyOWwcxPKO6y0gc5caYcfnEUIlNStx02necw8jmKmTafmpHhGo4XDtEIA==", "requires": { - "tslib": "2.3.0", - "zrender": "5.2.1" - }, - "dependencies": { - "tslib": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz", - "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==" - } + "zrender": "4.3.2" } }, "ee-first": { @@ -21718,6 +22249,11 @@ "pify": "^4.0.1" } }, + "hammerjs": { + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz", + "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE=" + }, "handle-thing": { "version": "2.0.1", "resolved": "https://registry.npm.taobao.org/handle-thing/download/handle-thing-2.0.1.tgz", @@ -22175,6 +22711,11 @@ "postcss": "^7.0.14" } }, + "ids": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/ids/-/ids-1.0.0.tgz", + "integrity": "sha512-Zvtq1xUto4LttpstyOlFum8lKx+i1OmRfg+6A9drFS9iSZsDPMHG4Sof/qwNR4kCU7jBeWFPrY2ocHxiz7cCRw==" + }, "ieee754": { "version": "1.2.1", "resolved": "https://registry.npm.taobao.org/ieee754/download/ieee754-1.2.1.tgz?cache=0&sync_timestamp=1603841204911&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fieee754%2Fdownload%2Fieee754-1.2.1.tgz", @@ -22285,6 +22826,11 @@ "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=", "dev": true }, + "indexof": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz", + "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=" + }, "infer-owner": { "version": "1.0.4", "resolved": "https://registry.npm.taobao.org/infer-owner/download/infer-owner-1.0.4.tgz", @@ -22891,7 +23437,6 @@ "version": "2.2.0", "resolved": "https://registry.npm.taobao.org/json5/download/json5-2.2.0.tgz", "integrity": "sha1-Lf7+cgxrpSXZ69kJlQ8FFTFsiaM=", - "dev": true, "requires": { "minimist": "^1.2.5" } @@ -23192,6 +23737,11 @@ "resolved": "https://registry.npmjs.org/marked/-/marked-2.1.3.tgz", "integrity": "sha512-/Q+7MGzaETqifOMWYEA7HVMaZb4XbcRfaOzcSsHZEith83KGlvaSG33u0SKu89Mj5h+T8V2hM+8O45Qc5XTgwA==" }, + "matches-selector": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/matches-selector/-/matches-selector-1.2.0.tgz", + "integrity": "sha512-c4vLwYWyl+Ji+U43eU/G5FwxWd4ZH0ePUsFs5y0uwD9HUEFBXUQ1zUUan+78IpRD+y4pUfG0nAzNM292K7ItvA==" + }, "md5.js": { "version": "1.3.5", "resolved": "https://registry.npm.taobao.org/md5.js/download/md5.js-1.3.5.tgz", @@ -23337,6 +23887,22 @@ "integrity": "sha1-ggyGo5M0ZA6ZUWkovQP8qIBX0CI=", "dev": true }, + "min-dash": { + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/min-dash/-/min-dash-3.8.0.tgz", + "integrity": "sha512-a0TLbmL6p4RlNGblZcLd2yjPORp+bCYRlNGvwK5OMwWaMROWh1DlRgN9W8jJm2x9gVuscvD38BEosV7cnikKnw==" + }, + "min-dom": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/min-dom/-/min-dom-3.1.3.tgz", + "integrity": "sha512-Lbi1NZjLV9Hg6/bEe2Lfk2Fzsv1MwheR61whqTLP+FxLndYo9TxpksEgM5Kr1khjfCtFTMr0waeEfwIpStkRdw==", + "requires": { + "component-event": "^0.1.4", + "domify": "^1.3.1", + "indexof": "0.0.1", + "matches-selector": "^1.2.0" + } + }, "mini-css-extract-plugin": { "version": "0.9.0", "resolved": "https://registry.nlark.com/mini-css-extract-plugin/download/mini-css-extract-plugin-0.9.0.tgz?cache=0&sync_timestamp=1628094167664&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fmini-css-extract-plugin%2Fdownload%2Fmini-css-extract-plugin-0.9.0.tgz", @@ -23463,6 +24029,29 @@ "minimist": "^1.2.5" } }, + "moddle": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/moddle/-/moddle-5.0.2.tgz", + "integrity": "sha512-nBEyKt7sDw6MlM6e85lTCEXButw+p7hubEoRo/JyX+dBzDcGjDoktPuby9QE+ylW1ABZqNvRy8pK0h+23tIW2g==", + "requires": { + "min-dash": "^3.0.0" + } + }, + "moddle-xml": { + "version": "8.0.8", + "resolved": "https://registry.npmjs.org/moddle-xml/-/moddle-xml-8.0.8.tgz", + "integrity": "sha512-JzW8wUCH7Qze7eh0T8A1exi7QJg6hRgq+uw8goHNP5Q7pWTGrLj83S+NgA/94M2I0JmqnK9hw3sCbyiKVOjc4Q==", + "requires": { + "min-dash": "^3.0.0", + "moddle": "^5.0.1", + "saxen": "^8.1.2" + } + }, + "mousetrap": { + "version": "1.6.5", + "resolved": "https://registry.npmjs.org/mousetrap/-/mousetrap-1.6.5.tgz", + "integrity": "sha512-QNo4kEepaIBwiT8CDhP98umTetp+JNfQYBWvC1pc6/OAibuXtRcxZ58Qz8skvEHYvURne/7R8T5VoOI7rDsEUA==" + }, "move-concurrently": { "version": "1.0.1", "resolved": "https://registry.npm.taobao.org/move-concurrently/download/move-concurrently-1.0.1.tgz", @@ -23766,6 +24355,11 @@ "resolved": "https://registry.npm.taobao.org/object-keys/download/object-keys-1.1.1.tgz", "integrity": "sha1-HEfyct8nfzsdrwYWd9nILiMixg4=" }, + "object-refs": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/object-refs/-/object-refs-0.3.0.tgz", + "integrity": "sha512-eP0ywuoWOaDoiake/6kTJlPJhs+k0qNm4nYRzXLNHj6vh+5M3i9R1epJTdxIPGlhWc4fNRQ7a6XJNCX+/L4FOQ==" + }, "object-visit": { "version": "1.0.1", "resolved": "https://registry.npm.taobao.org/object-visit/download/object-visit-1.0.1.tgz", @@ -24122,6 +24716,12 @@ "integrity": "sha1-UTvb4tO5XXdi6METfvoZXGxhtbM=", "dev": true }, + "path-intersection": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/path-intersection/-/path-intersection-2.2.1.tgz", + "integrity": "sha512-9u8xvMcSfuOiStv9bPdnRJQhGQXLKurew94n4GPQCdH1nj9QKC9ObbNoIpiRq8skiOBxKkt277PgOoFgAt3/rA==", + "peer": true + }, "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npm.taobao.org/path-is-absolute/download/path-is-absolute-1.0.1.tgz", @@ -24900,6 +25500,11 @@ "integrity": "sha1-RD9qIM7WSBor2k+oUypuVdeJoss=", "dev": true }, + "preact": { + "version": "10.6.4", + "resolved": "https://registry.npmjs.org/preact/-/preact-10.6.4.tgz", + "integrity": "sha512-WyosM7pxGcndU8hY0OQlLd54tOU+qmG45QXj2dAYrL11HoyU/EzOSTlpJsirbBr1QW7lICxSsVJJmcmUglovHQ==" + }, "prelude-ls": { "version": "1.1.2", "resolved": "https://registry.npm.taobao.org/prelude-ls/download/prelude-ls-1.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fprelude-ls%2Fdownload%2Fprelude-ls-1.1.2.tgz", @@ -25141,6 +25746,37 @@ "unpipe": "1.0.0" } }, + "raw-loader": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-4.0.2.tgz", + "integrity": "sha512-ZnScIV3ag9A4wPX/ZayxL/jZH+euYb6FcUinPcgiQW0+UBtEv0O6Q3lGd3cqJ+GHH+rksEv3Pj99oxJ3u3VIKA==", + "requires": { + "loader-utils": "^2.0.0", + "schema-utils": "^3.0.0" + }, + "dependencies": { + "loader-utils": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz", + "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==", + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, + "schema-utils": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", + "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", + "requires": { + "@types/json-schema": "^7.0.8", + "ajv": "^6.12.5", + "ajv-keywords": "^3.5.2" + } + } + } + }, "read-pkg": { "version": "5.2.0", "resolved": "https://registry.nlark.com/read-pkg/download/read-pkg-5.2.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fread-pkg%2Fdownload%2Fread-pkg-5.2.0.tgz", @@ -25581,6 +26217,11 @@ "integrity": "sha1-KBYjTiN4vdxOU1T6tcqold9xANk=", "dev": true }, + "saxen": { + "version": "8.1.2", + "resolved": "https://registry.npmjs.org/saxen/-/saxen-8.1.2.tgz", + "integrity": "sha512-xUOiiFbc3Ow7p8KMxwsGICPx46ZQvy3+qfNVhrkwfz3Vvq45eGt98Ft5IQaA1R/7Tb5B5MKh9fUR9x3c3nDTxw==" + }, "schema-utils": { "version": "2.7.1", "resolved": "https://registry.nlark.com/schema-utils/download/schema-utils-2.7.1.tgz?cache=0&sync_timestamp=1626694740261&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fschema-utils%2Fdownload%2Fschema-utils-2.7.1.tgz", @@ -25605,12 +26246,34 @@ "debug": "^4.2.0" } }, + "scroll-tabs": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/scroll-tabs/-/scroll-tabs-1.0.1.tgz", + "integrity": "sha512-W4xjEwNS4QAyQnaJ450vQTcKpbnalBAfsTDV926WrxEMOqjyj2To8uv2d0Cp0oxMdk5TkygtzXmctPNc2zgBcg==", + "requires": { + "min-dash": "^3.1.0", + "min-dom": "^3.1.0", + "mitt": "^1.1.3" + }, + "dependencies": { + "mitt": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mitt/-/mitt-1.2.0.tgz", + "integrity": "sha512-r6lj77KlwqLhIUku9UWYes7KJtsczvolZkzp8hbaDPPaE24OmWl5s539Mytlj22siEQKosZ26qCBgda2PKwoJw==" + } + } + }, "select-hose": { "version": "2.0.0", "resolved": "https://registry.npm.taobao.org/select-hose/download/select-hose-2.0.0.tgz", "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=", "dev": true }, + "selection-update": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/selection-update/-/selection-update-0.1.2.tgz", + "integrity": "sha1-gDoETcxu2rWjrmSPXwNX6JrWa5Y=" + }, "selfsigned": { "version": "1.10.11", "resolved": "https://registry.nlark.com/selfsigned/download/selfsigned-1.10.11.tgz", @@ -26683,6 +27346,11 @@ "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=", "dev": true }, + "tiny-svg": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/tiny-svg/-/tiny-svg-2.2.2.tgz", + "integrity": "sha512-u6zCuMkDR/3VAh83X7hDRn/pi0XhwG2ycuNS0cTFtQjGdOG2tSvEb8ds65VeGWc3H6PUjJKeunueXqgkZqtMsg==" + }, "tinymce": { "version": "5.10.2", "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-5.10.2.tgz", @@ -27210,6 +27878,11 @@ "markdown-it": "^8.4.0" } }, + "vue-bpmn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/vue-bpmn/-/vue-bpmn-0.3.0.tgz", + "integrity": "sha512-gp43Qx34HzOIbhzxFL3gXmkc28NDQE79boPcqMHbQ6y351Jys7tPk+mdsKATIN5IAM2UfraIQxhylvb4/vubgA==" + }, "vue-demi": { "version": "0.11.4", "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.11.4.tgz", @@ -27249,6 +27922,11 @@ "integrity": "sha1-UylVzB6yCKPZkLOp+acFdGV+CPI=", "dev": true }, + "vue-json-pretty": { + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/vue-json-pretty/-/vue-json-pretty-1.8.2.tgz", + "integrity": "sha512-8DbgvyXpBrhDdBzz8RTe+POZ+HI6nSa33DqsPMWhMkv0u0ATklgxErUM3XRRvTzOQ/02Sh1LNWJ/rkqTow2rbA==" + }, "vue-loader": { "version": "15.9.8", "resolved": "https://registry.nlark.com/vue-loader/download/vue-loader-15.9.8.tgz?cache=0&sync_timestamp=1628666767864&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fvue-loader%2Fdownload%2Fvue-loader-15.9.8.tgz", @@ -28309,19 +28987,9 @@ } }, "zrender": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.2.1.tgz", - "integrity": "sha512-M3bPGZuyLTNBC6LiNKXJwSCtglMp8XUEqEBG+2MdICDI3d1s500Y4P0CzldQGsqpRVB7fkvf3BKQQRxsEaTlsw==", - "requires": { - "tslib": "2.3.0" - }, - "dependencies": { - "tslib": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz", - "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==" - } - } + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/zrender/-/zrender-4.3.2.tgz", + "integrity": "sha512-bIusJLS8c4DkIcdiK+s13HiQ/zjQQVgpNohtd8d94Y2DnJqgM1yjh/jpDb8DoL6hd7r8Awagw8e3qK/oLaWr3g==" } } } diff --git a/web/package.json b/web/package.json index f169c04..85181a6 100644 --- a/web/package.json +++ b/web/package.json @@ -10,8 +10,14 @@ "dependencies": { "@babel/polyfill": "^7.12.1", "@element-plus/icons": "0.0.11", + "@logicflow/core": "^0.4.13", + "@logicflow/extension": "^0.4.13", "@tinymce/tinymce-vue": "^4.0.5", "axios": "^0.19.2", + "bpmn-js": "^4.0.4", + "bpmn-js-properties-panel": "^0.32.2", + "bpmn-moddle": "^6.0.0", + "camunda-bpmn-moddle": "^6.1.1", "core-js": "^3.6.5", "echarts": "4.9.0", "element-plus": "^1.1.0-beta.24", @@ -21,12 +27,15 @@ "path": "^0.12.7", "qs": "^6.8.0", "quill": "^1.3.7", + "raw-loader": "^4.0.2", "screenfull": "^5.0.2", "script-ext-html-webpack-plugin": "^2.1.4", "spark-md5": "^3.0.1", "tinymce": "^5.10.2", - "vue": "^3.2.0", + "vue": "^3.2.4", "vue-baidu-map": "^0.21.22", + "vue-bpmn": "^0.3.0", + "vue-json-pretty": "^1.8.2", "vue-particle-line": "^0.1.4", "vue-quill-editor": "^3.0.6", "vue-router": "^4.0.0-0", diff --git a/web/src/api/comment.js b/web/src/api/comment.js new file mode 100644 index 0000000..365baf4 --- /dev/null +++ b/web/src/api/comment.js @@ -0,0 +1,43 @@ +// 文章/评论管理api +import service from '@/utils/request' + +// @Tags api +// @Summary 查询文档评论 分页 +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body modelInterface.PageInfo true "分页获取用户列表" +// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /api/getApiList [post] +// { +// page int +// pageSize int +// } +export const getdiscussfilemsg = (data) => { + return service({ + url: '/archive/getdiscussfilemsg', + method: 'post', + data + }) +} +// @Tags api +// @Summary 文章 分页 +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body modelInterface.PageInfo true "分页获取用户列表" +// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /api/getApiList [post] +// { +// page int +// pageSize int +// } +export const archivefilelist = (data) => { + return service({ + url: '/archive/archivefilelist', + method: 'post', + data + }) + } + + diff --git a/web/src/api/dataEntry.js b/web/src/api/dataEntry.js new file mode 100644 index 0000000..c0d4d1f --- /dev/null +++ b/web/src/api/dataEntry.js @@ -0,0 +1,460 @@ +// 数据提报 +import service from '@/utils/request' + +// @Tags api +// @Summary 查询考核类别 分页 +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body modelInterface.PageInfo true "分页获取用户列表" +// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /api/getApiList [post] +// { +// page int +// pageSize int +// } +export const dutyclasslist = (data) => { + return service({ + url: '/duty/dutyclasslist', + method: 'post', + data + }) +} +// @Tags api +// @Summary 添加考核类别 分页 +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body modelInterface.PageInfo true "分页获取用户列表" +// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /api/getApiList [post] +// { +// page int +// pageSize int +// } +export const adddutyclass = (data) => { + return service({ + url: '/duty/adddutyclass', + method: 'post', + data + }) + } +// @Tags api +// @Summary 查询考核类别详情 分页 +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body modelInterface.PageInfo true "分页获取用户列表" +// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /api/getApiList [post] +// { +// page int +// pageSize int +// } +export const getdutyclassinfo = (data) => { + return service({ + url: '/duty/getdutyclassinfo', + method: 'post', + data + }) + } +// @Tags api +// @Summary 编辑考核类别内容 +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body modelInterface.PageInfo true "分页获取用户列表" +// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /api/getApiList [post] +// { +// page int +// pageSize int +// } +export const eitedutyclassinfo = (data) => { + return service({ + url: '/duty/eitedutyclassinfo', + method: 'post', + data + }) + } +// @Tags api +// @Summary 删除或改变考核类别状态 +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body modelInterface.PageInfo true "分页获取用户列表" +// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /api/getApiList [post] +// { +// page int +// pageSize int +// } +export const statedutyclass = (data) => { + return service({ + url: '/duty/statedutyclass', + method: 'post', + data + }) + } +// @Tags api +// @Summary 考核项目列表 +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body modelInterface.PageInfo true "分页获取用户列表" +// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /api/getApiList [post] +// { +// page int +// pageSize int +// } +export const assessList = (data) => { + return service({ + url: '/duty/assessList', + method: 'post', + data + }) + } +// @Tags api +// @Summary 添加考核项目 +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body modelInterface.PageInfo true "分页获取用户列表" +// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /api/getApiList [post] +// { +// page int +// pageSize int +// } +export const addassessinfo = (data) => { + return service({ + url: '/duty/addassessinfo', + method: 'post', + data + }) + } +// @Tags api +// @Summary 获取考核项目详情 +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body modelInterface.PageInfo true "分页获取用户列表" +// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /api/getApiList [post] +// { +// page int +// pageSize int +// } +export const getassessinfo = (data) => { + return service({ + url: '/duty/getassessinfo', + method: 'post', + data + }) + } +// @Tags api +// @Summary 修改考核项目内容 +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body modelInterface.PageInfo true "分页获取用户列表" +// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /api/getApiList [post] +// { +// page int +// pageSize int +// } +export const eiteassessinfo = (data) => { + return service({ + url: '/duty/eiteassessinfo', + method: 'post', + data + }) + } +// @Tags api +// @Summary 删除或变更考核项目状态 +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body modelInterface.PageInfo true "分页获取用户列表" +// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /api/getApiList [post] +// { +// page int +// pageSize int +// } +export const eiteassessstate = (data) => { + return service({ + url: '/duty/eiteassessstate', + method: 'post', + data + }) + } +// @Tags api +// @Summary 具体职责列表 +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body modelInterface.PageInfo true "分页获取用户列表" +// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /api/getApiList [post] +// { +// page int +// pageSize int +// } +export const dutylist = (data) => { + return service({ + url: '/duty/dutylist', + method: 'post', + data + }) + } +// @Tags api +// @Summary 添加具体职责 +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body modelInterface.PageInfo true "分页获取用户列表" +// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /api/getApiList [post] +// { +// page int +// pageSize int +// } +export const adddutyinfo = (data) => { + return service({ + url: '/duty/adddutyinfo', + method: 'post', + data + }) + } +// @Tags api +// @Summary 获取具体职责详情 +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body modelInterface.PageInfo true "分页获取用户列表" +// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /api/getApiList [post] +// { +// page int +// pageSize int +// } +export const getdutyinfo = (data) => { + return service({ + url: '/duty/getdutyinfo', + method: 'post', + data + }) + } +// @Tags api +// @Summary 编辑职责详情 +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body modelInterface.PageInfo true "分页获取用户列表" +// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /api/getApiList [post] +// { +// page int +// pageSize int +// } +export const eitedutyinfo = (data) => { + return service({ + url: '/duty/eitedutyinfo', + method: 'post', + data + }) + } +// @Tags api +// @Summary 修改状态或删除具体职责 +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body modelInterface.PageInfo true "分页获取用户列表" +// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /api/getApiList [post] +// { +// page int +// pageSize int +// } +export const eitedutystate = (data) => { + return service({ + url: '/duty/eitedutystate', + method: 'post', + data + }) + } +// @Tags api +// @Summary 获取集团详情 +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body modelInterface.PageInfo true "分页获取用户列表" +// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /api/getApiList [post] +// { +// page int +// pageSize int +// } +export const grouplist = (data) => { + return service({ + url: '/group/grouplist', + method: 'post', + data + }) +} +// @Tags api +// @Summary 获取员工列表 +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body modelInterface.PageInfo true "分页获取用户列表" +// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /api/getApiList [post] +// { +// page int +// pageSize int +// } +export const stafflist = (data) => { + return service({ + url: '/staff/stafflist', + method: 'post', + data + }) +} +// @Tags api +// @Summary 部门考核项目列表 +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body modelInterface.PageInfo true "分页获取用户列表" +// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /api/getApiList [post] +// { +// page int +// pageSize int +// } +export const specdutylist = (data) => { + return service({ + url: '/duty/specdutylist', + method: 'post', + data + }) +} +// @Tags api +// @Summary 添加部门考核项目 +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body modelInterface.PageInfo true "分页获取用户列表" +// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /api/getApiList [post] +// { +// page int +// pageSize int +// } +export const addspecdutyinfo = (data) => { + return service({ + url: '/duty/addspecdutyinfo', + method: 'post', + data + }) +} +// @Tags api +// @Summary 获取部门考核项目详情 +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body modelInterface.PageInfo true "分页获取用户列表" +// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /api/getApiList [post] +// { +// page int +// pageSize int +// } +export const getspecdutyinfo = (data) => { + return service({ + url: '/duty/getspecdutyinfo', + method: 'post', + data + }) +} +// @Tags api +// @Summary 编辑部门考核项目详情 +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body modelInterface.PageInfo true "分页获取用户列表" +// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /api/getApiList [post] +// { +// page int +// pageSize int +// } +export const eitespecdutyinfo = (data) => { + return service({ + url: '/duty/eitespecdutyinfo', + method: 'post', + data + }) +} +// @Tags api +// @Summary 修改状态或删除具体部门考核项目 +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body modelInterface.PageInfo true "分页获取用户列表" +// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /api/getApiList [post] +// { +// page int +// pageSize int +// } +export const eitespecdutystate = (data) => { + return service({ + url: '/duty/eitespecdutystate', + method: 'post', + data + }) +} +// @Tags api +// @Summary 添加部门考核项目详情（副本） +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body modelInterface.PageInfo true "分页获取用户列表" +// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /api/getApiList [post] +// { +// page int +// pageSize int +// } +export const adddepartdutyinfo = (data) => { + return service({ + url: '/duty/adddepartdutyinfo', + method: 'post', + data + }) +} +// @Tags api +// @Summary 修改具体部门考核项目详情(副本) +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body modelInterface.PageInfo true "分页获取用户列表" +// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /api/getApiList [post] +// { +// page int +// pageSize int +// } +export const eitedepartdutyinfo = (data) => { + return service({ + url: '/duty/eitedepartdutyinfo', + method: 'post', + data + }) +} + diff --git a/web/src/api/documentation.js b/web/src/api/documentation.js new file mode 100644 index 0000000..2358e06 --- /dev/null +++ b/web/src/api/documentation.js @@ -0,0 +1,156 @@ +// 健康上报api +import service from '@/utils/request' + +// @Tags api +// @Summary 获取文档栏目分类 不分页 +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body modelInterface.PageInfo true "分页获取用户列表" +// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /api/getApiList [post] +// { +// page int +// pageSize int +// } +export const archivetypelist = (data) => { + return service({ + url: 'archive/archivetypelist', + method: 'post', + data + }) +} +// @Tags api +// @Summary 新建栏目 +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body modelInterface.PageInfo true "分页获取用户列表" +// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /api/getApiList [post] +// { +// page int +// pageSize int +// } +export const addarchivetype = (data) => { + return service({ + url: '/archive/addarchivetype', + method: 'post', + data + }) + } +// @Tags api +// @Summary 获取单个栏目详细信息 +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body modelInterface.PageInfo true "分页获取用户列表" +// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /api/getApiList [post] +// { +// page int +// pageSize int +// } +export const getarchiveinfo = (data) => { + return service({ + url: '/archive/getarchiveinfo', + method: 'post', + data + }) +} +// @Tags api +// @Summary 改变栏目状态 +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body modelInterface.PageInfo true "分页获取用户列表" +// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /api/getApiList [post] +// { +// page int +// pageSize int +// } +export const eitearchivestate = (data) => { + return service({ + url: '/archive/eitearchivestate', + method: 'post', + data + }) +} +// @Tags api +// @Summary 修改栏目信息 +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body modelInterface.PageInfo true "分页获取用户列表" +// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /api/getApiList [post] +// { +// page int +// pageSize int +// } +export const eitearchiveinfo = (data) => { + return service({ + url: '/archive/eitearchiveinfo', + method: 'post', + data + }) +} +// @Tags api +// @Summary 添加被通知人信息 +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body modelInterface.PageInfo true "分页获取用户列表" +// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /api/getApiList [post] +// { +// page int +// pageSize int +// } +export const addnoticeuser = (data) => { + return service({ + url: '/wechathealth/addnoticeuser', + method: 'post', + data + }) +} +// @Tags api +// @Summary 修改被通知人信息 +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body modelInterface.PageInfo true "分页获取用户列表" +// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /api/getApiList [post] +// { +// page int +// pageSize int +// } +export const eitenoticeuser = (data) => { + return service({ + url: '/wechathealth/eitenoticeuser', + method: 'post', + data + }) +} +// @Tags api +// @Summary 删除被通知人信息 +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body modelInterface.PageInfo true "分页获取用户列表" +// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /api/getApiList [post] +// { +// page int +// pageSize int +// } +export const delnoticeuser = (data) => { + return service({ + url: '/wechathealth/delnoticeuser', + method: 'post', + data + }) +} + diff --git a/web/src/api/group.js b/web/src/api/group.js index de38e5b..6b60073 100644 --- a/web/src/api/group.js +++ b/web/src/api/group.js @@ -115,4 +115,34 @@ export const grouplist = (data) => { data }) } +// @Tags Api +// @Summary 获取集团架构（集团+分厂） +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body dbModel.Api true "获取集团架构" +// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /group/grouplist [get] +export const getgroupdepartmap = (data) => { + return service({ + url: '/group/getgroupdepartmap', + method: 'post', + data + }) +} +// @Tags Api +// @Summary 获取集团架构人员信息对照表 +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body dbModel.Api true "获取集团架构" +// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /group/grouplist [get] +export const getgroupuser = (data) => { + return service({ + url: '/group/getgroupuser', + method: 'post', + data + }) +} diff --git a/web/src/assets/diagram1.bpmn b/web/src/assets/diagram1.bpmn new file mode 100644 index 0000000..d7145cc --- /dev/null +++ b/web/src/assets/diagram1.bpmn @@ -0,0 +1,202 @@ + + + + + SequenceFlow_07f1sez + + + SequenceFlow_07f1sez + SequenceFlow_15ow6gv + SequenceFlow_0d1io4v + SequenceFlow_1rcakng + + + + isTrue + + + + + + + + + SequenceFlow_0y1iisj + SequenceFlow_1gwuen1 + + + SequenceFlow_1gwuen1 + SequenceFlow_0dissda + + + SequenceFlow_15ow6gv + SequenceFlow_0jo6785 + SequenceFlow_0dissda + + + sendapp + + + + + + + + SequenceFlow_0jo6785 + SequenceFlow_0y1iisj + + + + + SequenceFlow_0d1io4v + SequenceFlow_0yptzdv + SequenceFlow_17zsv75 + + + isSend + + + + + + + + SequenceFlow_1rcakng + SequenceFlow_0w7hugc + + + + SequenceFlow_0w7hugc + + + + SequenceFlow_0yptzdv + SequenceFlow_02m7s7p + + + senmessage + + + SequenceFlow_02m7s7p + SequenceFlow_17zsv75 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/src/assets/global.css b/web/src/assets/global.css new file mode 100644 index 0000000..919757f --- /dev/null +++ b/web/src/assets/global.css @@ -0,0 +1,36 @@ +body{ + margin: 0; + padding: 0; +} + +/*路由切换动画*/ +.router-fade-enter-active { + transition: all 0.3s cubic-bezier(0.6, 0.5, 0.3, 0.1); +} + +.router-fade-leave-active { + transition: all 0.3s cubic-bezier(0.5, 0.5, 0.5, 0.5); +} + +.router-fade-enter { + transform: translateX(-10px); + opacity: 0; +} + +.router-fade-leave-to { + transform: translateX(50px); + opacity: 0; +} + +.fl { + float: left; +} +.fr { + float: right; +} +.tl{ + text-align: left; +} +.tr{ + text-align: right; +} diff --git a/web/src/components/complexTransfer/index.vue b/web/src/components/complexTransfer/index.vue new file mode 100644 index 0000000..923161b --- /dev/null +++ b/web/src/components/complexTransfer/index.vue @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/web/src/components/dutyDialog/index.vue b/web/src/components/dutyDialog/index.vue new file mode 100644 index 0000000..2ad4a44 --- /dev/null +++ b/web/src/components/dutyDialog/index.vue @@ -0,0 +1,137 @@ + + + + + \ No newline at end of file diff --git a/web/src/components/projectDialog/index.vue b/web/src/components/projectDialog/index.vue new file mode 100644 index 0000000..a5439e3 --- /dev/null +++ b/web/src/components/projectDialog/index.vue @@ -0,0 +1,149 @@ + + + + + \ No newline at end of file diff --git a/web/src/main.js b/web/src/main.js index 60be346..c6972c8 100644 --- a/web/src/main.js +++ b/web/src/main.js @@ -17,7 +17,14 @@ import '@/permission' import { store } from '@/store/index' import App from './App.vue' - +// bpmn +/*左边工具栏以及编辑节点的样式*/ +import "bpmn-js/dist/assets/diagram-js.css"; +import "bpmn-js/dist/assets/bpmn-font/css/bpmn.css"; +import "bpmn-js/dist/assets/bpmn-font/css/bpmn-codes.css"; +import "bpmn-js/dist/assets/bpmn-font/css/bpmn-embedded.css"; +/*右边工具栏样式*/ +import "bpmn-js-properties-panel/dist/assets/bpmn-js-properties-panel.css"; diff --git a/web/src/mixins/infoList.js b/web/src/mixins/infoList.js index 1b0a224..f57410a 100644 --- a/web/src/mixins/infoList.js +++ b/web/src/mixins/infoList.js @@ -8,6 +8,7 @@ export default { total: 10, pageSize: 10, tableData: [], + tabledata:[], searchInfo: {} } }, @@ -59,6 +60,10 @@ export default { this.page = table.data.page this.pageSize = table.data.pageSize this.pagesize = table.data.pagesize + this.tabledata = table.data.data + // if (table.data.data!='') { + // this.tableData = table.data.data + // } } if (table.code === 200) { this.tableData = table.data diff --git a/web/src/permission.js b/web/src/permission.js index 51747d0..a18f190 100644 --- a/web/src/permission.js +++ b/web/src/permission.js @@ -3,7 +3,7 @@ import { store } from '@/store/index' import getPageTitle from '@/utils/page' let asyncRouterFlag = 0 -const whiteList = ['Login', 'Init'] +const whiteList = ['Login', 'Init','Userlogin'] const getRouter = async() => { await store.dispatch('router/SetAsyncRouter') @@ -46,6 +46,7 @@ router.beforeEach(async(to, from, next) => { } // 不在白名单中并且未登陆的时候 if (!token) { + console.log("我跳") next({ name: 'Login', query: { diff --git a/web/src/router/index.js b/web/src/router/index.js index 290e931..dda2d93 100644 --- a/web/src/router/index.js +++ b/web/src/router/index.js @@ -13,6 +13,11 @@ const routes = [{ path: '/login', name: 'Login', component: () => import('@/view/login/index.vue') +}, +{ + path: '/userlogin', + name: 'Userlogin', + component: () => import('@/view/login/userLogin.vue') } ] diff --git a/web/src/view/login/index.vue b/web/src/view/login/index.vue index 500efef..356dd82 100644 --- a/web/src/view/login/index.vue +++ b/web/src/view/login/index.vue @@ -57,6 +57,9 @@ + +
+ + + + + + + + diff --git a/web/src/view/news/column/topColumn.vue b/web/src/view/news/column/topColumn.vue index 4368d5f..210ca1e 100644 --- a/web/src/view/news/column/topColumn.vue +++ b/web/src/view/news/column/topColumn.vue @@ -11,7 +11,7 @@ @@ -26,12 +26,13 @@
- - - + + + - - + + +