@steedos-widgets/sortable 3.6.0-beta.4 → 3.6.0-beta.6

package/dist/sortable.umd.js

@@ -20421,7 +20421,7 @@
         if(ctx && ctx.isLookup){
             linkTarget = "target='_blank'";
         }
-        return `<a href="${href}" ${linkTarget}>\${${field.name}}</a>`
+        return `<a href="${href}" ${linkTarget}>\${${field.name} | raw}</a>`
     }
 
     function getRelatedFieldTpl(field, ctx){
@@ -20746,7 +20746,7 @@
      * @Author: baozhoutao@steedos.com
      * @Date: 2022-10-28 14:15:09
      * @LastEditors: liaodaxue
-     * @LastEditTime: 2023-10-30 17:51:54
+     * @LastEditTime: 2023-12-29 10:46:50
      * @Description: 
      */
 
@@ -20800,7 +20800,8 @@
                 dataType: "form-data",
                 url: `\${context.rootUrl}/s3/${tableName}`,
                 requestAdaptor: `
-                const { _master, global,context } = api.body;
+                const superData = (typeof context != 'undefined') ? context : api.body; 
+                const { _master, global } = superData;
                 // const { recordId, objectName } = _master;
                 const { spaceId, userId, user } = global;
                 /*
@@ -20818,8 +20819,9 @@
                 return api;
             `,
                 adaptor: `
-                const { context } = api.body; 
-                var rootUrl = context.rootUrl + "/api/files/${tableName}/";
+                const superData = (typeof context != 'undefined') ? context : api.body; 
+                const { context:pageContext } = superData; 
+                var rootUrl = pageContext.rootUrl + "/api/files/${tableName}/";
                 payload = {
                     status: response.status == 200 ? 0 : response.status,
                     msg: response.statusText,
@@ -21423,8 +21425,9 @@
                     case "avatar":
                     case "image":
                         quickEditSchema.body[0].receiver.adaptor = `
-                        const { context } = api.body; 
-                        var rootUrl = context.rootUrl + "/api/files/${field.type}s/";
+                        const superData = (typeof context != 'undefined') ? context : api.body; 
+                        const { context:pageContext } = superData; 
+                        var rootUrl = pageContext.rootUrl + "/api/files/${field.type}s/";
                         payload = {
                             status: response.status == 200 ? 0 : response.status,
                             msg: response.statusText,
@@ -22087,7 +22090,7 @@
                 type: 'steedos-object-button',
                 name: button.name,
                 objectName: button.objectName,
-                visibleOn: getButtonVisibleOn$1(button),
+                visibleOnAlias: getButtonVisibleOn$1(button),
                 className: 'antd-Button--default'
             });
         });
@@ -22212,7 +22215,8 @@
             }
 
             if(!isLookup && !hiddenColumnOperation){
-                columns.push(await getTableOperation(options));
+                const toolbarOperation = await getTableOperation(options);
+                columns.push(toolbarOperation);
             }
             
         }
@@ -22734,6 +22738,8 @@
   `;
       const onCancelScript = `
     // console.log("===onCancelScript=form==");
