Merge branch 'master' of https://gitee.com/TDuckApp/tduck-front into master-v2

src/utils/convert.js

@@ -136,6 +136,7 @@ const dataParams = {
     'CASCADER': {
         'options': 'options',
         'filterable': 'filterable',
+        'show-all-levels': 'showAllLevels',
         'multiple': 'props.props.multiple'
     },
     // 单选框组

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) {

src/views/form/editor/RightPanel.vue

@@ -933,12 +933,12 @@
           >
             <el-switch v-model="activeData['step-strictly']" />
           </el-form-item>
-          <el-form-item
+<!--          <el-form-item-->
-            v-if="activeData.__config__.tag === 'el-cascader'"
+<!--            v-if="activeData.__config__.tag === 'el-cascader'"-->
-            label="任选层级"
+<!--            label="任选层级"-->
-          >
+<!--          >-->
-            <el-switch v-model="activeData.props.props.checkStrictly" />
+<!--            <el-switch v-model="activeData.props.props.checkStrictly" />-->
-          </el-form-item>
+<!--          </el-form-item>-->
           <el-form-item
             v-if="activeData.__config__.tag === 'el-cascader'"
             label="是否多选"
@@ -990,12 +990,12 @@
           >
             <el-switch v-model="activeData.readonly" />
           </el-form-item>
-          <el-form-item
+<!--          <el-form-item-->
-            v-if="activeData.disabled !== undefined"
+<!--            v-if="activeData.disabled !== undefined"-->
-            label="是否禁用"
+<!--            label="是否禁用"-->
-          >
+<!--          >-->
-            <el-switch v-model="activeData.disabled" />
+<!--            <el-switch v-model="activeData.disabled" />-->
-          </el-form-item>
+<!--          </el-form-item>-->
           <el-form-item
             v-if="activeData.__config__.tag === 'el-select'"
             label="能否搜索"

src/views/form/index.vue

@@ -5,15 +5,15 @@
                 <el-col :span="2">
                     <i class="el-icon-back" @click="$router.back(-1)" />
                 </el-col>
-                <el-col :span="3">
+                <el-col :span="3" :md="6">
                     <img class="header-logo" src="@/assets/images/indexLogo.svg" @click="$router.push({path:'/home'})">
                 </el-col>
-                <el-col :span="1">
+                <el-col :span="1" :md="3">
                     <el-button type="primary" icon="el-icon-view" @click="previewDialogVisible=true">
                         预览
                     </el-button>
                 </el-col>
-                <el-col :span="2">
+                <el-col :span="2" :md="3">
                     <el-button type="success" icon="el-icon-folder-add" @click="saveProjectAsTemplateHandle">
                         保存为模板
                     </el-button>

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 => {