From 77c8b7f0f2a8209baa0be9b98cbf8d7b258c8210 Mon Sep 17 00:00:00 2001
From: zhuyong <123@163.com>
Date: Thu, 8 Jul 2021 13:38:03 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20(=E8=A1=A8=E5=8D=95)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
修复保存表单时按钮丢失问题
---
README.md | 4 +-
ruoyi-ui/package-lock.json | 84 -------------------------
ruoyi-ui/src/views/index.vue | 11 +++-
ruoyi-ui/src/views/tool/build/index.vue | 1 +
4 files changed, 11 insertions(+), 89 deletions(-)
diff --git a/README.md b/README.md
index ad425e5..6b3fc28 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@
访问链接:http://129.211.46.183/
-#####为了方便体验,请勿删除和改动初始化的几个流程和表单,感谢!有其它流程实现,请自行定义新流程、表单。
+##### 为了方便体验,请勿删除和改动初始化的几个流程和表单,感谢!有其它流程实现,请自行定义新流程、表单。
## 工作流交流群
@@ -51,7 +51,7 @@ GitHub:https://github.com/tony2y/RuoYi-flowable.git
|
- |
+ |
|
diff --git a/ruoyi-ui/package-lock.json b/ruoyi-ui/package-lock.json
index 2c3d9ee..4addc65 100644
--- a/ruoyi-ui/package-lock.json
+++ b/ruoyi-ui/package-lock.json
@@ -1111,14 +1111,6 @@
"to-fast-properties": "^2.0.0"
}
},
- "@bpmn-io/extract-process-variables": {
- "version": "0.3.0",
- "resolved": "https://registry.npm.taobao.org/@bpmn-io/extract-process-variables/download/@bpmn-io/extract-process-variables-0.3.0.tgz",
- "integrity": "sha1-F1+BEUtECSzvpuFbRUJ/IvhlAx8=",
- "requires": {
- "min-dash": "^3.5.2"
- }
- },
"@eslint/eslintrc": {
"version": "0.2.2",
"resolved": "https://registry.npm.taobao.org/@eslint/eslintrc/download/@eslint/eslintrc-0.2.2.tgz",
@@ -2740,28 +2732,6 @@
"tiny-svg": "^2.2.2"
}
},
- "bpmn-js-cli": {
- "version": "2.0.2",
- "resolved": "https://registry.npm.taobao.org/bpmn-js-cli/download/bpmn-js-cli-2.0.2.tgz?cache=0&sync_timestamp=1614594515590&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbpmn-js-cli%2Fdownload%2Fbpmn-js-cli-2.0.2.tgz",
- "integrity": "sha1-mmjrxuG4u2dbaAwzKnJ/aYtFy7U=",
- "requires": {
- "min-dash": "^3.1.0"
- }
- },
- "bpmn-js-properties-panel": {
- "version": "0.37.6",
- "resolved": "https://registry.npm.taobao.org/bpmn-js-properties-panel/download/bpmn-js-properties-panel-0.37.6.tgz?cache=0&sync_timestamp=1617868717711&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbpmn-js-properties-panel%2Fdownload%2Fbpmn-js-properties-panel-0.37.6.tgz",
- "integrity": "sha1-sJWYkVyVaRHkbHceSmB4Myoan+Q=",
- "requires": {
- "@bpmn-io/extract-process-variables": "^0.3.0",
- "ids": "^1.0.0",
- "inherits": "^2.0.1",
- "lodash": "^4.17.20",
- "min-dom": "^3.1.3",
- "scroll-tabs": "^1.0.1",
- "selection-update": "^0.1.2"
- }
- },
"bpmn-moddle": {
"version": "7.0.4",
"resolved": "https://registry.npm.taobao.org/bpmn-moddle/download/bpmn-moddle-7.0.4.tgz?cache=0&sync_timestamp=1606999802077&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbpmn-moddle%2Fdownload%2Fbpmn-moddle-7.0.4.tgz",
@@ -3132,14 +3102,6 @@
}
}
},
- "camunda-bpmn-moddle": {
- "version": "4.5.0",
- "resolved": "https://registry.npm.taobao.org/camunda-bpmn-moddle/download/camunda-bpmn-moddle-4.5.0.tgz",
- "integrity": "sha1-8m4jXNNyisZvzwRCr6iVo11Uccs=",
- "requires": {
- "min-dash": "^3.0.0"
- }
- },
"caniuse-api": {
"version": "3.0.0",
"resolved": "https://registry.npm.taobao.org/caniuse-api/download/caniuse-api-3.0.0.tgz",
@@ -4755,17 +4717,6 @@
"min-dom": "^3.1.3"
}
},
- "diagram-js-minimap": {
- "version": "2.0.4",
- "resolved": "https://registry.npm.taobao.org/diagram-js-minimap/download/diagram-js-minimap-2.0.4.tgz",
- "integrity": "sha1-g0Vw3lID61JPcPrHNwdEsJHNyEQ=",
- "requires": {
- "css.escape": "^1.5.1",
- "min-dash": "^3.5.2",
- "min-dom": "^3.1.1",
- "tiny-svg": "^2.2.2"
- }
- },
"didi": {
"version": "4.0.0",
"resolved": "https://registry.npm.taobao.org/didi/download/didi-4.0.0.tgz",
@@ -8718,11 +8669,6 @@
"through2": "^2.0.0"
}
},
- "mitt": {
- "version": "1.2.0",
- "resolved": "https://registry.npm.taobao.org/mitt/download/mitt-1.2.0.tgz",
- "integrity": "sha1-yyTmVpyAbjG9TjmVeH/jigT9+Q0="
- },
"mixin-deep": {
"version": "1.3.2",
"resolved": "https://registry.npm.taobao.org/mixin-deep/download/mixin-deep-1.3.2.tgz",
@@ -11510,16 +11456,6 @@
"debug": "^4.2.0"
}
},
- "scroll-tabs": {
- "version": "1.0.1",
- "resolved": "https://registry.npm.taobao.org/scroll-tabs/download/scroll-tabs-1.0.1.tgz",
- "integrity": "sha1-usBOShcl6KAzRLrmRN1tfNwZJFI=",
- "requires": {
- "min-dash": "^3.1.0",
- "min-dom": "^3.1.0",
- "mitt": "^1.1.3"
- }
- },
"scss-tokenizer": {
"version": "0.2.3",
"resolved": "https://registry.npm.taobao.org/scss-tokenizer/download/scss-tokenizer-0.2.3.tgz",
@@ -11552,11 +11488,6 @@
"integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=",
"dev": true
},
- "selection-update": {
- "version": "0.1.2",
- "resolved": "https://registry.npm.taobao.org/selection-update/download/selection-update-0.1.2.tgz",
- "integrity": "sha1-gDoETcxu2rWjrmSPXwNX6JrWa5Y="
- },
"selfsigned": {
"version": "1.10.8",
"resolved": "https://registry.npm.taobao.org/selfsigned/download/selfsigned-1.10.8.tgz?cache=0&sync_timestamp=1600187989135&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fselfsigned%2Fdownload%2Fselfsigned-1.10.8.tgz",
@@ -13516,21 +13447,6 @@
"resolved": "https://registry.npm.taobao.org/vue/download/vue-2.6.12.tgz?cache=0&sync_timestamp=1617321643721&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue%2Fdownload%2Fvue-2.6.12.tgz",
"integrity": "sha1-9evU+mvShpQD4pqJau1JBEVskSM="
},
- "vue-bpmn-modeler": {
- "version": "1.2.0",
- "resolved": "https://registry.npm.taobao.org/vue-bpmn-modeler/download/vue-bpmn-modeler-1.2.0.tgz",
- "integrity": "sha1-ivytW/VF/boLlho2uRBHLu9YZhw=",
- "requires": {
- "bpmn-js": "^7.3.1",
- "bpmn-js-cli": "^2.0.0",
- "bpmn-js-properties-panel": "^0.37.2",
- "camunda-bpmn-moddle": "^4.4.0",
- "core-js": "^3.6.5",
- "diagram-js-minimap": "^2.0.3",
- "inherits": "^2.0.4",
- "vue": "^2.6.12"
- }
- },
"vue-count-to": {
"version": "1.0.13",
"resolved": "https://registry.npm.taobao.org/vue-count-to/download/vue-count-to-1.0.13.tgz",
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index 029b355..9121250 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -51,9 +51,14 @@
捐赠支持
-
-
-
+
+
你可以请作者喝杯咖啡表示鼓励
diff --git a/ruoyi-ui/src/views/tool/build/index.vue b/ruoyi-ui/src/views/tool/build/index.vue
index 759797a..dc26cca 100644
--- a/ruoyi-ui/src/views/tool/build/index.vue
+++ b/ruoyi-ui/src/views/tool/build/index.vue
@@ -507,6 +507,7 @@ export default {
handleForm(){
this.formData = {
fields: deepClone(this.drawingList),
+ ...this.formConf
}
this.form.formContent = JSON.stringify(this.formData);
this.formOpen = true;