vue2-client 1.8.184 → 1.8.186

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.184",
+  "version": "1.8.186",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

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

@@ -456,10 +456,10 @@ export default {
         this.getData({}, res => this.getDataCallback(res))
       } if (this.attr.keyName && this.attr.keyName.indexOf('search@') !== -1) {
         // `tool.getFullTree(this.getRights().where(row.getType()==$organization$))`
-        this.getDataCallback(searchToOption({
-          source: this.attr.keyName.substring(6),
+        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/base-client/components/common/XTable/XTable.vue

@@ -319,7 +319,7 @@ export default {
         }
       }
       if (!this.isTableTemp) {
-        result = query(Object.assign(requestParameters, { userId: this.currUser.id }), this.serviceName, this.env === 'dev')
+        result = query(Object.assign(requestParameters, { userId: this.currUser?.id }), this.serviceName, this.env === 'dev')
       }
       this.clearRowKeys()
       this.$emit('afterQuery', result, requestParameters.conditionParams)

package/src/services/v3Api.js

@@ -1,13 +1,8 @@
 import { METHOD, request } from '@vue2-client/utils/request'
 
-export async function searchToOption (params) {
+export async function searchToOption (params, callback) {
   return search(params).then(res => {
-    return res.data.map(item => {
-      return {
-        label: item.name,
-        value: item.id
-      }
-    })
+    callback(transformData(res[0]?.children[0]?.children || []))
   })
 }
 
@@ -15,4 +10,15 @@ export async function search (params) {
   return request('/rs/search', METHOD.POST, params)
 }
 
+function transformData (inputData) {
+  function transform (node) {
+    return {
+      label: node.name,
+      value: node.id,
+      children: node.children ? node.children.map(transform) : []
+    }
+  }
+  return inputData.map(transform)
+}
+
 export default { searchToOption, search }