+    let isLookup = event.data.isLookup;
+    let __lookupField = event.data.__lookupField;
     const scope = event.context.scoped;
     var filterForm = scope.parent.parent.getComponents().find(function(n){
       return n.props.type === "form";
@@ -22781,7 +22787,20 @@
     // });
 
     // 清除__changedFilterFormValues中的值
-    crud && crud.setData({__changedFilterFormValues: {}});
+    // crud && crud.setData({__changedFilterFormValues: {}});
+    let __changedFilterFormValuesKey = "__changedFilterFormValues";
+    if(isLookup && __lookupField){
+      let lookupTag = "__lookup__" + __lookupField.name + "__" + __lookupField.reference_to;
+      if(__lookupField.reference_to_field){
+        lookupTag += "__" + __lookupField.reference_to_field;
+      }
+      __changedFilterFormValuesKey += lookupTag;
+    }
+    if(crud){
+      let crudData = crud.getData();
+      crudData[__changedFilterFormValuesKey] = {};
+      crud.setData(crudData);
+    }
     filterForm.handleFormSubmit(event);
     // crud.handleFilterSubmit(removedValues);
 
@@ -24248,7 +24267,12 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     __changedSearchBoxValues["${keywordsSearchBoxName}"] = event.data["${keywordsSearchBoxName}"];
     // crudService && crudService.setData({__changedSearchBoxValues: __changedSearchBoxValues});
     // 这里不用crudService而用crud是因为lookup字段弹出的列表中的crudService中的变量无法传入crud的发送适配器中
-    crud && crud.setData({__changedSearchBoxValues: __changedSearchBoxValues});
+    // crud && crud.setData({__changedSearchBoxValues: __changedSearchBoxValues});
+    if(crud){
+      let crudData = crud.getData();
+      crudData.__changedSearchBoxValues = __changedSearchBoxValues;
+      crud.setData(crudData);
+    }
   `;
 
       // onSearchScript中加上了onChangeScript中的脚本，是因为amis 3.2不能用change事件执行onChangeScript
@@ -24261,9 +24285,19 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     // const scope = event.context.scoped;
     // 如果点击过顶部搜索栏表单的取消按钮，会把此处event.data.__super.__super.__super中的搜索表单项的所有字段设置为null
     // 点击取消按钮后继续在表单项中输入过滤条件且最后没有点击回车按键或点击表单项搜索按钮的话，在快速搜索中点击回车按钮提交搜索会所顶部搜索表单中的字段值清空
+    let isLookup = event.data.isLookup;
+    let __lookupField = event.data.__lookupField;
+    let __changedFilterFormValuesKey = "__changedFilterFormValues";
+    if(isLookup && __lookupField){
+      let lookupTag = "__lookup__" + __lookupField.name + "__" + __lookupField.reference_to;
+      if(__lookupField.reference_to_field){
+        lookupTag += "__" + __lookupField.reference_to_field;
+      }
+      __changedFilterFormValuesKey += lookupTag;
+    }
     let filterForm = SteedosUI.getClosestAmisComponentByType(scope, "form");
     setTimeout(function(){
-      filterForm.setValues(event.data.__changedFilterFormValues);
+      filterForm.setValues(event.data[__changedFilterFormValuesKey]);
     }, 500);
   `;
 
@@ -24284,8 +24318,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             "name": keywordsSearchBoxName,
             "placeholder": "搜索此列表",
             "value": crudKeywords,
-            "clearable": true,
-            // "clearAndSubmit": true,//因为清除并不会触发失去焦点事件，只有禁用，但是它会触发change事件，所以等升级到amis 3.4+后可以重新放开
+            // "clearable": true,//因为清除并不会触发失去焦点事件，只有禁用，但是它会触发change事件，所以等升级到amis 3.4+后可以重新放开
+            "clearAndSubmit": true,
             "searchImediately": false,
             "onEvent": {
               "search": {
@@ -24565,18 +24599,34 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     crudService && crudService.setData({isFieldsFilterEmpty});
   `;
       let onChangeScript = `
+    let isLookup = event.data.isLookup;
+    let __lookupField = event.data.__lookupField;
     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");
     // crudService && crudService.setData({__changedFilterFormValues: changedFilterFormValues});
     // 这里不用crudService而用crud是因为lookup字段弹出的列表中的crudService中的变量无法传入crud的发送适配器中
-    crud && crud.setData({__changedFilterFormValues: changedFilterFormValues});
+    // crud && crud.setData({__changedFilterFormValues: changedFilterFormValues});
+    let __changedFilterFormValuesKey = "__changedFilterFormValues";
+    if(isLookup && __lookupField){
+      let lookupTag = "__lookup__" + __lookupField.name + "__" + __lookupField.reference_to;
+      if(__lookupField.reference_to_field){
+        lookupTag += "__" + __lookupField.reference_to_field;
+      }
+      __changedFilterFormValuesKey += lookupTag;
+    }
+    if(crud){
+      let crudData = crud.getData();
+      crudData[__changedFilterFormValuesKey] = changedFilterFormValues;
+      crud.setData(crudData);
+    }
   `;
       return {
         "title": "",
@@ -25179,6 +25229,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",
@@ -25189,8 +25291,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}}"
               },
@@ -25391,13 +25492,24 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         let keywordsSearchBoxName = `__keywords_lookup__${field.name.replace(/\./g, "_")}__to__${refObjectConfig.name}`;
 
         source.requestAdaptor = `
-        let __changedFilterFormValues = api.data.$self.__changedFilterFormValues || {};
+        let __changedFilterFormValuesKey = "__changedFilterFormValues";
+        let __lookupField = api.data.$self.__lookupField;
+        if(__lookupField){
+            let lookupTag = "__lookup__" + __lookupField.name + "__" + __lookupField.reference_to;
+            if(__lookupField.reference_to_field){
+                lookupTag += "__" + __lookupField.reference_to_field;
+            }
+            __changedFilterFormValuesKey += lookupTag;
+        }
+        let __changedFilterFormValues = api.data.$self[__changedFilterFormValuesKey] || {};
         let __changedSearchBoxValues = api.data.$self.__changedSearchBoxValues || {};
         // 把表单搜索和快速搜索中的change事件中记录的过滤条件也拼到$self中，是为解决触发搜索请求时，两边输入的过滤条件都带上，即：
         // 有时在搜索表单中输入过滤条件事，忘记点击回车键或搜索按钮，而是进一步修改快速搜索框中的关键字点击其中回车键触发搜索
         // 这种情况下，触发的搜索请求中没有带上搜索表单中输入的过滤条件。
         // 反过来先在快速搜索框中输入过滤条件却不点击其中回车键触发搜索，而是到搜索表单中触发搜索请求也是一样的。
-        Object.assign(api.data.$self, __changedSearchBoxValues, __changedFilterFormValues);
+        if(api.data.$self.op !== 'loadOptions'){
+            Object.assign(api.data.$self, __changedSearchBoxValues, __changedFilterFormValues);
+        }
         const selfData = JSON.parse(JSON.stringify(api.data.$self));
         var filters = [];
         var pageSize = api.data.pageSize || 10;
@@ -25604,7 +25716,12 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                 "objectName": refObjectConfig.name,
                 "uiSchema": refObjectConfig,
                 "listName": listName,// 需要按视图取可搜索项
-                "isLookup": true
+                "isLookup": true,
+                "__lookupField": {
+                    "name": field.name,
+                    "reference_to": refObjectConfig.name,
+                    "reference_to_field": field.reference_to_field
+                }
             });
 
             if(!pickerSchema.onEvent){
@@ -25973,6 +26090,15 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
 
         // 优先取字段中配置的enable_enhanced_lookup，字段上没配置时，才从对象上取enable_enhanced_lookup属性
         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，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才使用弹出增强模式
         if(enableEnhancedLookup == true){
             return await lookupToAmisPicker(field, readonly, ctx);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-widgets/sortable",
-  "version": "3.6.0-beta.4",
+  "version": "3.6.0-beta.6",
   "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.4"
+    "@steedos-widgets/amis-lib": "3.6.0-beta.6"
   },
-  "gitHead": "208ec610433e82578eeb30b5f397a0bfe9284b77"
+  "gitHead": "11c3240e1faf4d5ae87634df9b6777268bd08c6f"
 }