@steedos-widgets/amis-lib 1.2.3 → 1.2.6-beta.10

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, toArray, mergeWith, isBoolean, omitBy, isNil, isString, union, has, slice, defaultsDeep as defaultsDeep$1, isObject as isObject$1, 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';
 
@@ -334,7 +334,7 @@ const getSteedosAuth = () => {
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-08-16 17:02:08
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-04-17 15:24:21
+ * @LastEditTime: 2023-04-19 15:25:50
  * @Description:
  */
 
@@ -346,7 +346,7 @@ const Router = {
             return urlSearch.get('display')
         }
         // const key = `tab.${tab_id}.display`;
-        const key = `page.display`;
+        const key = `page_display`;
         const value = localStorage.getItem(key);
         return value ? value : 'grid'
     },
@@ -1368,8 +1368,8 @@ var config = {
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-11-01 15:51:00
- * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-04-16 17:04:16
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-04-19 20:26:27
  * @Description: 
  */
 
@@ -1479,7 +1479,27 @@ const getSchema$4 = async (uiSchema, ctx) => {
                                     "id": "u:e11347411d2d",
                                     "closeOnEsc": false,
                                     "closeOnOutside": false,
-                                    "size": "lg"
+                                    "size": "lg",
+                                    "actions": [
+                                        {
+                                            type: 'button',
+                                            actionType: 'cancel',
+                                            label: "取消"
+                                        },
+                                        {
+                                            type: 'button',
+                                            label: "保存并新建",
+                                            actionType: 'confirm',
+                                            close: false,
+                                            id: "confirmAndNew"
+                                        },
+                                        {
+                                            type: 'button',
+                                            actionType: 'confirm',
+                                            label: "保存",
+                                            primary: true
+                                        },
+                                    ]
                                 }
                             }
                         ]
@@ -2381,96 +2401,97 @@ async function getObjectFieldsFilterButtonSchema(objectSchema) {
   }
 }
 
