vue2-client 1.8.176 → 1.8.179

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.176",
+  "version": "1.8.179",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
@@ -38,6 +38,7 @@
     "jspdf": "^2.5.1",
     "lodash.clonedeep": "^4.5.0",
     "lodash.get": "^4.4.2",
+    "lodash.debounce": "^4",
     "mockjs": "^1.1.0",
     "nprogress": "^0.2.0",
     "qs": "^6.11.2",

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

@@ -67,6 +67,9 @@ const viewArr = [
   }, {
     key: '街道',
     value: 'streetData',
+  }, {
+    key: '小区',
+    value: 'communityData',
   }
 ]
 export default {
@@ -82,6 +85,8 @@ export default {
         areaData: [],
         // 街道
         streetData: [],
+        // 小区
+        communityData: [],
       },
       // model: {
       //   provinceModel: { name: '', code: '' },
@@ -93,6 +98,7 @@ export default {
         { name: '', code: '' },
         { name: '', code: '' },
         { name: '', code: '' },
+        { name: '', code: '' },
         { name: '', code: '' }
       ],
       // 控制标签
@@ -111,7 +117,7 @@ export default {
           this.setValue(this.value, res)
         }
       } else {
-        runLogic('getOperatingAreas', 'af-revenue').then(res => {
+        runLogic('getOperatingAreas', {}, 'af-revenue').then(res => {
           this.tagData.divisionsForTree = handleTree(res, 'code', 'parentcode')
           if (this.value) {
             this.setValue(this.value, res)
@@ -128,7 +134,7 @@ export default {
     ...mapState('account', { currUser: 'user' })
   },
   props: {
-    // 页面渲染内容  默认 省市区街道 四个 所以是4
+    // 页面渲染内容  默认 省市区街道 四个 所以是4  5 是到小区
     contexts: {
       type: Number,
       default: 4
@@ -201,6 +207,7 @@ export default {
           { name: '', code: '' },
           { name: '', code: '' },
           { name: '', code: '' },
+          { name: '', code: '' },
           { name: '', code: '' }
         ]
         this.getResultText(this.contexts)
@@ -293,10 +300,22 @@ export default {
         this.getResultText(3)
       } else if (e === '街道') {
         if (this.model[3].name !== item.name) {
+          this.tagData.communityData = item.children
           this.model[3].name = item.name
           this.model[3].code = item.code
+
+          this.model[4] = { name: '', code: '' }
+        }
+        if (this.contexts !== 4) {
+          this.activeKey = '小区'
         }
         this.getResultText(4)
+      } else if (e === '小区') {
+        if (this.model[4].name !== item.name) {
+          this.model[4].name = item.name
+          this.model[4].code = item.code
+        }
+        this.getResultText(5)
       }
     },
     getResultText (tag) {
@@ -317,6 +336,7 @@ export default {
     },
     // 失去焦点回调
     selectBlurHandle () {
+      console.log(this.model[this.contexts - 1])
       if (!this.model[this.contexts - 1].code || this.model[this.contexts - 1].code === '') {
         this.valueView = undefined
       }

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

@@ -3,12 +3,17 @@ import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
 import { computed, reactive, ref, watch, defineExpose } from 'vue'
 import executeStrFunction from '@vue2-client/utils/runEvalFunction'
 import store from '@vue2-client/store/modules/account'
+import debounce from 'lodash.debounce'
 
 const config = reactive({})
+// 是否加载中
+const spinning = ref(false)
 // 选中的 key
 const checkedKeys = ref([])
 // 定义 tree 数据
 const _treeData = ref([])
+// 存储搜索结果的树数据
+const filteredTreeData = ref([])
 // 定义最深一层的 数据
 const deepestNodes = ref([])
 // 替换字段
@@ -82,15 +87,17 @@ function onSelect (keys, e) {
   emit('onSelect', keys, e)
 }
 
-function getData (param = {}) {
+async function getData (param = {}) {
+  spinning.value = true
   searchInfo.value = Object.assign(param, {
     org_id: currentUser.value.orgid,
     user_id: currentUser.value.id,
     dep_id: currentUser.value.f_department_id
   })
-  runLogic(config.treeData.substring(6), searchInfo.value, config.serviceName, props.env === 'dev').then(res => {
+  await runLogic(config.treeData.substring(6), searchInfo.value, config.serviceName, props.env === 'dev').then(res => {
     _treeData.value = res
     deepestNodes.value = getDeepestNodes(_treeData.value)
+    spinning.value = false
   }).catch(e => {
     console.error('获取数据失败：' + e)
   })
@@ -100,8 +107,36 @@ function reLoad () {
   getData(searchInfo.value)
 }
 
-function onChange () {
-  console.log('onChange')
+const debouncedSearch = debounce((value) => {
+  console.log('Search:', value)
+  // 在这里执行你的搜索逻辑
+  if (value) {
+    filteredTreeData.value = searchInTree(_treeData.value, value)
+  } else {
+    filteredTreeData.value = []
+  }
+}, 233)
+
+function onChange (e) {
+  const searchInput = e.target.value
+  debouncedSearch(searchInput)
+}
+
+function searchInTree (tree, keyword) {
+  return tree.reduce((acc, node) => {
+    if (node[_replaceFields.title].includes(keyword)) {
+      acc.push(node)
+    } else if (node[_replaceFields.children]) {
+      const childResults = searchInTree(node[_replaceFields.children], keyword)
+      if (childResults.length > 0) {
+        acc.push({
+          ...node,
+          children: childResults
+        })
+      }
+    }
+    return acc
+  }, [])
 }
 
 function action (record, func) {
@@ -149,33 +184,35 @@ defineExpose({
       :style="{
         maxHeight:config.search?'calc(100vh - 200px - 5rem)':'calc(100vh - 200px - 3rem)'
       }">
-      <a-tree
-        v-model="checkedKeys"
-        :tree-data="_treeData"
-        :checkable="config.checkable"
-        :blockNode="true"
-        :replaceFields="_replaceFields"
-        :default-selected-keys="_treeData && _treeData.length > 0 ? [_treeData[0][_replaceFields.key]] : null"
-        :default-expand-all="true"
-        @select="onSelect"
-      >
-        <template slot="title" slot-scope="item">
-          <span>{{
-            item.dataRef[replaceFields.children] && item.dataRef[replaceFields.children].length > 0?
-              item[_replaceFields.title]
-              : config.deepNodeMaxWidth && item[_replaceFields.title].length > config.deepNodeMaxWidth ? item[_replaceFields.title].substring(0, config.deepNodeMaxWidth) + '...' : item[_replaceFields.title]
-          }}</span>
-          <a-space style="float:right;margin-right: .2rem">
-            <a-icon
-              v-for="icon in config.btn"
-              @click="action(item, icon.func)"
-              :key="icon.func"
-              v-if="executeStrFunction( icon.customFunction,[item])"
-              :type="icon.icon"
-              :style="{color:icon.color}"></a-icon>
-          </a-space>
-        </template>
-      </a-tree>
+      <a-spin :spinning="spinning">
+        <a-tree
+          v-model="checkedKeys"
+          :tree-data="filteredTreeData && filteredTreeData.length> 0?filteredTreeData: _treeData"
+          :checkable="config.checkable"
+          :blockNode="true"
+          :replaceFields="_replaceFields"
+          :default-selected-keys="_treeData && _treeData.length > 0 ? [_treeData[0][_replaceFields.key]] : null"
+          :default-expand-all="true"
+          @select="onSelect"
+        >
+          <template slot="title" slot-scope="item">
+            <span>{{
+              item.dataRef[replaceFields.children] && item.dataRef[replaceFields.children].length > 0 ?
+                item[_replaceFields.title]
+                : config.deepNodeMaxWidth && item[_replaceFields.title].length > config.deepNodeMaxWidth ? item[_replaceFields.title].substring(0, config.deepNodeMaxWidth) + '...' : item[_replaceFields.title]
+            }}</span>
+            <a-space style="float:right;margin-right: .2rem">
+              <a-icon
+                v-for="icon in config.btn"
+                @click="action(item, icon.func)"
+                :key="icon.func"
+                v-if="executeStrFunction( icon.customFunction,[item])"
+                :type="icon.icon"
+                :style="{color:icon.color}"></a-icon>
+            </a-space>
+          </template>
+        </a-tree>
+      </a-spin>
     </div>
   </div>
 </template>