@steedos-widgets/sortable 3.6.0-beta.5 → 3.6.0-beta.7

package/dist/sortable.umd.js

@@ -22221,6 +22221,14 @@
             
         }
 
+        const treeConfig = {};
+
+        if(options.enable_tree){
+            treeConfig.expandConfig = {
+                expand: 'first'
+            };
+        }
+
         return {
             mode: "table",
             perPageAvailable: [5, 10, 20, 50, 100, 500],
@@ -22236,6 +22244,7 @@
             labelTpl: `\${${options.labelFieldName}}`,
             autoFillHeight: false, // 自动高度效果不理想,先关闭
             columnsTogglable: false,
+            ...treeConfig
         }
     }
 
@@ -22790,7 +22799,7 @@
     // crud && crud.setData({__changedFilterFormValues: {}});
     let __changedFilterFormValuesKey = "__changedFilterFormValues";
     if(isLookup && __lookupField){
-      let lookupTag = "__" + __lookupField.name + "__" + __lookupField.reference_to;
+      let lookupTag = "__lookup__" + __lookupField.name + "__" + __lookupField.reference_to;
       if(__lookupField.reference_to_field){
         lookupTag += "__" + __lookupField.reference_to_field;
       }
@@ -24289,7 +24298,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     let __lookupField = event.data.__lookupField;
     let __changedFilterFormValuesKey = "__changedFilterFormValues";
     if(isLookup && __lookupField){
-      let lookupTag = "__" + __lookupField.name + "__" + __lookupField.reference_to;
+      let lookupTag = "__lookup__" + __lookupField.name + "__" + __lookupField.reference_to;
       if(__lookupField.reference_to_field){
         lookupTag += "__" + __lookupField.reference_to_field;
       }
@@ -24601,13 +24610,13 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
       let onChangeScript = `
     let isLookup = event.data.isLookup;
     let __lookupField = event.data.__lookupField;
-    console.log("==onChangeScript=isLookup===", isLookup);
     const scope = event.context.scoped;
     // let filterFormValues = event.data;
     let filterForm = SteedosUI.getClosestAmisComponentByType(scope, "form");
     let filterFormService = SteedosUI.getClosestAmisComponentByType(filterForm.context, "service");
     // 使用event.data的话，并不能拿到本地存储中的过滤条件，所以需要从filterFormService中取。
     let filterFormValues = filterFormService.getData();
+    filterFormValues = JSON.parse(JSON.stringify(filterFormValues)); //只取当层数据域中数据，去除__super层数据
     let crud = SteedosUI.getClosestAmisComponentByType(scope, "crud");
     const changedFilterFormValues = _.pickBy(filterFormValues, function(n,k){return /^__searchable__/.test(k);});;
     // let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service");
@@ -24616,7 +24625,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     // crud && crud.setData({__changedFilterFormValues: changedFilterFormValues});
     let __changedFilterFormValuesKey = "__changedFilterFormValues";
     if(isLookup && __lookupField){
-      let lookupTag = "__" + __lookupField.name + "__" + __lookupField.reference_to;
+      let lookupTag = "__lookup__" + __lookupField.name + "__" + __lookupField.reference_to;
       if(__lookupField.reference_to_field){
         lookupTag += "__" + __lookupField.reference_to_field;
       }
@@ -25229,6 +25238,58 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     }
 
     function getLookupSapceUserTreeSchema(isMobile){
+        let apiAdaptor = `
+        // console.log("===getLookupSapceUserTreeSchema===", JSON.stringify(payload));
+        const records = payload.data.options;
+        let isTreeOptionsComputed = false;
+        if(records.length === 1 && records[0].children){
+            isTreeOptionsComputed = true;
+        }
+        if(isTreeOptionsComputed){
+            return payload;
+        }
+        const treeRecords = [];
+        const getChildren = (records, childrenIds) => {
+            if (!childrenIds) {
+                return;
+            }
+            const children = _.filter(records, (record) => {
+                return _.includes(childrenIds, record.value)
+            });
+            _.each(children, (item) => {
+                if (item.children) {
+                    item.children = getChildren(records, item.children)
+                }
+            })
+            return children;
+        }
+        
+        const getRoot = (records) => {
+            for (var i = 0; i < records.length; i++) {
+                records[i].noParent = 0;
+                if (!!records[i].parent) {
+                    biaozhi = 1
+                    for (var j = 0; j < records.length; j++) {
+                        if (records[i].parent == records[j].value)
+                            biaozhi = 0;
+                    }
+                    if (biaozhi == 1) records[i].noParent = 1;
+                } else records[i].noParent = 1;
+            }
+        }
+        getRoot(records);
+        console.log(records)
+        
+        _.each(records, (record) => {
+            if (record.noParent == 1) {
+                treeRecords.push(Object.assign({}, record, { children: getChildren(records, record.children) }));
+            }
+        });
+        console.log(treeRecords)
+        
+        payload.data.options = treeRecords;
+        return payload;
+    `;
         const treeSchema = {
             "type": "input-tree",
             "className":"steedos-select-user-tree",
@@ -25239,8 +25300,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
               "headers": {
                 "Authorization": "Bearer ${context.tenantId},${context.authToken}"
               },
-              "adaptor": "if (payload.data.treeCache == true) {\n                return payload;\n        }\n        const records = payload.data.options;\n        const treeRecords = [];\n        const getChildren = (records, childrenIds) => {\n                if (!childrenIds) {\n                        return;\n                }\n                const children = _.filter(records, (record) => {\n                        return _.includes(childrenIds, record.value)\n                });\n                _.each(children, (item) => {\n                        if (item.children) {\n                                item.children = getChildren(records, item.children)\n                        }\n                })\n                return children;\n        }\n\n        const getRoot = (records) => {\n                for (var i = 0; i < records.length; i++){\n                        records[i].noParent = 0;\n                        if (!!records[i].parent) {\n                                biaozhi = 1\n                                for (var j = 0; j < records.length; j++){\n                                        if (records[i].parent == records[j].value)\n                                                biaozhi = 0;\n                                }\n                                if (biaozhi == 1) records[i].noParent = 1;\n                        } else records[i].noParent = 1;\n                }\n        }\n        getRoot(records);\n        console.log(records)\n\n        _.each(records, (record) => {\n                if (record.noParent ==1) {\n                        treeRecords.push(Object.assign({}, record, { children: getChildren(records, record.children) }));\n                }\n        });\n        console.log(treeRecords)\n\n        payload.data.options = treeRecords;\n       payload.data.treeCache = true;\n       return payload;\n    ",
-              "requestAdaptor": "\n    ",
+              "adaptor": apiAdaptor,
               "data": {
                 "query": "{options:organizations(filters:[\"hidden\", \"!=\", true],sort:\"sort_no desc\"){value:_id label:name,parent,children}}"
               },
@@ -25444,7 +25504,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         let __changedFilterFormValuesKey = "__changedFilterFormValues";
         let __lookupField = api.data.$self.__lookupField;
         if(__lookupField){
-            let lookupTag = "__" + __lookupField.name + "__" + __lookupField.reference_to;
+            let lookupTag = "__lookup__" + __lookupField.name + "__" + __lookupField.reference_to;
             if(__lookupField.reference_to_field){
                 lookupTag += "__" + __lookupField.reference_to_field;
             }
@@ -25596,14 +25656,6 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             }
         });
         payload.data.rows = treeRecords;
-        try{
-            setTimeout(() => {
-                $('.amis-dialog-widget.antd-Modal .antd-Table-content .antd-Table-table thead .antd-Table-expandBtn')[0]?.click();
-            }, 600);
-        }
-        catch(ex){
-            console.error("tree数据格式展开异常：", ex);
-        }
     }
     return payload;
     `;
@@ -25630,6 +25682,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                 labelFieldName,
                 top:  top,
                 isLookup: true,
+                enable_tree: refObjectConfig.enable_tree,
                 ...ctx
             });
 