-async function getObjectFieldsFilterFormSchema(objectSchema, fields, ctx) {
-  if(!ctx){
+async function getObjectFieldsFilterFormSchema(ctx) {
+
+  if (!ctx) {
     ctx = {};
   }
-  const body = [];
-  for (let field of fields) {
-    if (
-      !includes(
-        [
-          "grid",
-          "avatar",
-          "image",
-          "object",
-          "[object]",
-          "[Object]",
-          "[grid]",
-          "[text]",
-          "audio",
-          "file",
-        ],
-        field.type
-      )
-    ) {
-      delete field.defaultValue;
-      delete field.required;
-      delete field.is_wide;
-      delete field.readonly;
-      delete field.hidden;
-      delete field.omit;
-      const amisField = await getFieldSearchable(field, fields, ctx);
-      if (amisField) {
-        body.push(amisField);
+  const formSchema = {
+    "type": "service",
+    "visibleOn": "this.filterFormSearchableFields && this.filterFormSearchableFields.length",
+    "className": ctx.formFactor === 'SMALL' ? "slds-filters__body p-0 mb-2" : "slds-filters__body p-0 sm:grid sm:gap-2 sm:grid-cols-4 mb-2",
+    "schemaApi": {
+      method: 'post',
+      url: `\${context.rootUrl}/graphql?reload=\${filterFormSearchableFields|join}`,
+      data: {
+        $self: "$$",
+        query: "{\n data: objects(filters: [[\"_id\",\"=\",null]],top: 1, skip: 0){_id}\n    }"
+      },
+      requestAdaptor: `
+        return {
+          ...api,
+          data: {
+            query: api.data.query
+          }
+        };
+      `,
+      adaptor: `
+          if(payload.errors){
+              payload.status = 2;
+              payload.msg = window.t ? window.t(payload.errors[0].message) : payload.errors[0].message;
+          }
+          const selfData = api.body.$self;
+          const filterFormSearchableFields = selfData.filterFormSearchableFields;
+          const uiSchema = selfData.uiSchema;
+          const fields = uiSchema.fields;
+          const searchableFields = [];
+
+          const resolveAll = function(values){
+            payload.data = {
+              "body": values
+            };
+            return payload;
+          }
+
+          const rejectAll = function(){
+            console.warn("run function getFieldSearchable failed.");
+          }
+
+          return Promise.all(filterFormSearchableFields.map(function (item) {
+            const field = _.clone(fields[item]);
+            if (
+              !_.includes(
+                [
+                  "grid",
+                  "avatar",
+                  "image",
+                  "object",
+                  "[object]",
+                  "[Object]",
+                  "[grid]",
+                  "[text]",
+                  "audio",
+                  "file",
+                ],
+                field.type
+              )
+            ) {
+              delete field.defaultValue;
+              delete field.required;
+              delete field.is_wide;
+              delete field.readonly;
+              delete field.hidden;
+              delete field.omit;
+              var ctx = ${JSON.stringify(ctx)};
+              const amisField = window.getFieldSearchable(field, fields, ctx);
+              return amisField;
+            }
+          })).then(resolveAll, rejectAll);
+      `,
+      headers: {
+        Authorization: "Bearer ${context.tenantId},${context.authToken}"
       }
     }
-  }
-  map(body, "name");
-  if(ctx.enableSearchableFieldsVisibleOn){
-    body.forEach(function(fieldItem){
-      fieldItem.visibleOn = `this.filterFormSearchableFields && this.filterFormSearchableFields.indexOf("${fieldItem.fieldName}") > -1`;
-      // fieldItem.clearValueOnHidden = true;//这个属性会把form字段值删除，但是点击搜索时crud还是把值给传递到过滤条件(api.requestAdaptor的data.$self)中了，应该是crud的bug
-    });
-  }
-
-  // const onBroadcastSearchableFieldsChangeScript = `
-  //   const data = event.data;
-  //   const listViewId = data.listViewId;
-  //   const searchableFields = data.fields;
-  //   const preSearchableFields = data.__super.__super.fields;
-  //   const removedFields = _.difference(preSearchableFields, searchableFields);
-  //   const listViewPropsStoreKey = location.pathname + "/crud/" + listViewId ;
-  //   let localListViewProps = localStorage.getItem(listViewPropsStoreKey);
-  //   if(localListViewProps){
-  //     // 当变更可搜索字段时，如果被移除的可搜索字段在本地存储中已经存入过滤条件中则应该清除本地存储中相关字段的过滤条件。
-  //     localListViewProps = JSON.parse(localListViewProps);
-  //     let removedKeys = [];
-  //     _.each(localListViewProps, function(n,k){
-  //       // __searchable__开头的不在searchableFields范围则清除其值
-  //       let isRemoved = !!removedFields.find(function(fieldName){
-  //         return new RegExp("__searchable__\.*" + fieldName + "$").test(k);
-  //       });
-  //       if(isRemoved){
-  //         removedKeys.push(k);
-  //       }
-  //     });
-  //     const removedValues = {};
-  //     removedKeys.forEach(function(key){
-  //       delete localListViewProps[key];
-  //       removedValues[key] = "";
-  //     });
-  //     doAction({
-  //       actionType: 'setValue',
-  //       args: {
-  //         value: removedValues
-  //       }
-  //     });
-  //     localStorage.setItem(listViewPropsStoreKey, JSON.stringify(localListViewProps));
-  //   }
-  // `;
+  };
 
-  return body;
+  return formSchema;
 }
 
-async function getObjectFieldsFilterBarSchema(objectSchema, fields, ctx) {
-  // console.log(ctx)
-  if(!ctx){
+async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
+  if (!ctx) {
     ctx = {};
   }
-  const filterFormSchema = await getObjectFieldsFilterFormSchema(objectSchema, fields, Object.assign({}, {
-    enableSearchableFieldsVisibleOn: true
-  }, ctx));
+  const filterFormSchema = await getObjectFieldsFilterFormSchema(ctx);
   const onSearchScript = `
     const scope = event.context.scoped;
     var filterForm = scope.parent.parent.getComponents().find(function(n){
@@ -2503,18 +2524,21 @@ async function getObjectFieldsFilterBarSchema(objectSchema, fields, ctx) {
       searchableFieldsStoreKey += listViewId;
     }
     let defaultSearchableFields = sessionStorage.getItem(searchableFieldsStoreKey);
-    if(!defaultSearchableFields && data.uiSchema){
+    if(defaultSearchableFields){
+      defaultSearchableFields = defaultSearchableFields.split(",");
+    }
+    if(_.isEmpty(defaultSearchableFields) && data.uiSchema){
       let listView = data.uiSchema.list_views[data.listName];
-      defaultSearchableFields = listView && listView.searchable_fields;
-      if(defaultSearchableFields && defaultSearchableFields.length){
-        defaultSearchableFields = _.map(defaultSearchableFields, 'field');
+      const sFields = listView && listView.searchable_fields;
+      if(sFields && sFields.length){
+        defaultSearchableFields = _.map(sFields, 'field');
       }
     }
     if(_.isEmpty(defaultSearchableFields) && data.uiSchema){
       defaultSearchableFields = _.map(
-        _.filter(_.values(data.uiSchema.fields), (field) => {
+        _.sortBy(_.filter(_.values(data.uiSchema.fields), (field) => {
           return field.searchable;
-        }),
+        }), "sort_no"),
         "name"
       );
     }
@@ -2652,7 +2676,7 @@ async function getObjectFieldsFilterBarSchema(objectSchema, fields, ctx) {
       // "filterFormValues": {"__searchable__name": "xxx"},//搜索项表单值
       // "listViewId": "${listViewId}"
     },
-    "id": `service_listview_filter_form_${objectSchema.name}`,
+    // "id": `service_listview_filter_form_${objectSchema.name}`,
     "dataProvider": {
       "inited": dataProviderInited
     },
@@ -2660,15 +2684,7 @@ async function getObjectFieldsFilterBarSchema(objectSchema, fields, ctx) {
       "type": "wrapper",
       "body": {
         "type": "wrapper",
-        "body": [{
-          "type": "wrapper",
-          "body": [
-            filterFormSchema
-          ],
-          "size": "xs",
-          "visibleOn": "this.filterFormSearchableFields && this.filterFormSearchableFields.length",
-          "className": ctx.formFactor === 'SMALL' ? "slds-filters__body p-0 mb-2": "slds-filters__body p-0 sm:grid sm:gap-2 sm:grid-cols-4 mb-2"
-        }, {
+        "body": [filterFormSchema, {
           "type": "wrapper",
           "body": {
             "type": "wrapper",
@@ -3027,16 +3043,7 @@ async function getObjectListHeaderSecordLine(objectSchema, listViewName, ctx) {
  * @returns amisSchema
  */
 async function getObjectListHeaderFieldsFilterBar(objectSchema, listViewName, ctx) {
-  const searchableFields = keys(objectSchema.fields);
-  const fields = sortBy(
-    compact(
-      map(searchableFields, (fieldName) => {
-        return objectSchema.fields[fieldName];
-      })
-    ),
-    "sort_no"
-  );
-  const fieldsFilterBarSchema = await getObjectFieldsFilterBarSchema(objectSchema, fields, ctx);
+  const fieldsFilterBarSchema = await getObjectFieldsFilterBarSchema(objectSchema, ctx);
   return fieldsFilterBarSchema;
 }
 
@@ -3815,12 +3822,11 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
                               "objectApiName": "object_listviews",
                               "recordId": "${recordId}",
                               "mode": "edit",
-                              "initApiAdaptor": "",
                               "fields": [
                                 "filters"
                               ],
                               "initApiRequestAdaptor": "",
-                              "initApiAdaptor": "const recordId_tmp = api.body.recordId;\nlet data_tmp;\nif (recordId_tmp) {\n  data_tmp = payload.data.initialValues;\n  // 数据格式转换\n  if (data_tmp) {\n    if (data_tmp.filters && lodash.isString(data_tmp.filters)) {\n      try {\n        data_tmp.filters = JSON.parse(data_tmp.filters);\n      } catch (e) { }\n    }\n\n    if (data_tmp.filters && lodash.isString(data_tmp.filters)) {\n      data_tmp._filters_type_controller = 'function';\n    } else {\n      data_tmp._filters_type_controller = 'conditions'\n    }\n\n    if (data_tmp._filters_type_controller === 'conditions') {\n      data_tmp._filters_conditions = window.amisConvert.filtersToConditions(data_tmp.filters || []);\n      data_tmp.filters = data_tmp._filters_conditions;\n    } else {\n      data_tmp._filters_function = data_tmp.filters;\n    }\n  }\n}\nfor (key in data_tmp) {\n  if (data_tmp[key] === null) {\n    delete data_tmp[key];\n  }\n}\npayload.data.initialValues = Object.assign(payload.data.initialValues, data_tmp);\ndelete payload.extensions;",
+                              "initApiAdaptor": "const recordId_tmp = api.body.recordId;\nlet data_tmp;\nif (recordId_tmp) {\n  data_tmp = payload.data;\n  // 数据格式转换\n  if (data_tmp) {\n    if (data_tmp.filters && lodash.isString(data_tmp.filters)) {\n      try {\n        data_tmp.filters = JSON.parse(data_tmp.filters);\n      } catch (e) { }\n    }\n\n    if (data_tmp.filters && lodash.isString(data_tmp.filters)) {\n      data_tmp._filters_type_controller = 'function';\n    } else {\n      data_tmp._filters_type_controller = 'conditions'\n    }\n\n    if (data_tmp._filters_type_controller === 'conditions') {\n      data_tmp._filters_conditions = window.amisConvert.filtersToConditions(data_tmp.filters || []);\n      data_tmp.filters = data_tmp._filters_conditions;\n    } else {\n      data_tmp._filters_function = data_tmp.filters;\n    }\n  }\n}\nfor (key in data_tmp) {\n  if (data_tmp[key] === null) {\n    delete data_tmp[key];\n  }\n}\npayload.data = Object.assign(payload.data, data_tmp);\ndelete payload.extensions;",
                               "apiRequestAdaptor": "const recordId = api.body.recordId;\nif (formData._filters_type_controller === 'conditions' && formData._filters_conditions) {\n  formData.filters = window.amisConvert.conditionsToFilters(formData.filters);\n} else {\n  formData.filters = formData._filters_function || null;\n}\n\ndelete formData._filters_type_controller;\ndelete formData._filters_conditions;\ndelete formData._filters_function;\n// 字符串拼接（不支持ES6``语法）\nquery = 'mutation{record: ' + objectName + '__insert(doc: {__saveData}){_id}}';\nif (api.body.recordId) {\n  query = 'mutation{record: ' + objectName + '__update(id: \"' + recordId + '\", doc: {__saveData}){_id}}';\n};\n__saveData = JSON.stringify(JSON.stringify(formData));\napi.data = { query: query.replace('{__saveData}', __saveData) };\n",
                               "fieldsExtend": "{\"filters\": {\n    \"visible_on\": \"true\",\n   \"amis\": {\n      \"type\": \"condition-builder\",\n      \"label\": \"条件组件\",\n      \"source\": {\n        \"method\": \"get\",\n        \"url\": \"${context.rootUrl}/service/api/amis-metadata-listviews/getFilterFields?objectName=${objectName}\",\n        \"dataType\": \"json\",\n        \"headers\": {\n          \"Authorization\": \"Bearer ${context.tenantId},${context.authToken}\"\n        }\n      }\n    }\n  }\n}",
                               "onEvent": {
@@ -3880,7 +3886,7 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
                               "recordId": "${recordId}",
                               "mode": "edit",
                               "fieldsExtend": "{\n  \"columns\": {\n    \"amis\": {\n      \"type\": \"transfer\",\n      \"sortable\": true,\n      \"searchable\": true,\n      \"source\": {\n        \"method\": \"get\",\n        \"url\": \"${context.rootUrl}/service/api/amis-metadata-objects/objects/${objectName}/fields/options\",\n        \"headers\": {\n          \"Authorization\": \"Bearer ${context.tenantId},${context.authToken}\"\n        }\n      }\n    }\n  },\n  \"mobile_columns\": {\n    \"group\": \"手机端\",\n    \"amis\": {\n      \"type\": \"transfer\",\n      \"sortable\": true,\n      \"searchable\": true,\n      \"source\": {\n        \"method\": \"get\",\n        \"url\": \"${context.rootUrl}/service/api/amis-metadata-objects/objects/${objectName}/fields/options\",\n        \"headers\": {\n          \"Authorization\": \"Bearer ${context.tenantId},${context.authToken}\"\n        }\n      }\n    }\n  }\n}",
-                              "initApiAdaptor": "const recordId_tmp = api.body.recordId;\nlet columns_tmp = {}, mobile_columns_tmp = {};\nif (recordId_tmp) {\n  columns_tmp = payload.data.initialValues.columns;\n  mobile_columns_tmp = payload.data.initialValues.mobile_columns;\n  if (columns_tmp) {\n    columns_tmp = lodash.map(columns_tmp, 'field');\n  }\n  if (mobile_columns_tmp) {\n    mobile_columns_tmp = lodash.map(mobile_columns_tmp, 'field');\n  }\n}\npayload.data.initialValues.columns = columns_tmp;\npayload.data.initialValues.mobile_columns = mobile_columns_tmp;\n\ndelete payload.extensions;\nreturn payload;",
+                              "initApiAdaptor": "const recordId_tmp = api.body.recordId;\nlet columns_tmp = {}, mobile_columns_tmp = {};\nif (recordId_tmp) {\n  columns_tmp = payload.data.columns;\n  mobile_columns_tmp = payload.data.mobile_columns;\n  if (columns_tmp) {\n    columns_tmp = lodash.map(columns_tmp, 'field');\n  }\n  if (mobile_columns_tmp) {\n    mobile_columns_tmp = lodash.map(mobile_columns_tmp, 'field');\n  }\n}\npayload.data.columns = columns_tmp;\npayload.data.mobile_columns = mobile_columns_tmp;\n\ndelete payload.extensions;\nreturn payload;",
                               "apiRequestAdaptor": "const formData_tmp = api.body.$;\nconst objectName_tmp = api.body.objectName;\nconst recordId_tmp = api.body.recordId;\n\nif (typeof formData_tmp.columns == 'string') {\n  formData_tmp.columns = formData_tmp.columns?.split(',');\n}\nif (typeof formData_tmp.mobile_columns == 'string') {\n  formData_tmp.mobile_columns = formData_tmp.mobile_columns?.split(',');\n}\n\n// 数据格式转换\nformData_tmp.columns = lodash.map(formData_tmp.columns, (item) => {\n  return { field: item };\n});\nformData.mobile_columns = lodash.map(formData.mobile_columns, (item) => {\n  return { field: item };\n});\n\n// 字符串拼接（不支持ES6语法）\nlet query_tmp = 'mutation{record: ' + objectName_tmp + '__insert(doc: {__saveData}){_id}}';\nif (api.body.recordId) {\n  query_tmp = 'mutation{record: ' + objectName_tmp + '__update(id: \"' + recordId_tmp +'\", doc: {__saveData}){_id}}';\n};\ndelete formData_tmp._id;\nlet __saveData_tmp = JSON.stringify(JSON.stringify(formData_tmp));\napi.data = { query: query_tmp.replace('{__saveData}', __saveData_tmp) };\n\nreturn api;",
                               "fields": [
                                 "columns",
@@ -3962,7 +3968,7 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
                                 }
                               },
                               "fieldsExtend": "{\n  \"sort\": {\n    \"amis\": {\n      \"type\": \"tabs-transfer\",\n      \"sortable\": true,\n      \"searchable\": true,\n      \"source\": {\n        \"method\": \"get\",\n        \"url\": \"${context.rootUrl}/service/api/amis-metadata-objects/objects/${objectName}/sortFields/options\",\n        \"headers\": {\n          \"Authorization\": \"Bearer ${context.tenantId},${context.authToken}\"\n        }\n      }\n    }\n  }\n}",
-                              "initApiAdaptor": "let sort;\nif (recordId) {\n  sort = payload.data.initialValues.sort;\n  //数据格式转换\n  if (sort instanceof Array) {\n    sort = lodash.map(sort, (item) => {\n      return item.field_name + ':' + (item.order || 'asc')\n    });\n  }\n}\npayload.data.initialValues.sort = sort;\ndelete payload.extensions;",
+                              "initApiAdaptor": "let sort;\nif (recordId) {\n  sort = payload.data.sort;\n  //数据格式转换\n  if (sort instanceof Array) {\n    sort = lodash.map(sort, (item) => {\n      return item.field_name + ':' + (item.order || 'asc')\n    });\n  }\n}\npayload.data.sort = sort;\ndelete payload.extensions;",
                               "apiRequestAdaptor": "const recordId = api.body.recordId;\n//数据格式转换\nif (typeof formData.sort == 'string') {\n  formData.sort = formData.sort?.split(',');\n}\nformData.sort = lodash.map(formData.sort, (item) => {\n  const arr = item.split(':');\n  return { field_name: arr[0], order: arr[1] };\n});\nif (recordId) {\n  query = 'mutation{record: ' + objectName + '__update(id: \"' + recordId + '\", doc: {__saveData}){_id}}';\n}\n__saveData = JSON.stringify(JSON.stringify(formData));\napi.data = { query: query.replace('{__saveData}', __saveData) };\n"
                             }
                           ],
@@ -4501,13 +4507,16 @@ async function lookupToAmisPicker(field, readonly, ctx){
         var sort = orderBy + ' ' + orderDir;
         sort = orderBy ? sort : "${sort}";
         var allowSearchFields = ${JSON.stringify(searchableFields)};
+        let fieldValue;
         if(api.data.$term){
             filters = [["name", "contains", "'+ api.data.$term +'"]];
         }else if(selfData.op === 'loadOptions' && selfData.value){
             if(selfData.value?.indexOf(',') > 0){
-                filters = [["${referenceTo.valueField.name}", "=", selfData.value.split(',')]];
+                fieldValue = selfData.value.split(',');
+                filters = [["${referenceTo.valueField.name}", "=", fieldValue]];
             }else{
-                filters = [["${referenceTo.valueField.name}", "=", selfData.value]];
+                fieldValue = selfData.value;
+                filters = [["${referenceTo.valueField.name}", "=", fieldValue]];
             }
         }
 
@@ -4561,6 +4570,9 @@ async function lookupToAmisPicker(field, readonly, ctx){
         if(enable_tree){
             pageSize = 10000;
         }
+        if(fieldValue && _.isArray(fieldValue) && fieldValue.length > pageSize){
+            pageSize = fieldValue.length;
+        }
         api.data.query = api.data.query.replace(/{__filters}/g, JSON.stringify(filters)).replace('{__top}', pageSize).replace('{__skip}', skip).replace('{__sort}', sort.trim());
         return api;
     `;
@@ -4661,13 +4673,9 @@ async function lookupToAmisPicker(field, readonly, ctx){
         //TODO: 等待放大镜bug修复,if会去掉，始终显示放大镜
         if(referenceTo.objectName != "space_users" || field.reference_to_field != "user"){
             if (ctx.filterVisible !== false) {
-                let filterLoopCount = ctx.filterLoopCount || 0;
-                filterLoopCount++;
-                // 可以传入filterVisible为false防止死循环
                 pickerSchema.filter = await getObjectFilter(refObjectConfig, fields, {
                     isLookup: true,
-                    ...ctx,
-                    filterLoopCount,
+                    ...ctx
                 });
             }
         }
@@ -5646,7 +5654,7 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
                     columnsTogglable: false,
                     strictMode:false,
                     affixHeader: false, // 是否固定表头, 不固定表头, 否则form有y轴滚动条时, 表头会跟随滚动条滚动.
-                    // needConfirm: true,  此属性设置为false后，导致table不能编辑。
+                    needConfirm: false,
                     editable: !readonly,
                     addable: !readonly,
                     removable: !readonly,
@@ -5725,6 +5733,14 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
                 convertData.visibleOn = `${field.visible_on.replace(/formData./g, 'data.')}`;
             }
         }
+
+        if(_$1.isString(baseData.required)){
+            if(baseData.required.startsWith("{{")){
+                baseData.requiredOn = `${baseData.required.substring(2, baseData.required.length -2).replace(/formData./g, 'data.')}`;
+                delete baseData.required;
+            }
+        }
+
         if(convertData.type === 'group'){
             convertData.body[0] = Object.assign({}, baseData, convertData.body[0], { labelClassName: 'text-left', clearValueOnHidden: true, fieldName: field.name});
             return  convertData
@@ -5739,8 +5755,9 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
 }
 
 async function getFieldSearchable(perField, permissionFields, ctx){
-    const filterLoopCount = ctx.filterLoopCount || 0;
-    const maxFilterLoopCount = 5;
+    if(!ctx){
+        ctx = {};
+    }
     let field = perField;
     if(field.type === 'grid'){
         field = await getGridFieldSubFields(perField, permissionFields);
@@ -5801,14 +5818,17 @@ async function getFieldSearchable(perField, permissionFields, ctx){
         _field.multiple = true;
         _field.is_wide = false;
         _field.defaultValue = undefined;
-        // filterVisible: false不再生成lookup字段时的filter，否则会死循环
-        const amisField = await convertSFieldToAmisField(_field, false, Object.assign({}, ctx, {fieldNamePrefix: fieldNamePrefix, required: false, showSystemFields: true, filterVisible: filterLoopCount < maxFilterLoopCount}));
+        const amisField = await convertSFieldToAmisField(_field, false, Object.assign({}, ctx, {fieldNamePrefix: fieldNamePrefix, required: false, showSystemFields: true}));
         if(amisField){
             return amisField;
         }
     }
 }
 
+if(typeof window != 'undefined'){
+    window.getFieldSearchable = getFieldSearchable;
+}
+
 var index = /*#__PURE__*/Object.freeze({
   __proto__: null,
   OMIT_FIELDS: OMIT_FIELDS,
@@ -5988,12 +6008,12 @@ function getScriptForRewriteValueForFileFields(fields){
                                 });
                             }
                         }else{
-                            data[item] = {
+                            data[item] = [{
                                 value: fileFieldValue,
                                 name: fileFieldDisplayValue.name,
                                 url: fileFieldDisplayValue.url + "?download=true",
                                 state: "uploaded"
-                            };
+                            }];
                         }
                     }
                 })
@@ -6069,12 +6089,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){
@@ -6091,12 +6111,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}"
@@ -6503,6 +6526,8 @@ async function getObjectForm(objectSchema, ctx){
         },
         labelAlign,
         persistData: false,
+        resetAfterSubmit: true,
+        preventEnterSubmit: true,
         promptPageLeave: true,
         canAccessSuperData: false,
         name: `form_edit_${recordId}`,
@@ -6540,10 +6565,14 @@ async function getObjectForm(objectSchema, ctx){
                 },
                 "expression": `\${_master.objectName != '${objectSchema.name}' && _master.objectName}`
               },
