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/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) { 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 @@ > - - - + + + + + + - - - + + + + + + - + - + 预览 - + 保存为模板 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 => {