From a064dc83f3a64719381ccb4314fae53e2bed7cc5 Mon Sep 17 00:00:00 2001 From: Jimi Date: Fri, 2 Jul 2021 21:56:18 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9A=E9=80=89?= =?UTF-8?q?=E6=A1=86=E7=BB=84=E7=9A=84=E9=80=89=E9=A1=B9=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/form/editor/RightPanel.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/form/editor/RightPanel.vue b/src/views/form/editor/RightPanel.vue index 9ac79d9..2c673ee 100644 --- a/src/views/form/editor/RightPanel.vue +++ b/src/views/form/editor/RightPanel.vue @@ -1404,8 +1404,9 @@ export default { addSelectItem() { let lastItem = _.last(this.activeData.__slot__.options); this.activeData.__slot__.options.push({ - label: "", - value: lastItem ? lastItem.value + 1 : 1, + label: '', + value: lastItem ? lastItem.value === 0 ? _.max(_.values(this.activeData.__slot__.options.map(item => + item.value))) + 1 : lastItem.value + 1 : 1 }); }, async blukAddSelectItems() { From d971bac82009e62edfbef3a08b02484c5f37bcad Mon Sep 17 00:00:00 2001 From: Jimi Date: Wed, 7 Jul 2021 10:49:18 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E8=B7=B3=E8=BD=AC=E4=B8=8D=E6=AD=A3=E7=A1=AE?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/project/my/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/project/my/index.vue b/src/views/project/my/index.vue index d7ffddb..5997e39 100644 --- a/src/views/project/my/index.vue +++ b/src/views/project/my/index.vue @@ -280,7 +280,7 @@ export default { this.dataShowType = type }, toProjectHandle(key, type) { - this.$router.push({path: '/project/form', query: {key: key, active: type}}) + this.$router.push({path: `/project/form/${type}`, query: {key: key, active: type}}) }, deleteProject(key) { this.$api.post('/user/project/delete', {'key': key}).then(res => { From c597c94fc6bbde0b04a66ec231d8d0454a3650a5 Mon Sep 17 00:00:00 2001 From: wangqing Date: Thu, 8 Jul 2021 16:29:38 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=BA=A7=E8=81=94=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E9=83=A8=E5=88=86=E9=80=89=E9=A1=B9=E4=B8=8D=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/convert.js | 1 + src/views/form/editor/RightPanel.vue | 24 ++++++++++++------------ src/views/form/index.vue | 6 +++--- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/utils/convert.js b/src/utils/convert.js index 6a360d1..4973d88 100644 --- a/src/utils/convert.js +++ b/src/utils/convert.js @@ -136,6 +136,7 @@ const dataParams = { 'CASCADER': { 'options': 'options', 'filterable': 'filterable', + 'show-all-levels': 'showAllLevels', 'multiple': 'props.props.multiple' }, // 单选框组 diff --git a/src/views/form/editor/RightPanel.vue b/src/views/form/editor/RightPanel.vue index 0a8274b..df21fa4 100644 --- a/src/views/form/editor/RightPanel.vue +++ b/src/views/form/editor/RightPanel.vue @@ -933,12 +933,12 @@ > - - - + + + + + + - - - + + + + + + - + - + 预览 - + 保存为模板 From 186a3ff580f60a405afbc6799e96398e08a36225 Mon Sep 17 00:00:00 2001 From: zhongjm Date: Mon, 12 Jul 2021 09:53:02 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=A4=9A=E9=80=89?= =?UTF-8?q?=E6=A1=86=E7=BB=84=E6=98=BE=E7=A4=BA=E9=80=BB=E8=BE=91=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/expression.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/utils/expression.js b/src/utils/expression.js index 5b37f88..a6bd6a6 100644 --- a/src/utils/expression.js +++ b/src/utils/expression.js @@ -8,7 +8,8 @@ const expressionOperator = { if (!v1) { return false } - return v1 == v2 + // 当type=CHECK_BOX时此处应为包含关系 + return v1.includes(+v2) }, ne: function(v1, v2) { if (!v1) {