@steedos-widgets/amis-lib 1.1.11 → 1.1.12

package/dist/index.esm.js

@@ -1,5 +1,5 @@
 import * as _$1 from 'lodash';
-import ___default, { isEmpty, isArray, each, find, endsWith, cloneDeep, includes, get, map, keys, sortBy, compact, toArray, mergeWith, isBoolean, omitBy, isNil, isString, slice, defaultsDeep as defaultsDeep$1, isObject as isObject$1, has, filter, startsWith } from 'lodash';
+import ___default, { isEmpty, isArray, each, find, endsWith, cloneDeep, includes, get, map, keys, sortBy, compact, toArray, mergeWith, isBoolean, omitBy, isNil, isString, union, slice, defaultsDeep as defaultsDeep$1, isObject as isObject$1, has, filter, startsWith } from 'lodash';
 import { Router as Router$1, getSteedosAuth as getSteedosAuth$1, lookupToAmis as lookupToAmis$1, fetchAPI as fetchAPI$1 } from '@steedos-widgets/amis-lib';
 import isPlainObject from 'lodash/isPlainObject';
 
@@ -5463,12 +5463,12 @@ async function getEditFormInitApi(object, recordId, fields, options){
                 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){
@@ -5485,12 +5485,15 @@ async function getEditFormInitApi(object, recordId, fields, options){
             }
             // 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}"
@@ -6447,13 +6450,17 @@ async function getTableApi(mainObject, fields, options){
     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;
@@ -6613,28 +6620,8 @@ async function getTableApi(mainObject, fields, options){
     
     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"});
     }
 
 
@@ -7327,7 +7314,7 @@ const getRecordPermissions = async (objectName, recordId)=>{
  * @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:
  */
 
@@ -7424,7 +7411,7 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
                     mainRelated[arr[0]] = arr[1];
                 }
             }else {
-                const details = mainObjectUiSchema.details || [];
+                const details = union(mainObjectUiSchema.details,mainObjectUiSchema.lookup_details) || [];
                 for (const detail of details) {
                     const arr = detail.split(".");
                     mainRelated[arr[0]] = arr[1];