@steedos-widgets/amis-lib 1.1.11 → 1.1.12

package/dist/index.umd.js

@@ -5489,12 +5489,12 @@ setTimeout(()=>{
                 if(uiSchema.form){
                     try{
                         var objectFormConfig = JSON.parse(uiSchema.form);
-                        initialValues = objectFormConfig.initialValues;
-                        if(initialValues){
-                            initialValues = new Function("return " + initialValues)();
+                        var formInitialValuesFun = objectFormConfig.initialValues;
+                        if(formInitialValuesFun){
+                            formInitialValuesFun = new Function("return " + formInitialValuesFun)();
                         }
-                        if(typeof initialValues === "function"){
-                            initialValues = initialValues.apply({doc: defaultValues || {} })
+                        if(typeof formInitialValuesFun === "function"){
+                            initialValues = formInitialValuesFun.apply({doc: defaultValues || {} , global: api.body.global})
                         }
                     }
                     catch(ex){
@@ -5511,12 +5511,15 @@ setTimeout(()=>{
             }
             // data下的变量需要在保存接口（getSaveApi）中被删除。
             payload.data = {
-                initialValues,
-                editFormInited: true
+                ...initialValues
             }
             ${options.initApiAdaptor || ''}
             return payload;
         `,
+          responseData: {
+              initialValues: "$$",
+              editFormInited: true
+          },
           data: data,
           headers: {
               Authorization: "Bearer ${context.tenantId},${context.authToken}"
@@ -6473,13 +6476,17 @@ setTimeout(()=>{
       let valueField = mainObject.key_field || '_id';
       const api = await getApi(mainObject, null, fields, {count: options.queryCount, alias: 'rows', limit: top, queryOptions: `filters: {__filters}, top: {__top}, skip: {__skip}, sort: "{__sort}"`});
       api.data.$term = "$term";
+      api.data.term = "$term";
       api.data.$self = "$$";
+      api.data.self = "$$";
       api.data.filter = "$filter";
       api.data.loaded = "${loaded}";
       api.data.listViewId = "${listViewId}";
       api.requestAdaptor = `
         // selfData 中的数据由 CRUD 控制. selfData中,只能获取到 CRUD 给定的data. 无法从数据链中获取数据.
         let selfData = JSON.parse(JSON.stringify(api.data.$self));
+        // 保留一份初始data，以供自定义发送适配器中获取原始数据。
+        const data = _.cloneDeep(api.data);
         try{
             // TODO: 不应该直接在这里取localStorage，应该从外面传入
             const listViewId = api.data.listViewId;
@@ -6639,28 +6646,8 @@ setTimeout(()=>{
     
     if(enable_tree){
         const records = payload.data.rows;
-        const treeRecords = [];
-        const getChildren = (records, childrenIds)=>{
-            if(!childrenIds){
-                return;
-            }
-            const children = _.filter(records, (record)=>{
-                return _.includes(childrenIds, record._id)
-            });
-            _.each(children, (item)=>{
-                if(item.children){
-                    item.children = getChildren(records, item.children)
-                }
-            })
-            return children;
-        }
-
-        _.each(records, (record)=>{
-            if(!record.parent){
-                treeRecords.push(Object.assign({}, record, {children: getChildren(records, record.children)}));
-            }
-        });
-        payload.data.rows = treeRecords;
+        const getTreeOptions = SteedosUI.getTreeOptions
+        payload.data.rows = getTreeOptions(records,{"valueField":"_id"});
     }
 
 
@@ -7353,7 +7340,7 @@ setTimeout(()=>{
    * @Author: baozhoutao@steedos.com
    * @Date: 2022-07-05 15:55:39
    * @LastEditors: Please set LastEditors
-   * @LastEditTime: 2023-04-13 09:20:21
+   * @LastEditTime: 2023-04-18 19:13:30
    * @Description:
    */
 
@@ -7450,7 +7437,7 @@ setTimeout(()=>{
                       mainRelated[arr[0]] = arr[1];
                   }
               }else {
-                  const details = mainObjectUiSchema.details || [];
+                  const details = _$1.union(mainObjectUiSchema.details,mainObjectUiSchema.lookup_details) || [];
                   for (const detail of details) {
                       const arr = detail.split(".");
                       mainRelated[arr[0]] = arr[1];