@@ -26041,10 +26094,11 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         let enableEnhancedLookup = lodash.exports.isBoolean(field.enable_enhanced_lookup) ? field.enable_enhanced_lookup : refObject.enable_enhanced_lookup;
         let amisVersion = getComparableAmisVersion();
         if(amisVersion >= 3.6){
-            // amis 3.6.3单选的树picker有严重bug（https://github.com/baidu/amis/issues/9279），先强制使用下拉方式显示
-            // amis 3.6.3多选的树会自动把下层节点，及下下层等所有子节点自动选中，跟amis 3.2不一样，而且目前没有开关，这不适合目前的业务场景，也先强制使用下拉方式显示
-            if(enableEnhancedLookup && refObject.enable_tree){
-                enableEnhancedLookup = false;
+            // amis 3.6.3单选和多选的树picker都有bug（https://github.com/baidu/amis/issues/9279，https://github.com/baidu/amis/issues/9295），我们改amis源码修正了
+            // amis 3.6.3多选的下拉树组件有bug，多选树字段的选中值在编辑模式展开树时不会自动勾选树里面的节点，而是始终勾选显示在最外面的选中值选项（即defaultValueOptions）,amis 3.2没有这个问题
+            // 这里强制禁用多选下拉树，统一改为弹出树，如果以后需要下拉树功能，可以把下拉树组件改为一次性加载所有树节点数据模式来跳过这个问题
+            if(!enableEnhancedLookup && refObject.enable_tree && field.multiple){
+                enableEnhancedLookup = true;
             }
         }
         // 默认使用下拉框模式显示lookup选项，只能配置了enable_enhanced_lookup才使用弹出增强模式

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-widgets/sortable",
-  "version": "3.6.0-beta.5",
+  "version": "3.6.0-beta.7",
   "main": "dist/sortable.cjs.js",
   "module": "dist/sortable.esm.js",
   "unpkg": "dist/sortable.umd.js",
@@ -45,7 +45,7 @@
   "dependencies": {
     "@dnd-kit/core": "^6.0.5",
     "@dnd-kit/sortable": "^7.0.1",
-    "@steedos-widgets/amis-lib": "3.6.0-beta.5"
+    "@steedos-widgets/amis-lib": "3.6.0-beta.7"
   },
-  "gitHead": "7babba3c01fe0aa4410cdc834c862774d4c59824"
+  "gitHead": "9787e8edaf6e30ac08651eddcf0ca1b99f341a37"
 }