-              {
-                "args": {},
-                "actionType": "closeDialog"
-              }
+              // {
+              //   "actionType": "custom",
+              //   "script": "debugger;"
+              // },
+              // {
+              //   "args": {},
+              //   "actionType": "closeDialog"
+              // }
             ]
           }
         }
@@ -6711,6 +6740,13 @@ async function getTableColumns(fields, options){
             }else if(field.type === 'html'){
                 type = 'markdown';
             }
+            let className = "";
+            if(field.type === 'textarea'){
+                className = 'min-w-56';
+            }
+            if(field.wrap === false){
+                className += " whitespace-nowrap";
+            }
             if(!field.hidden && !field.extra){
                 columns.push(Object.assign({}, {
                     name: field.name,
@@ -6721,7 +6757,7 @@ async function getTableColumns(fields, options){
                     type: type,
                     tpl: tpl,
                     toggled: field.toggled,
-                    className: field.type === 'textarea' ? 'min-w-56 whitespace-pre-wrap textarea' :  "whitespace-nowrap",
+                    className,
                     html: field.type === 'html' ? true : null
                     // toggled: true 
                 }, field.amis, {name: field.name}));
@@ -7061,13 +7097,17 @@ async function getTableApi(mainObject, fields, options){
     }
 
     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;
@@ -7213,7 +7253,6 @@ async function getTableApi(mainObject, fields, options){
             if(_.isEmpty(filters)){
                 filters = userFilters;
             }else{
-                filters.push('and');
                 filters.push(userFilters)
             }
         }
@@ -7251,29 +7290,9 @@ 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 records = payload.data.rows || [];
+        const getTreeOptions = SteedosUI.getTreeOptions
+        payload.data.rows = getTreeOptions(records,{"valueField":"_id"});
     }
 
 
@@ -7661,7 +7680,6 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
     // ObjectForm会认作用域下的变量值
     // TODO: 待组件支持initValues属性后应该改掉，不应该通过data直接传值
     // TODO: 全天事件属性传入doc了但是没有生效，需要手动在ObjectForm中勾选全天事件
-    event.data = doc;
     const title = "新建 ${objectSchema.label}";
     doAction(
       {
@@ -7674,6 +7692,7 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
               "type": "steedos-object-form",
               "objectApiName": "\${objectName}",
               "mode": "edit",
+              "defaultData": doc,
               "onEvent": {
                 "submitSucc": {
                   "weight": 0,
@@ -7966,7 +7985,7 @@ const getRecordPermissions = async (objectName, recordId)=>{
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2023-04-11 13:13:00
+ * @LastEditTime: 2023-04-20 11:43:14
  * @Description:
  */
 
@@ -8063,10 +8082,12 @@ 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];
+                    if(!has(mainRelated,arr[0])){
+                        mainRelated[arr[0]] = arr[1];
+                    }
                 }
             }
         }
@@ -8271,13 +8292,17 @@ async function getRelatedListSchema(
     delete ctx.globalFilter;
 
     const adaptor = `
-        if(setDataToComponentId){
-            if(payload.data.count){
-                setTimeout(function(){
-                    window.$("." + setDataToComponentId + " .antd-Crud").removeClass("hidden");
-                }, 10);
-            }
-        };
+        try{
+            if(setDataToComponentId){
+                if(payload.data.count){
+                    setTimeout(function(){
+                        window.$("." + setDataToComponentId + " .antd-Crud").removeClass("hidden");
+                    }, 10);
+                }
+            };
+        }catch(e){
+            console.log(e);
+        }
     `;
     const amisSchema = {
         "type": "steedos-object-table",
@@ -8288,7 +8313,8 @@ async function getRelatedListSchema(
         "filtersFunction": filtersFunction,
         "sort": listViewSort,
         "filterVisible": false,
-        adaptor,
+        "requestAdaptor": ctx.requestAdaptor,  
+        "adaptor": adaptor + ctx.adaptor || '',
         "ctx": ctx
     };
     // console.log(`getRelatedListSchema amisSchema`, amisSchema);