vue2-client 1.8.274 → 1.8.276

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.274",
+  "version": "1.8.276",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
@@ -40,6 +40,7 @@
     "lodash.debounce": "^4",
     "mockjs": "^1.1.0",
     "nprogress": "^0.2.0",
+    "qs": "^6.11.2",
     "regenerator-runtime": "^0.14.0",
     "videojs-contrib-hls": "^5.15.0",
     "viser-vue": "^2.4.8",

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

@@ -459,7 +459,7 @@ import moment from 'moment'
 import util from '.././../../../utils/util'
 import XTreeSelect from '@vue2-client/base-client/components/common/XForm/XTreeSelect'
 import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
-import { searchToOption } from '@vue2-client/services/v3Api'
+import { searchToListOption, searchToOption } from '@vue2-client/services/v3Api'
 import { mapState } from 'vuex'
 import executeStrFunction from '@vue2-client/utils/runEvalFunction'
 
@@ -721,10 +721,18 @@ export default {
       }
       if (this.attr.keyName && this.attr.keyName.indexOf('search@') !== -1) {
         // `tool.getFullTree(this.getRights().where(row.getType()==$organization$))`
-        searchToOption({
-          source: this.attr.keyName.substring(7),
-          userid: this.currUser.id
-        }, res => this.getDataCallback(res))
+        if (this.attr.type === 'select' || this.attr.type === 'checkbox') {
+          // 仅获取最内层数据
+          searchToListOption({
+            source: this.attr.keyName.substring(7),
+            userid: this.currUser.id
+          }, res => this.getDataCallback(res))
+        } else {
+          searchToOption({
+            source: this.attr.keyName.substring(7),
+            userid: this.currUser.id
+          }, res => this.getDataCallback(res))
+        }
       } else if (this.attr.keyName && this.attr.keyName.indexOf('config@') !== -1) {
         const configName = this.attr.keyName.substring(7)
         getConfigByName(configName, this.serviceName, res => {

package/src/services/v3Api.js

@@ -20,6 +20,25 @@ export async function searchToOption (params, callback) {
   })
 }
 
+export async function searchToListOption (params, callback) {
+  return search(params).then(res => {
+    const leafNodes = getLeafNodes(res)
+    callback(transformData(leafNodes))
+  })
+}
+
+function getLeafNodes (nodes) {
+  let leaves = []
+  nodes.forEach(node => {
+    if (node.children && node.children.length) {
+      leaves = leaves.concat(getLeafNodes(node.children))
+    } else {
+      leaves.push(node)
+    }
+  })
+  return leaves
+}
+
 export async function search (params) {
   return request('/rs/search', METHOD.POST, params)
 }