@steedos-widgets/sortable 1.3.22-beta.3 → 3.6.0-beta.10

package/dist/sortable.esm.js

@@ -53975,8 +53975,8 @@ const Router = {
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-20 16:29:22
- * @LastEditors: liaodaxue
- * @LastEditTime: 2023-09-11 17:19:53
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2023-12-28 14:59:08
  * @Description: 
  */
 
@@ -54033,6 +54033,21 @@ function getLookupListView(refObjectConfig) {
   return listView;
 }
 
+
+/**
+ * 获取可比较的amis版本号
+ * @returns 只返回前两位版本，第三位忽略，比如3.6.3返回3.6
+ */
+function getComparableAmisVersion() {
+  let amis = (window.amisRequire && window.amisRequire('amis')) || window.Amis;
+  let amisVersion = amis && amis.version;
+  if(amisVersion){
+      let comparableVersions = amisVersion.split(".");
+      let comparableVersion = parseFloat(comparableVersions[0].toString() + "." + comparableVersions[1].toString());
+      return comparableVersion;
+  }
+}
+
 function getNumberTpl(field){
     return `<span>\${_display.${field.name}}</span>`
 }
@@ -54101,7 +54116,7 @@ function getNameTpl(field, ctx){
     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){
@@ -54426,7 +54441,7 @@ function getAmisStaticFieldType(type, readonly, options){
  * @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: 
  */
 
@@ -54480,7 +54495,8 @@ const getAmisFileEditSchema = (steedosField)=>{
             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;
                 /*
@@ -54498,8 +54514,9 @@ const getAmisFileEditSchema = (steedosField)=>{
                 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,
@@ -54965,7 +54982,6 @@ async function getQuickEditSchema(field, options){
                         {
                             "actionType": "custom",
                             "script": `
-
                                     var _display = _.cloneDeep(event.data._display);
                                     ${displayField}
                                     doAction({actionType: 'setValue', "args": {"value": {_display}},componentId: "${quickEditId}"});
@@ -55103,8 +55119,9 @@ async function getQuickEditSchema(field, options){
                 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,
@@ -55135,9 +55152,26 @@ async function getQuickEditSchema(field, options){
                 "onEvent":{
                     "init":{
                         "actions":[
+                            //amis3.6无法从数据域中直接拿到正确的selectitems，需要通过crud组件的getSelected()函数获取
+                            {
+                                "actionType": "custom",
+                                "script": `
+                                    crudScoped = event.context.scoped.getComponentById('${options.crudId}');
+                                    const selectedItems = crudScoped && crudScoped.control.getSelected();
+                                    doAction({
+                                        "componentId": "${quickEditId}",
+                                        "actionType": "setValue",
+                                        "args": {
+                                            "value": {
+                                                selectedItems
+                                            }
+                                        }
+                                    });
+                                `
+                            },
                             {
                                 "actionType": "setValue",
-                                "componentId": `service_listview_${options.objectName}`,
+                                "componentId": quickEditId,
                                 "args": {
                                     "value":{
                                         "quickedit_record_permissions_loading": true
@@ -55162,7 +55196,7 @@ async function getQuickEditSchema(field, options){
                             },
                             {
                                 "actionType": "setValue",
-                                "componentId": `service_listview_${options.objectName}`,
+                                "componentId": quickEditId,
                                 "args": {
                                     "value":{
                                         "quickedit_record_permissions_loading": false
@@ -55171,7 +55205,7 @@ async function getQuickEditSchema(field, options){
                             },
                             {
                                 "actionType": "setValue",
-                                "componentId": `service_listview_${options.objectName}`,
+                                "componentId": quickEditId,
                                 "args": {
                                     "value":{
                                         "quickedit_record_permissions": "${event.data}"
@@ -55350,8 +55384,6 @@ function getFieldWidth(width){
 async function getTableColumns(fields, options){
     const columns = [];
     if(!options.isLookup && !options.isInputTable){
-        //将_display放入crud的columns中，可以通过setvalue修改行内数据域的_display，而不影响上层items的_display,用于批量编辑
-        columns.push({name: '_display',type: 'static', width: 32, placeholder: "",id: "_display_${_index}", className: "hidden"});
         if(!options.enable_tree){
             columns.push({name: '_index',type: 'text', width: 32, placeholder: ""});
         }
@@ -55509,8 +55541,8 @@ async function getTableColumns(fields, options){
         const href = Router.getObjectDetailPath({
             ...options,  formFactor: options.formFactor, appId: "${appId}", objectName: options.objectName || "${objectName}", recordId: `\${${options.idFieldName}}`
         });
-        columns[1].type = "tpl";
-        columns[1].tpl = `<a href="${href}">\${${columns[1].name}}</a>`;
+        columns[0].type = "tpl";
+        columns[0].tpl = `<a href="${href}">\${${columns[0].name}}</a>`;
     }
     return columns;
 }
@@ -55769,7 +55801,7 @@ async function getTableOperation(ctx){
             type: 'steedos-object-button',
             name: button.name,
             objectName: button.objectName,
-            visibleOn: getButtonVisibleOn$1(button),
+            visibleOnAlias: getButtonVisibleOn$1(button),
             className: 'antd-Button--default'
         });
     });
@@ -55894,8 +55926,18 @@ async function getTableSchema$1(fields, options){
         }
 
         if(!isLookup && !hiddenColumnOperation){
-            columns.push(await getTableOperation(options));
+            const toolbarOperation = await getTableOperation(options);
+            columns.push(toolbarOperation);
         }
+        
+    }
+
+    const treeConfig = {};
+
+    if(options.enable_tree){
+        treeConfig.expandConfig = {
+            expand: 'first'
+        };
     }
 
     return {
@@ -55913,6 +55955,7 @@ async function getTableSchema$1(fields, options){
         labelTpl: `\${${options.labelFieldName}}`,
         autoFillHeight: false, // 自动高度效果不理想,先关闭
         columnsTogglable: false,
+        ...treeConfig
     }
 }
 
@@ -56377,12 +56420,16 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     // }
     // listView.handleFilterSubmit(Object.assign({}, removedValues, filterFormValues));
     // 点击搜索的时候自动收起搜索栏
-    let resizeWindow = function(){
-      //触发amis crud 高度重算
-      setTimeout(()=>{
-        window.dispatchEvent(new Event("resize"))
-      }, 500);
-    }
+    //触发amis crud 高度重算
+    doAction({
+      "actionType": "broadcast",
+      "args": {
+        "eventName": "@height.changed.${objectSchema.name}"
+      },
+      "data": {
+        "timeOut": 500
+      }
+    });
     const filterService = filterForm.context.getComponents().find(function(n){
       return n.props.type === "service";
     });
@@ -56415,6 +56462,8 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
   `;
   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";
@@ -56462,16 +56511,36 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     // });
 
     // 清除__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);
 
     let filterFormService = SteedosUI.getClosestAmisComponentByType(filterForm.context, "service");
     filterFormService.setData({showFieldsFilter: !!!filterFormService.props.data.showFieldsFilter});
     //触发amis crud 高度重算
-    setTimeout(()=>{
-      window.dispatchEvent(new Event("resize"))
-    }, 100);
+    doAction({
+      "actionType": "broadcast",
+      "args": {
+        "eventName": "@height.changed.${objectSchema.name}"
+      },
+      "data": {
+        "timeOut": 100
+      }
+    });
+    
     // 移除搜索按钮上的红点
     // let crudService = scope.getComponentById("service_listview_" + event.data.objectName);
     let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service");
@@ -56628,9 +56697,15 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
       sessionStorage.setItem(listViewPropsStoreKey, JSON.stringify(localListViewProps));
     }
     //触发amis crud 高度重算
-    setTimeout(()=>{
-      window.dispatchEvent(new Event("resize"))
-    }, 100)
+    doAction({
+      "actionType": "broadcast",
+      "args": {
+        "eventName": "@height.changed.${objectSchema.name}"
+      },
+      "data": {
+        "timeOut": 100
+      }
+    });
     // ===END===
   `;
   return {
@@ -57872,13 +57947,16 @@ const filterService = filterForm.context.getComponents().find(function(n){
 });
 let toShowFieldsFilter = !!!filterService.props.data.showFieldsFilter;
 filterService.setData({showFieldsFilter: toShowFieldsFilter});
-let resizeWindow = function(){
-  //触发amis crud 高度重算
-  setTimeout(()=>{
-    window.dispatchEvent(new Event("resize"))
-  }, 1000);
-}
-resizeWindow();
+//触发amis crud 高度重算
+doAction({
+  "actionType": "broadcast",
+  "args": {
+    "eventName": "@height.changed." + event.data.objectName
+  },
+  "data": {
+    "timeOut": 1000
+  }
+});
 // 手机端在显示搜索栏时隐藏crud上的刷新按钮，因为点击后crud高度显示有问题
 let crudService = scope.getComponentById("service_listview_" + event.data.objectName);
 crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
@@ -57929,7 +58007,12 @@ function getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLooku
     __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
@@ -57942,9 +58025,19 @@ function getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLooku
     // 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);
   `;
 
@@ -57965,8 +58058,8 @@ function getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLooku
         "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": {
@@ -58227,12 +58320,16 @@ async function getObjectFilter(objectSchema, fields, options) {
       return;
     }
     // 列表搜索栏字段值变更后立刻触发提交表单执行crud搜索，所以这里需要额外重算crud高度及筛选按钮红色星号图标显示隐藏
-    let resizeWindow = function(){
-      //触发amis crud 高度重算
-      setTimeout(()=>{
-        window.dispatchEvent(new Event("resize"))
-      }, 1000);
-    }
+    //触发amis crud 高度重算
+    doAction({
+      "actionType": "broadcast",
+      "args": {
+        "eventName": "@height.changed.${objectSchema.name}"
+      },
+      "data": {
+        "timeOut": 1000
+      }
+    });
     resizeWindow();
     const scope = event.context.scoped;
     // let filterFormValues = event.data;
@@ -58246,18 +58343,34 @@ async function getObjectFilter(objectSchema, fields, options) {
     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": "",
@@ -58860,6 +58973,60 @@ function getReferenceToSync(field) {
 }
 
 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)
+                }else{
+                    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",
@@ -58870,8 +59037,7 @@ function getLookupSapceUserTreeSchema(isMobile){
           "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}}"
           },
@@ -59072,13 +59238,24 @@ async function lookupToAmisPicker(field, readonly, ctx){
     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;
@@ -59173,8 +59350,19 @@ async function lookupToAmisPicker(field, readonly, ctx){
         })
         payload.data.rows = rows;
         */
+        if(enable_tree){
+            const rows = _.map(payload.data.rows, (item)=>{
+                delete item.children;
+                delete item.parent;
+                return item;
+            })
+            payload.data.rows = rows;
+        }
         return payload;
     }
+    if(!payload.data.rows){
+        payload.data.rows = [];
+    }
     if(enable_tree){
         const records = payload.data.rows;
         const treeRecords = [];
@@ -59201,6 +59389,8 @@ async function lookupToAmisPicker(field, readonly, ctx){
             _.each(children, (item)=>{
                 if(item.children){
                     item.children = getChildren(records, item.children)
+                }else{
+                    item.children = [];
                 }
             })
             return children;
@@ -59213,14 +59403,6 @@ async function lookupToAmisPicker(field, readonly, ctx){
             }
         });
         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;
     `;
@@ -59247,6 +59429,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
             labelFieldName,
             top:  top,
             isLookup: true,
+            enable_tree: refObjectConfig.enable_tree,
             ...ctx
         });
 
@@ -59262,7 +59445,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
         const isAllowCreate = refObjectConfig.permissions.allowCreate;
         const isCreate = lodash.exports.isBoolean(field.create) ? field.create : true;
         // lookup字段配置过滤条件就强制不显示新建按钮
-        let isHasFilters = (field.filters || field._filtersFunction) ? true : false;
+        let isHasFilters = (field.filters || field.filtersFunction || field._filtersFunction) ? true : false;
         if (isAllowCreate && isCreate && !isHasFilters) {
             const new_button = await getSchema$5(refObjectConfig, { appId: ctx.appId, objectName: refObjectConfig.name, formFactor: ctx.formFactor });
             new_button.align = "right";
@@ -59282,7 +59465,12 @@ async function lookupToAmisPicker(field, readonly, ctx){
             "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){
@@ -59455,7 +59643,7 @@ async function lookupToAmisSelect(field, readonly, ctx){
             sendOn.push(`this.${fName}`);
         });
         if(depend_on.length > 0){
-            apiInfo.url = `${apiInfo.url}?${depend_on.join('&')}`;
+            apiInfo.url = `${apiInfo.url}&${depend_on.join('&')}`;
             apiInfo.sendOn = `${sendOn.join(' && ')}`;
         }
     }
@@ -59563,6 +59751,13 @@ async function lookupToAmisSelect(field, readonly, ctx){
         autoComplete: apiInfo,
         searchable: true,
     };
+    let amisVersion = getComparableAmisVersion();
+    if(amisVersion >= 3.6){
+        // amis 3.6中不加source会造成子表组件中弹出行编辑窗口的lookup字段有时不请求接口（概率现象，同一个地方反复操作有时请求有时不请求）
+        // 但是同时配置autoComplete和source会多请求一次接口
+        // TODO:应该想办法把是否字段在子表组件内，即ctx.isInputTable，如果不在子表组件内不需要加source
+        data.source = apiInfo;
+    }
     //删除xlink:href中的rootUrl前缀，解决客户端svg为空的问题
     const select_menuTpl = `<span class='flex items-center mt-0.5'>
         <span role='img' aria-label='smile' class='anticon anticon-smile'>
@@ -59644,18 +59839,37 @@ async function lookupToAmis(field, readonly, ctx){
 
     // 优先取字段中配置的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;
+        }
+    }
+    let amisSchema;
     // 默认使用下拉框模式显示lookup选项，只能配置了enable_enhanced_lookup才使用弹出增强模式
     if(enableEnhancedLookup == true){
-        return await lookupToAmisPicker(field, readonly, ctx);
+        amisSchema = await lookupToAmisPicker(field, readonly, ctx);
     }else if(refObject.enable_tree) {
-        return await lookupToAmisTreeSelect(field, readonly, Object.assign({}, ctx, {
+        amisSchema = await lookupToAmisTreeSelect(field, readonly, Object.assign({}, ctx, {
             labelField: referenceTo.labelField?.name || 'name',
             valueField: referenceTo.valueField?.name || '_id',
             objectName: referenceTo.objectName
         }));
     }else {
-        return await lookupToAmisSelect(field, readonly, ctx);
+        amisSchema = await lookupToAmisSelect(field, readonly, ctx);
     }
+    let refLookupPage = refObject.pages && refObject.pages.lookup;
+    if(refLookupPage){
+        if(typeof refLookupPage == 'string'){
+            refLookupPage = JSON.parse(refLookupPage);
+        }
+        // Object.assign(amisSchema, refLookupPage);
+        // amisSchema = _.defaultsDeep({}, refLookupPage, amisSchema);
+    }
+    return amisSchema;
 }
 
 async function lookupToAmisIdsPicker(field, readonly, ctx){
@@ -60293,7 +60507,8 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
                     },
                     pipeOut: (value, oldValue, data) => {
                         if(value){
-                            return value/100;
+                            const result = value/100;
+                            return Number(result.toFixed(field.scale+2));
                         }
                         return value;
                     },
@@ -60525,7 +60740,7 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
     }
     if(!lodash.exports.isEmpty(convertData)){
         if(field.is_wide || convertData.type === 'group'){
-            convertData.className = 'col-span-2 m-1';
+            convertData.className = 'col-span-2 m-0';
         }else {
             convertData.className = 'm-1';
         }