vue2-client 1.4.60 → 1.4.62

package/CHANGELOG.md

@@ -1,8 +1,11 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
-**1.4.60 -2022-11-29 @苗艳强**
+**1.4.60 - 1.4.61 -2022-11-29 @苗艳强**
 - 新增树形选择框
+- 修复查询方式默认选择问题
+- 修复固定集合编辑错误问题
+- 树形选择框支持模糊查询
 
 **1.4.58 - 1.4.59 -2022-11-29 @江超**
 - 修复一些小问题

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.4.60",
+  "version": "1.4.62",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/base-client/components/common/CreateQuery/CreateQuery.vue

@@ -358,7 +358,7 @@ export default {
             columnItem.lazyLoad = 'false'
           }
           // 下拉框数据源兼容处理
-          if ((columnItem.formType === 'select' || columnItem.formType === 'cascader') && columnItem.selectKey) {
+          if ((columnItem.formType === 'select' || columnItem.formType === 'cascader' || columnItem.formType === 'treeSelect') && columnItem.selectKey) {
             // 数据源为logic
             if (columnItem.selectKey.toString().startsWith('logic@')) {
               columnItem.selectType = 'logic'

package/src/base-client/components/common/CreateQuery/CreateQueryItem.vue

@@ -678,8 +678,8 @@ export default {
         if (['FilesId', 'Images'].includes(this.item.key)) { this.item.key = '' }
         this.resetDataMode()
         // 表单查询方式有预选项时
-        if (this.queryTypeV.length === 1) {
-          this.item.queryType = this.queryTypeV[0].value
+        if (this.queryTypeV.length) {
+          this.item.queryType = this.queryTypeV[0].key
         }
       }
     },
@@ -716,6 +716,10 @@ export default {
       if (!this.selectDataShow) {
         this.delKey(this.item, 'selectType', 'selectKey', 'lazyLoad', 'selectKeyName')
       }
+      // 删除空的关联外键字段
+      if (!this.item.selectKeyName) {
+        delete this.item.selectKeyName
+      }
       // 默认插槽就先删除
       if (this.item.slot && (this.item.slot.type === 'default' || !this.item.slot.type)) { delete this.item.slot }
       // 根据数据模式处理数据

package/src/base-client/components/common/XForm/XFormItem.vue

@@ -313,15 +313,17 @@
     :xxl="xxl">
     <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.model">
       <a-tree-select
-        v-model="form[attr.model]"
+        v-model="treeSelectValue"
         :disabled="disabled"
         :tree-data="getTreeData()"
-        :tree-checkable="mode === '查询'"
+        :tree-checkable="mode === '查询' && attr.queryType !== 'RIGHT_LIKE'"
         :placeholder="'请选择' + attr.name"
         :dropdown-style="{ maxHeight: '400px' }"
         tree-node-filter-prop="label"
+        :show-checked-strategy="attr.queryType === 'RIGHT_LIKE' ? 'SHOW_ALL' : undefined"
         allow-clear
-        class="tree-select">
+        class="tree-select"
+        @change="onTreeSelectChange">
       </a-tree-select>
     </a-form-model-item>
   </x-form-col>
@@ -360,7 +362,9 @@ export default {
       searchResult: '',
       yearShowOne: false,
       // moment
-      moment
+      moment,
+      // 树形选择框选中值
+      treeSelectValue: undefined
     }
   },
   props: {
@@ -504,6 +508,20 @@ export default {
           this.setParentSelectable(item.children)
         }
       })
+    },
+    // 选中树节点
+    onTreeSelectChange (value, label, extra) {
+      if (this.attr.queryType === 'RIGHT_LIKE') {
+        // 获取可用于模糊查询的组织机构字符串
+        let node = extra.triggerNode.$parent
+        while (node && node.label) {
+          label = node.label + '.' + label
+          node = node.$parent
+        }
+        this.form[this.attr.model] = label
+      } else {
+        this.form[this.attr.model] = value
+      }
     }
   }
 }

package/src/config/CreateQueryConfig.js

@@ -207,7 +207,7 @@ module.exports = {
     {
       label: '右模糊[right like]',
       key: 'RIGHT_LIKE',
-      match: ['input']
+      match: ['input', 'treeSelect']
     },
     {
       label: '大于[>]',