doway-coms 1.9.4 → 1.9.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "1.9.4",
+  "version": "1.9.6",
   "description": "doway组件库",
   "author": "dowaysoft",
   "main": "packages/index.js",

package/packages/BaseForm/src/index.vue

@@ -297,6 +297,7 @@
         :showSearch="col.showSearch"
         :allowClear="col.allowClear"
         :placeholder="col.placeholder"
+        :linkedTitle="col.linkedTitle"
         :method="col.method"
         v-model="row[col.field]"
         @change="

package/packages/BaseTreeSelect/src/index.vue

@@ -34,6 +34,7 @@
           :replaceFields="replaceFields"
           :dropdownMatchSelectWidth="dropdownMatchSelectWidth"
           :treeDefaultExpandAll="treeDefaultExpandAll"
+          @change="changeData"
           :size="size"
           :allowClear="allowClear"
           @focus="searchData"
@@ -65,6 +66,7 @@
 <script>
 import { Tooltip, TreeSelect } from 'ant-design-vue'
 import request from '../../utils/request'
+import XEUtils from 'xe-utils'
 import { ValidationProvider } from 'vee-validate'
 export default {
   name: 'BaseTreeSelect',
@@ -235,6 +237,12 @@ export default {
       type: String,
       required: true,
     },
+    linkedTitle: {
+      type: [],
+      default: function () {
+        return []
+      },
+    },
     method: {
       type: String,
       default: function () {
@@ -251,7 +259,21 @@ export default {
   },
   mounted() {
     // this.searchData()
-    this.currentValue = this.row[this.linkedField]
+
+    if (this.treeData.length) {
+      this.currentValue = this.row[this.linkedField]
+    } else {
+      this.currentValue = this.value
+    }
+  },
+  watch: {
+    treeData(val) {
+      if (this.treeData.length) {
+        this.currentValue = this.row[this.linkedField]
+      } else {
+        this.currentValue = this.value
+      }
+    },
   },
   computed: {},
   methods: {
@@ -259,6 +281,7 @@ export default {
      * 查询数据
      */
     searchData() {
+      console.log(this.$refs.treeSelectView)
       let tempExp = {
         operator: 'or',
         expressions: [],
@@ -292,6 +315,15 @@ export default {
       })
         .then((responseData) => {
           vm.treeData = responseData.content
+          if (this.linkedTitle.length) {
+            XEUtils.eachTree(vm.treeData, (item) => {
+              let title = ''
+              XEUtils.arrayEach(this.linkedTitle, (newTitle) => {
+                title = title + item[newTitle] + '-'
+              })
+              item[this.replaceFields.title] = title.slice(0, -1)
+            })
+          }
         })
         .catch((error) => {
           console.error(error)
@@ -327,6 +359,12 @@ export default {
       this.$set(this.row, this.linkedField, value)
       this.$set(this.row, this.field, node.title)
     },
+    changeData(value) {
+      if (!value) {
+        this.$set(this.row, this.linkedField, '')
+        this.$set(this.row, this.field, '')
+      }
+    },
   },
 }
 </script>