@steedos-widgets/amis-lib 1.3.22-beta.4 → 3.6.0-beta.10

package/dist/index.esm.js

@@ -382,8 +382,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: 
  */
 
@@ -440,6 +440,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;
+  }
+}
+
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-05-23 09:53:08
@@ -530,7 +545,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){
@@ -1087,7 +1102,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: 
  */
 
@@ -1141,7 +1156,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;
                 /*
@@ -1159,8 +1175,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,
@@ -1626,7 +1643,6 @@ async function getQuickEditSchema(field, options){
                         {
                             "actionType": "custom",
                             "script": `
-
                                     var _display = _.cloneDeep(event.data._display);
                                     ${displayField}
                                     doAction({actionType: 'setValue', "args": {"value": {_display}},componentId: "${quickEditId}"});
@@ -1764,8 +1780,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,
@@ -1796,9 +1813,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
@@ -1823,7 +1857,7 @@ async function getQuickEditSchema(field, options){
                             },
                             {
                                 "actionType": "setValue",
-                                "componentId": `service_listview_${options.objectName}`,
+                                "componentId": quickEditId,
                                 "args": {
                                     "value":{
                                         "quickedit_record_permissions_loading": false
@@ -1832,7 +1866,7 @@ async function getQuickEditSchema(field, options){
                             },
                             {
                                 "actionType": "setValue",
-                                "componentId": `service_listview_${options.objectName}`,
+                                "componentId": quickEditId,
                                 "args": {
                                     "value":{
                                         "quickedit_record_permissions": "${event.data}"
@@ -2011,8 +2045,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: ""});
         }
@@ -2170,8 +2202,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;
 }
@@ -2430,7 +2462,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'
         });
     });
@@ -2555,8 +2587,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 {
@@ -2574,6 +2616,7 @@ async function getTableSchema$1(fields, options){
         labelTpl: `\${${options.labelFieldName}}`,
         autoFillHeight: false, // 自动高度效果不理想,先关闭
         columnsTogglable: false,
+        ...treeConfig
     }
 }
 
@@ -2890,17 +2933,6 @@ async function getTableApi(mainObject, fields, options){
             payload.data.rows = getTreeOptions(records,{"valueField":"_id"});
             assignIndexToTreeRecords(payload.data.rows, '');
         }
-        try{
-            setTimeout(() => {
-                let expandBtn = $('.steedos-object-listview-content .antd-Table-content .antd-Table-table thead .antd-Table-expandBtn');
-                if(expandBtn && expandBtn.length > 0 && !expandBtn.hasClass("is-active")){
-                    expandBtn[0].click();
-                }
-            }, 600);
-        }
-        catch(ex){
-            console.error("tree数据格式展开异常：", ex);
-        }
     }
 
 
@@ -3665,6 +3697,7 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
         "dialog": {
           "type": "dialog",
           "title": title,
+          data,
           "body": [
             {
               "type": "steedos-object-form",
@@ -5727,12 +5760,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";
     });
@@ -5817,7 +5854,7 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     // 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;
       }
@@ -5834,9 +5871,16 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     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");
@@ -5993,9 +6037,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 {
@@ -6490,7 +6540,10 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
                     "@history_paths.changed": {
                         "actions": [
                             {
-                                "actionType": "reload"
+                                "actionType": "reload",
+                                // amis 3.6需要传入data来触发下面的window:historyPaths重新计算，此问题随机偶发，加上data后正常
+                                "data": {
+                                }
                             }
                         ]
                     }
@@ -7698,13 +7751,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});
@@ -7777,7 +7833,7 @@ function getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLooku
     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;
       }
@@ -8068,12 +8124,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;
@@ -8089,13 +8149,13 @@ async function getObjectFilter(objectSchema, fields, options) {
   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");
@@ -8104,7 +8164,7 @@ async function getObjectFilter(objectSchema, fields, options) {
     // 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;
       }
@@ -8383,6 +8443,11 @@ async function getObjectCRUD(objectSchema, fields, options){
       crudModeClassName = `steedos-crud-mode-${body.mode}`;
     }
 
+    if(body.columns && options.formFactor != 'SMALL'){
+      //将_display放入crud的columns的倒数第二列中（最后一列会影响固定列），可以通过setvalue修改行内数据域的_display，而不影响上层items的_display,用于批量编辑
+      body.columns.splice(body.columns.length - 1, 0, {name: '_display',type: 'static', width: 32, placeholder: "",id: "_display_${_index}", className: "hidden"});
+    }
+
     if (defaults) {
       const headerSchema = defaults.headerSchema;
       const footerSchema = defaults.footerSchema;
@@ -8407,6 +8472,7 @@ async function getObjectCRUD(objectSchema, fields, options){
         body = wrappedBody;
       }
     }
+    
     // console.timeEnd('getObjectCRUD');
     // TODO: data应该只留loaded，其他属性都改为从上层传递下来
     return {
@@ -8416,7 +8482,24 @@ async function getObjectCRUD(objectSchema, fields, options){
       id: `service_${id}`,
       name: `page`,
       data: options.amisData,
-      body: body
+      body: body,
+      //监听广播事件，重算crud高度
+      onEvent: {
+        [`@height.changed.${objectSchema.name}`]: {
+          "actions": [
+            {
+              "actionType": "custom",
+              "script": `
+                var crudScoped = event.context.scoped.getComponentById('${body.id}');
+                var timeOut = event.data.timeOut || 500;
+                setTimeout(()=>{
+                  crudScoped && crudScoped.control.updateAutoFillHeight();
+                }, timeOut);
+              `
+            }
+          ]
+        }
+      }
     }
 }
 
@@ -10294,6 +10377,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",
@@ -10304,8 +10441,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}}"
           },
@@ -10509,7 +10645,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
         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;
             }
@@ -10618,8 +10754,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 = [];
@@ -10646,6 +10793,8 @@ async function lookupToAmisPicker(field, readonly, ctx){
             _.each(children, (item)=>{
                 if(item.children){
                     item.children = getChildren(records, item.children)
+                }else{
+                    item.children = [];
                 }
             })
             return children;
@@ -10658,14 +10807,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;
     `;
@@ -10692,6 +10833,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
             labelFieldName,
             top:  top,
             isLookup: true,
+            enable_tree: refObjectConfig.enable_tree,
             ...ctx
         });
 
@@ -10707,7 +10849,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
         const isAllowCreate = refObjectConfig.permissions.allowCreate;
         const isCreate = _$1.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";
@@ -10905,7 +11047,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(' && ')}`;
         }
     }
@@ -11013,6 +11155,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'>
@@ -11094,18 +11243,37 @@ async function lookupToAmis(field, readonly, ctx){
 
     // 优先取字段中配置的enable_enhanced_lookup，字段上没配置时，才从对象上取enable_enhanced_lookup属性
     let enableEnhancedLookup = _$1.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 lookupToAmisSelectUser(field, readonly, ctx){
@@ -11372,9 +11540,9 @@ const OMIT_FIELDS = ['created', 'created_by', 'modified', 'modified_by'];
 // const Lookup = require('./lookup');
 
 function getBaseFields(readonly){
-    let calssName = 'm-1';
+    let className = 'm-0';
     if(readonly){
-        calssName = `${calssName}`;
+        className = `${className}`;
     }
     return [
         { 
@@ -11382,7 +11550,7 @@ function getBaseFields(readonly){
             label: "创建人",
             type: "static",
             labelClassName: 'text-left',
-            className: calssName,
+            className: className,
             tpl: getCreatedInfoTpl()
         },
         { 
@@ -11390,7 +11558,7 @@ function getBaseFields(readonly){
             label: "修改人",
             type: "static",
             labelClassName: 'text-left',
-            className: calssName,
+            className: className,
             tpl: getModifiedInfoTpl()
         }
     ]
@@ -11854,7 +12022,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;
                     },
@@ -12086,7 +12255,7 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
     }
     if(!_$1.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';
         }
@@ -12493,8 +12662,8 @@ async function getFormBody(permissionFields, formFields, ctx){
 /*
  * @Author: 殷亮辉 yinlianghui@hotoa.com
  * @Date: 2023-11-15 09:50:22
- * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-12-26 11:15:04
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2024-01-02 15:43:50
  */
 
 /**
@@ -12975,6 +13144,11 @@ async function getButtonActions(props, mode) {
     let dialogId = getComponentId("dialog", props.id);
     let buttonNextId = getComponentId("button_next", props.id);
     let formPaginationId = getComponentId("form_pagination", props.id);
+    let parentFormData = "${__super.__super.__super.__super || {}}";
+    let amisVersion = getComparableAmisVersion();
+    if(amisVersion < 3.6){
+        parentFormData = "${__super.__super || {}}";
+    }
     if (mode == "new" || mode == "edit") {
         // let actionShowNewDialog = {
         //     "actionType": "dialog",
@@ -13116,7 +13290,9 @@ async function getButtonActions(props, mode) {
                     // 换成从__super来映射上级表单数据是因为对象列表视图界面中每行下拉菜单中的编辑按钮弹出的表单中的子表所在作用域中没有record变量
                     // 映射到中间变量__parentForm而不是直接用&展开映射是为了避免表单中字段名与作用域中变量重名
                     // "__parentForm": "${__super.__super || {}}",
-                    "__parentForm": mode == "new" ? "$$" : "${__super.__super || {}}",
+                    // "__parentForm": mode == "new" ? "$$" : "${__super.__super || {}}",
+                    "__parentForm": mode == "new" ? "$$" : parentFormData,
+                    "_master": "${_master}",
                     "global": "${global}",
                     "uiSchema": "${uiSchema}",
                     "index": "${index}",
@@ -13209,7 +13385,7 @@ async function getButtonActions(props, mode) {
                         // 换成从__super来映射上级表单数据是因为对象列表视图界面中每行下拉菜单中的编辑按钮弹出的表单中的子表所在作用域中没有record变量
                         // 映射到中间变量__parentForm而不是直接用&展开映射是为了避免表单中字段名与作用域中变量重名
                         // "__parentForm": "${__super.__super || {}}",
-                        "__parentForm": "${__super.__super || {}}",
+                        "__parentForm": parentFormData,
                         "global": "${global}",
                         "uiSchema": "${uiSchema}",
                         "index": "${index}",
@@ -13377,7 +13553,7 @@ const getAmisInputTableSchema = async (props) => {
             "name": "__op__",
             "type": "operation",
             "buttons": buttonsForColumnOperations,
-            "width": buttonsForColumnOperations.length > 1 ? "46px" : "20px"
+            "width": buttonsForColumnOperations.length > 1 ? "60px" : "20px"
         });
     }
     if (showAsInlineEditMode) {
@@ -14826,8 +15002,8 @@ const getInstanceApprovalHistory = async ()=>{
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-09-07 16:20:45
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-03-23 16:49:44
+ * @LastEditors: liaodaxue
+ * @LastEditTime: 2023-12-29 16:06:35
  * @Description:
  */
 
@@ -15653,7 +15829,6 @@ const getFlowFormSchema = async (instance, box) => {
       "messages": {
       },
       "requestAdaptor": `
-        const { context } = api.data;
         api.data = {
           query: \`
             {
@@ -15676,7 +15851,7 @@ const getFlowFormSchema = async (instance, box) => {
       `,
       "data": {
         // "&": "$$",
-        "context": "${context}",
+        // "context": "${context}",
         "judge": "${new_judge}",
       }
     },