@steedos-widgets/amis-lib 1.3.4-beta.9 → 1.3.5

package/dist/index.cjs.js

@@ -470,8 +470,8 @@ function getLookupListView(refObjectConfig) {
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-05-23 09:53:08
- * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-09-19 14:38:39
+ * @LastEditors: liaodaxue
+ * @LastEditTime: 2023-10-11 17:32:17
  * @Description: 
  */
 
@@ -532,7 +532,7 @@ function getSelectMap(selectOptions){
         if(optionColor){
             const background = optionColor.charAt(0) === '#' ? optionColor : '#'+optionColor;
             const color = getContrastColor(background);
-            const optionColorStyle = 'background:'+background+';color:'+color;
+            const optionColorStyle = 'background:'+background+';color:'+color+';line-height:1.5rem';
             map[optionValue] = `<span class="rounded-xl px-2 py-1" style='${optionColorStyle}'>${option.label}</span>`;
         }else {
             map[optionValue] = option.label;
@@ -989,17 +989,17 @@ async function getFindQuery(object, recordId, fields, options){
     }
 
     const countQuery = options.count === false ? "" : `,count:${object.name}__count(filters:{__filters})`;
-    const moreQuerie = options.moreQueries?.length ? ("," + options.moreQueries.map(function(item){
-        // 把最外层的{}去除
-        return item.replace(/^{/,"").replace(/}$/,"");
-    }).join(",")) : "";
+    // const moreQuerie = options.moreQueries?.length ? ("," + options.moreQueries.map(function(item){
+    //     // 把最外层的{}去除
+    //     return item.replace(/^{/,"").replace(/}$/,"");
+    // }).join(",")) : "";
 
     return {
         orderBy: "${orderBy}",
         orderDir: "${orderDir}",
         pageNo: "${page}",
         pageSize: "${perPage}",
-        query: `{${alias}:${object.name}${queryOptions}{${await getFieldsTemplate(fields, options.expand)}${treeFields}${cfsFields}}${countQuery}${moreQuerie}}`
+        query: `{${alias}:${object.name}${queryOptions}{${await getFieldsTemplate(fields, options.expand)}${treeFields}${cfsFields}}${countQuery}}`
     }
 }
 
@@ -1791,6 +1791,13 @@ async function getSelectUserSchema(field, readonly, ctx) {
     return amisSchema;
 }
 
+/*
+ * @Author: 殷亮辉 yinlianghui@hotoa.com
+ * @Date: 2023-03-22 09:31:21
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2023-11-05 16:31:38
+ */
+
 const globalTag = '__G_L_O_B_A_L__';
 
 const getParentPath = function (path) {
@@ -1830,7 +1837,43 @@ const isExpression = function (func) {
     return false;
 };
 
+const getMoment$1 = () => {
+    if (window.amisRequire) {
+        return window.amisRequire("moment");
+    } else if (window.moment) {
+        return window.moment;
+    }
+};
+
+const getGlobalNowData = () => {
+    let now = new Date();
+    let moment = getMoment$1();
+    let today = moment().utc();
+    today.set("hours", 0);
+    today.set("minutes", 0);
+    today.set("seconds", 0);
+    today.set("milliseconds", 0);
+    today = today.toDate();
+    let timeNow = moment();
+    timeNow.set("year", 1970);
+    timeNow.set("month", 0);
+    timeNow.set("date", 1);
+    timeNow.set("hours", timeNow.hours() + timeNow.utcOffset() / 60);
+    timeNow.set("seconds", 0);
+    timeNow.set("milliseconds", 0);
+    timeNow = timeNow.toDate();
+    return {
+        now,
+        today,
+        timeNow
+    };
+};
+
 const parseSingleExpression = function (func, formData, dataPath, global, userSession = {}) {
+    if (global) {
+        Object.assign(global, getGlobalNowData());
+    }
+
     var error, funcBody, parent, parentPath, str;
 
     if (formData === void 0) {
@@ -2597,20 +2640,29 @@ function getButtonVisibleOn$1(button){
         //     return 'false';
         // }
         if(visible.trim().startsWith('function')){
-            return `${visible}.apply({
+            visible = `${visible}.apply({
                 object: uiSchema
-            }, [objectName, typeof _id === 'undefined' ? null: _id, typeof record === 'undefined' ? (typeof recordPermissions === 'undefined' ? {} : recordPermissions) : record.recordPermissions, data])`
+            }, [objectName, typeof _id === 'undefined' ? null: _id, typeof record === 'undefined' ? (typeof recordPermissions === 'undefined' ? {} : recordPermissions) : record.recordPermissions, data])`;
         }
-        return visible;
     }
 
     if(button.type === 'amis_button'){
-        const amisSchema = button.amis_schema;
+        let amisSchema = button.amis_schema;
+        if(___namespace.isString(amisSchema)){
+            amisSchema = JSON.parse(amisSchema);
+        }
         if(amisSchema && amisSchema.body && amisSchema.body.length > 0){
             const btn1 = amisSchema.body[0];
-            return btn1.visibleOn
+            if(___namespace.hasIn(btn1, 'visibleOn')){
+                /*  当含有“更多”按钮或者“下拉”箭头按钮时，单个按钮的visibleOn需要合并到 “更多”按钮或者“下拉”箭头按钮的 visibleOn 中，用||隔开。
+                    visibleOn的格式需要保持一致； 不能是 js  和  ${xxx} 混合的表达式；
+                    visibleOn的值需要是js格式，因为默认的编辑、删除等系统按钮的visibleOn的格式就是js格式（function(){}）; 
+                */
+                return btn1.visibleOn
+            }   
         }
     }
+    return visible;
 }
 
 const getButtonVisible = (button, ctx) => {
@@ -2936,9 +2988,30 @@ const getObjectDetailHeaderButtons = (objectSchema, recordId)=>{
 const getObjectDetailButtonsSchemas = (objectSchema, recordId, ctx)=>{
     const { buttons, moreButtons, moreButtonsVisibleOn } = getObjectDetailHeaderButtons(objectSchema, recordId);
     if(ctx.formFactor === 'SMALL'){
+        const dropdownButtons = [
+            ...___namespace.map(buttons, (button) => {
+                button.className += ' w-full';
+                return button;
+            }),
+            ...___namespace.map(moreButtons, (button) => {
+                button.className += ' w-full';
+                return button;
+            })
+        ];
+
+        let phoneMoreButtonsVisibleOn = '';
+        ___namespace.forEach(dropdownButtons, (button, index) => {
+            if(index === 0){
+                phoneMoreButtonsVisibleOn = button.visibleOn;
+            }else {
+                phoneMoreButtonsVisibleOn = phoneMoreButtonsVisibleOn + ' || ' + button.visibleOn;
+            }
+        });
+
         return {
             "type": "button",
             "icon": "fa fa-angle-down",
+            "visibleOn": phoneMoreButtonsVisibleOn,
             "onEvent": {
               "click": {
                 "actions": [
@@ -2954,16 +3027,7 @@ const getObjectDetailButtonsSchemas = (objectSchema, recordId, ctx)=>{
                           "id": "u:fd837823be5b",
                           "vertical": true,
                           "tiled": true,
-                          "buttons": [
-                            ...___namespace.map(buttons, (button)=>{
-                                button.className += ' w-full';
-                                return button;
-                            }),
-                            ...___namespace.map(moreButtons, (button)=>{
-                                button.className += ' w-full';
-                                return button;
-                            })
-                          ],
+                          "buttons": dropdownButtons,
                           "btnLevel": "enhance",
                           "className": "w-full",
                           "btnClassName": "w-full",
@@ -3334,7 +3398,8 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     if(isLookup){
       searchableFieldsStoreKey += "/lookup/" + objectName;
     }
-    let defaultSearchableFields = sessionStorage.getItem(searchableFieldsStoreKey);
+    searchableFieldsStoreKey = searchableFieldsStoreKey + "/" + (data.context && data.context.userId);
+    let defaultSearchableFields = localStorage.getItem(searchableFieldsStoreKey);
     if(defaultSearchableFields){
       defaultSearchableFields = defaultSearchableFields.split(",");
     }
@@ -3403,7 +3468,8 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     if(isLookup){
       searchableFieldsStoreKey += "/lookup/" + objectName;
     }
-    sessionStorage.setItem(searchableFieldsStoreKey, value);
+    searchableFieldsStoreKey = searchableFieldsStoreKey + "/" + (data.context && data.context.userId);
+    localStorage.setItem(searchableFieldsStoreKey, value);
 
     // ===START===:当变更可搜索字段时，如果被移除的可搜索字段在本地存储中已经存入过滤条件中则应该清除本地存储中相关字段的过滤条件。
     const searchableFields = data.fields;
@@ -4369,7 +4435,8 @@ const getCopyListviewButtonSchema = ()=>{
                         "&": "${list_view}",
                         "name":"",
                         "label": i18next__default["default"].t('frontend_listview_control_clone_defaultData_label_start') + " ${list_view.label} " + i18next__default["default"].t('frontend_listview_control_clone_defaultData_label_end'),
-                        "shared":false
+                        "shared":false,
+                        "object_name": "${targetObjectName}",
                       },
                       "fieldsExtend": fieldsExtend$3(),
                       "fields": fields(),
@@ -5157,7 +5224,7 @@ let resizeWindow = function(){
   //触发amis crud 高度重算
   setTimeout(()=>{
     window.dispatchEvent(new Event("resize"))
-  }, 500);
+  }, 1000);
 }
 resizeWindow();
 // 手机端在显示搜索栏时隐藏crud上的刷新按钮，因为点击后crud高度显示有问题
@@ -5394,6 +5461,7 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
 }
 
 function getObjectFooterToolbar(mainObject, formFactor, options) {
+  // crud card模式与table模式两种情况下showPageInput默认值不一样，所以需要显式设置为false
   if (formFactor === 'SMALL') {
     // return [
     //   "load-more",
@@ -5403,14 +5471,17 @@ function getObjectFooterToolbar(mainObject, formFactor, options) {
         "switch-per-page",
         {
           "type": "pagination",
-          "maxButtons": 5
+          "maxButtons": 5,
+          "showPageInput": false
         }
       ]
     }else {
       return [
+        // "statistics",
         {
           "type": "pagination",
-          "maxButtons": 5
+          "maxButtons": 5,
+          "showPageInput": false
         }
       ]
     }
@@ -5419,16 +5490,31 @@ function getObjectFooterToolbar(mainObject, formFactor, options) {
     if(options && options.isRelated){
       return [
         "statistics",
-        "pagination"
+        {
+          "type": "pagination",
+          "maxButtons": 10,
+          "showPageInput": false
+        }
       ]
 
     }
     else {
-      return [
-        "switch-per-page",
+      const no_pagination = mainObject.paging && (mainObject.paging.enabled === false);
+      const is_lookup = options.isLookup;
+      const commonConfig = [
         "statistics",
-        "pagination"
-      ]
+        {
+          "type": "pagination",
+          "maxButtons": 10,
+          "showPageInput": false
+        }
+      ];
+
+      if (no_pagination && is_lookup) {
+        return commonConfig;
+      } else {
+        return ["switch-per-page", ...commonConfig];
+      }
     }
   }
 }
@@ -6065,13 +6151,15 @@ async function lookupToAmisPicker(field, readonly, ctx){
         pickerSchema.headerToolbar = getObjectHeaderToolbar(refObjectConfig, fieldsArr, ctx.formFactor, { headerToolbarItems, isLookup: true, keywordsSearchBoxName });
         const isAllowCreate = refObjectConfig.permissions.allowCreate;
         const isCreate = ___namespace.isBoolean(field.create) ? field.create : true;
-        if (isAllowCreate && isCreate) {
+        // lookup字段配置过滤条件就强制不显示新建按钮
+        let isHasFilters = (field.filters || 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";
             // 保持快速搜索放在最左侧，新建按钮往里插，而不是push到最后
             pickerSchema.headerToolbar.splice(pickerSchema.headerToolbar.length - 1, 0, new_button);
         }
-        pickerSchema.footerToolbar = refObjectConfig.enable_tree ? [] : getObjectFooterToolbar();
+        pickerSchema.footerToolbar = refObjectConfig.enable_tree ? [] : getObjectFooterToolbar(refObjectConfig,ctx.formFactor,{isLookup: true});
         if (ctx.filterVisible !== false) {
             pickerSchema.filter = await getObjectFilter(refObjectConfig, fields, {
                 ...ctx,
@@ -6199,10 +6287,10 @@ async function lookupToAmisSelect(field, readonly, ctx){
     // const labelFieldKey = referenceTo && referenceTo.labelField?.name || 'name';
 
     let apiInfo;
-
+    let defaultValueOptionsQueryData;
     if(referenceTo){
         // 字段值单独走一个请求合并到source的同一个GraphQL接口中
-        const defaultValueOptionsQueryData = await getFindQuery({ name: referenceTo.objectName }, null, [
+        defaultValueOptionsQueryData = await getFindQuery({ name: referenceTo.objectName }, null, [
             Object.assign({}, referenceTo.labelField, {alias: 'label'}),
             Object.assign({}, referenceTo.valueField, {alias: 'value'})
         ], {
@@ -6215,7 +6303,7 @@ async function lookupToAmisSelect(field, readonly, ctx){
         }, null, [
             Object.assign({}, referenceTo.labelField, {alias: 'label'}),
             Object.assign({}, referenceTo.valueField, {alias: 'value'})
-        ], {expand: false, alias: 'options', queryOptions: `filters: {__filters}, top: {__top}, sort: "{__sort}"`, moreQueries: [defaultValueOptionsQueryData.query]});
+        ], {expand: false, alias: 'options', queryOptions: `filters: {__filters}, top: {__top}, sort: "{__sort}"`});
 
         apiInfo.adaptor = `
             const data = payload.data;
@@ -6309,11 +6397,16 @@ async function lookupToAmisSelect(field, readonly, ctx){
         var optionsFiltersOp = "${field.multiple ? "in" : "="}";
         var optionsFilters = [["${valueFieldKey}", optionsFiltersOp, []]];
         if (defaultValue && !api.data.$term) { 
+            const defaultValueOptionsQueryData = ${JSON.stringify(defaultValueOptionsQueryData)};
+            const defaultValueOptionsQuery = defaultValueOptionsQueryData?.query?.replace(/^{/,"").replace(/}$/,"");
             // 字段值单独请求，没值的时候在请求中返回空
             optionsFilters = [["${valueFieldKey}", optionsFiltersOp, defaultValue]];
             if(filters.length > 0){
                 optionsFilters = [filters, optionsFilters];
             }
+            if(defaultValueOptionsQuery){
+                api.data.query = "{"+api.data.query.replace(/^{/,"").replace(/}$/,"")+","+defaultValueOptionsQuery+"}";
+            } 
         }
         api.data.query = api.data.query.replace(/{__options_filters}/g, JSON.stringify(optionsFilters));
         return api;
@@ -6355,7 +6448,7 @@ async function lookupToAmisSelect(field, readonly, ctx){
         disabledOn:  `${readonly} || ( (this._master && (this._master.relatedKey ==='${field.name}')) || ((this.relatedKey ==='${field.name}') && (${field.multiple} != true)) )`,
         // labelField: labelField,
         // valueField: valueField,
-        source: apiInfo,
+        // source: apiInfo,
         autoComplete: apiInfo,
         searchable: true,
     };
@@ -6434,10 +6527,10 @@ async function lookupToAmis(field, readonly, ctx){
 
     const refObject = await getUISchema(referenceTo.objectName);
 
-    // 此处不参考 steedos 的 enable_enhanced_lookup 规则. 如果默认是开启弹出选择,用户选择过程操作太繁琐, 所以默认是关闭弹出选择.
-    // 由于amis picker 目前不支持联动, 配置了depend_on时, 使用使用select ,以支持联动
-    // TODO: 确认 amis picker 支持联动时, 清理field.depend_on判断
-    if(refObject.enable_enhanced_lookup == true && ___namespace.isEmpty(field.depend_on)){
+    // 优先取字段中配置的enable_enhanced_lookup，字段上没配置时，才从对象上取enable_enhanced_lookup属性
+    let enableEnhancedLookup = ___namespace.isBoolean(field.enable_enhanced_lookup) ? field.enable_enhanced_lookup : refObject.enable_enhanced_lookup;
+    // 默认使用下拉框模式显示lookup选项，只能配置了enable_enhanced_lookup才使用弹出增强模式
+    if(enableEnhancedLookup == true){
         return await lookupToAmisPicker(field, readonly, ctx);
     }else if(refObject.enable_tree) {
         return await lookupToAmisTreeSelect(field, readonly, Object.assign({}, ctx, {
@@ -6754,8 +6847,8 @@ function getAmisStaticFieldType(type, readonly, options){
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-10-28 14:15:09
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2022-11-02 18:06:16
+ * @LastEditors: liaodaxue
+ * @LastEditTime: 2023-10-30 17:51:54
  * @Description: 
  */
 
@@ -6806,11 +6899,26 @@ const getAmisFileEditSchema = (steedosField)=>{
         useChunk: false, // 关闭分块上传
         receiver: {
             method: "post",
+            dataType: "form-data",
             url: `\${context.rootUrl}/s3/${tableName}`,
-            data: {
-                $: "$$",
-                context: `\${context}`,
-            },
+            requestAdaptor: `
+                const { _master, global,context } = api.body;
+                // const { recordId, objectName } = _master;
+                const { spaceId, userId, user } = global;
+                /*
+                    record_id: recordId,
+                    parent: recordId,
+                    object_name: objectName,
+                    owner_name: user.name,
+                    space: spaceId,
+                    owner: userId
+                */
+                // 参考platform 2.2版本，附件字段保存时cfs.files.filerecord、cfs.images.filerecord表中的metadata下只保存space、owner两个属性值。
+                api.data.append('space', spaceId);
+                api.data.append('owner', userId);
+
+                return api;
+            `,
             adaptor: `
                 const { context } = api.body; 
                 var rootUrl = context.rootUrl + "/api/files/${tableName}/";
@@ -6996,8 +7104,6 @@ function getSelectFieldOptions(field){
 }
 
 async function convertSFieldToAmisField(field, readonly, ctx) {
-    // console.log('convertSFieldToAmisField====>', field, readonly, ctx)
-    const isMobile = window.innerWidth <= 768;
     // 创建人和修改人、创建时间和修改时间不显示
     if(___namespace.includes(OMIT_FIELDS, field.name) && ctx.showSystemFields != true){
         return;
@@ -7086,26 +7192,33 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             };
             break;
         case 'date':
-            convertData = isMobile && !readonly ? {
-                type: "native-date",
-                pipeIn: (value, data) => {
-                    if (value) {
-                        value = moment(value).utc().format('YYYY-MM-DD');
-                        return value;
-                    } else {
-                        return "";
-                    }
-
-                },
-                pipeOut: (value, oldValue, data) => {
-                    if (value) {
-                        value = moment(value).format('YYYY-MM-DDT00:00:00.000[Z]');
-                        return value;
-                    } else {
-                        return "";
-                    }
-                }
-            } : {
+            // convertData = isMobile && !readonly ? {
+            //     type: "native-date",
+            //     pipeIn: (value, data) => {
+            //         if (value) {
+            //             value = moment(value).utc().format('YYYY-MM-DD');
+            //             return value;
+            //         } else {
+            //             return "";
+            //         }
+
+            //     },
+            //     pipeOut: (value, oldValue, data) => {
+            //         if (value) {
+            //             value = moment(value).format('YYYY-MM-DDT00:00:00.000[Z]');
+            //             return value;
+            //         } else {
+            //             return "";
+            //         }
+            //     }
+            // } : {
+            //     type: getAmisStaticFieldType('date', readonly),
+            //     inputFormat: "YYYY-MM-DD",
+            //     format:'YYYY-MM-DDT00:00:00.000[Z]',
+            //     tpl: readonly ? Tpl.getDateTpl(field) : null,
+            //     // utc: true
+            // }
+            convertData = {
                 type: getAmisStaticFieldType('date', readonly),
                 inputFormat: "YYYY-MM-DD",
                 format:'YYYY-MM-DDT00:00:00.000[Z]',
@@ -7124,43 +7237,51 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             };
             break;
         case 'datetime':
-            convertData = isMobile && !readonly ? {
-                type: "combo",
-                pipeIn: (value, data) => {
-                    let revalue = {};
-                    if (value && value != "Invalid date") {
-                        value = moment(value).format('YYYY-MM-DD HH:mm:ss');
-                        revalue[field.name + "-native-date"] = value.split(' ')[0];
-                        revalue[field.name + "-native-time"] = value.split(' ')[1];
-                    } else {
-                        revalue[field.name + "-native-date"] = "";
-                        revalue[field.name + "-native-time"] = "";
-                    }
-                    return revalue;
-                },
-                pipeOut: (value, oldValue, data) => {
-                    let revalue = "";
-                    if (value[field.name + "-native-date"] && value[field.name + "-native-time"]) {
-                        revalue = value[field.name + "-native-date"] + " " + value[field.name + "-native-time"];
-                        revalue = moment(revalue).utc().format('YYYY-MM-DDTHH:mm:ss.SSS[Z]');
-                    }
-                    return revalue;
-                },
-                items: [
-                    {
-                        type: "native-date",
-                        name: field.name + "-native-date",
-                        className: "steedos-native-date",
-                        value: ""
-                    },
-                    {
-                        type: "native-time",
-                        name: field.name + "-native-time",
-                        className: "steedos-native-time",
-                        value: ""
-                    }
-                ]
-            } : {
+            // convertData = isMobile && !readonly ? {
+            //     type: "combo",
+            //     pipeIn: (value, data) => {
+            //         let revalue = {};
+            //         if (value && value != "Invalid date") {
+            //             value = moment(value).format('YYYY-MM-DD HH:mm:ss');
+            //             revalue[field.name + "-native-date"] = value.split(' ')[0];
+            //             revalue[field.name + "-native-time"] = value.split(' ')[1];
+            //         } else {
+            //             revalue[field.name + "-native-date"] = "";
+            //             revalue[field.name + "-native-time"] = "";
+            //         }
+            //         return revalue;
+            //     },
+            //     pipeOut: (value, oldValue, data) => {
+            //         let revalue = "";
+            //         if (value[field.name + "-native-date"] && value[field.name + "-native-time"]) {
+            //             revalue = value[field.name + "-native-date"] + " " + value[field.name + "-native-time"];
+            //             revalue = moment(revalue).utc().format('YYYY-MM-DDTHH:mm:ss.SSS[Z]');
+            //         }
+            //         return revalue;
+            //     },
+            //     items: [
+            //         {
+            //             type: "native-date",
+            //             name: field.name + "-native-date",
+            //             className: "steedos-native-date",
+            //             value: ""
+            //         },
+            //         {
+            //             type: "native-time",
+            //             name: field.name + "-native-time",
+            //             className: "steedos-native-time",
+            //             value: ""
+            //         }
+            //     ]
+            // } : {
+            //     type: getAmisStaticFieldType('datetime', readonly),
+            //     inputFormat: 'YYYY-MM-DD HH:mm',
+            //     format: 'YYYY-MM-DDTHH:mm:ss.SSSZ',
+            //     tpl: readonly ? Tpl.getDateTimeTpl(field) : null,
+            //     utc: true,
+            // }
+
+            convertData = {
                 type: getAmisStaticFieldType('datetime', readonly),
                 inputFormat: 'YYYY-MM-DD HH:mm',
                 format: 'YYYY-MM-DDTHH:mm:ss.SSSZ',
@@ -7180,26 +7301,34 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             };
             break;
         case 'time':
-            convertData = isMobile && !readonly ? {
-                type: "native-time",
-                pipeIn: (value, data) => {
-                    if (value) {
-                        value = moment(value).utc().format('HH:mm');
-                        return value;
-                    } else {
-                        return "";
-                    }
-
-                },
-                pipeOut: (value, oldValue, data) => {
-                    if (value) {
-                        value = moment('1970-01-01 ' + value).format('1970-01-01THH:mm:00.000[Z]');
-                        return value;
-                    } else {
-                        return "";
-                    }
-                }
-            } : {
+            // convertData = isMobile && !readonly ? {
+            //     type: "native-time",
+            //     pipeIn: (value, data) => {
+            //         if (value) {
+            //             value = moment(value).utc().format('HH:mm');
+            //             return value;
+            //         } else {
+            //             return "";
+            //         }
+
+            //     },
+            //     pipeOut: (value, oldValue, data) => {
+            //         if (value) {
+            //             value = moment('1970-01-01 ' + value).format('1970-01-01THH:mm:00.000[Z]');
+            //             return value;
+            //         } else {
+            //             return "";
+            //         }
+            //     }
+            // } : {
+            //     type: getAmisStaticFieldType('time', readonly),
+            //     inputFormat: 'HH:mm',
+            //     timeFormat:'HH:mm',
+            //     format:'1970-01-01THH:mm:00.000[Z]',
+            //     tpl: readonly ? Tpl.getDateTimeTpl(field) : null,
+            //     // utc: true
+            // }
+            convertData = {
                 type: getAmisStaticFieldType('time', readonly),
                 inputFormat: 'HH:mm',
                 timeFormat:'HH:mm',
@@ -7249,7 +7378,20 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
                     type: getAmisStaticFieldType('number', readonly),
                     min: field.min,
                     max: field.max,
-                    precision: field.scale
+                    precision: field.scale,
+                    suffix: "%",
+                    pipeIn: (value, data) => {
+                        if(value){
+                            return value*100;
+                        }
+                        return value;
+                    },
+                    pipeOut: (value, oldValue, data) => {
+                        if(value){
+                            return value/100;
+                        }
+                        return value;
+                    },
                 };
             }
             break;
@@ -7661,8 +7803,41 @@ var config = {
 };
 
 async function getQuickEditSchema(field, options){
-    const quickEditId = options.objectName + "_" + field.name + "QuickEdit";//定义快速编辑的表单id，用于setvalue传值
+    //判断在amis3.2以上环境下，放开批量编辑
+    const isAmisVersionforBatchEdit = amisRequire('amis').version[0] >= 3 && amisRequire('amis').version[2] >= 2;
+    const quickEditId = options.objectName + "_" + field.name + "_quickEdit";//定义快速编辑的表单id，用于setvalue传值
     var quickEditSchema = { body: [], id: quickEditId };
+    //select,avatar,image,file等组件无法行记录字段赋值，暂不支持批量编辑；
+    if(field.type != 'avatar' && field.type != 'image' && field.type != 'file' && isAmisVersionforBatchEdit){
+        const submitEvent = {
+            submit: {
+                actions: [
+                    {
+                        actionType: "custom",
+                        script: `
+                            let items = _.cloneDeep(event.data.items);
+                            let selectedItems = _.cloneDeep(event.data.selectedItems);
+                            if(event.data.isBatchEdit){
+                                selectedItems.forEach(function(selectedItem){
+                                    selectedItem._display.${field.name} = event.data._display.${field.name};
+                                    doAction({actionType: 'setValue', "args": {"value": selectedItem._display},componentId: "_display_" + selectedItem._index});
+                                    doAction({actionType: 'setValue', "args": {"value": event.data.${field.name}},componentId: "${options.objectName + "_" + field.name + "_"}" + selectedItem._index});
+                                })
+                            }else{
+                                doAction({actionType: 'setValue', "args": {"value": event.data._display},componentId: "_display_" + event.data._index});
+                                doAction({actionType: 'setValue', "args": {"value": event.data.${field.name}},componentId: "${options.objectName + "_" + field.name + "_"}" + event.data._index});
+                            }
+                        `
+                    },
+                    {
+                        "actionType": "closeDialog"
+                    }
+                ]
+            }
+        };
+        quickEditSchema.onEvent = submitEvent;
+    }
+    
     if (field.disabled) {
         quickEditSchema = false;
     } else {
@@ -7679,7 +7854,7 @@ async function getQuickEditSchema(field, options){
                         {
                             "actionType": "custom",
                             "script": `
-                                    var _display = event.data._display;
+                                    var _display = _.cloneDeep(event.data._display);
                                     ${displayField}
                                     doAction({actionType: 'setValue', "args": {"value": {_display}},componentId: "${quickEditId}"});
                                 `
@@ -7701,7 +7876,7 @@ async function getQuickEditSchema(field, options){
                             第二种是增加选项时，按照value的值，找到对应选项，并按照_display的规则为其赋值
                         */
                         TempDisplayField = `
-                            const preData = event.data.__super.${field.name};
+                            const preData = _.cloneDeep(event.data.__super.${field.name});
                             if(preData && event.data.${field.name}.length < preData.length){
                                 let deletedIndex;
                                 preData.forEach(function(item,index){
@@ -7745,7 +7920,7 @@ async function getQuickEditSchema(field, options){
                     break;
                 case "percent":
                     TempDisplayField = `
-                            _display["${field.name}"] = (event.data.value * 100).toFixed(${field.scale}) + '%';
+                            _display["${field.name}"] = event.data.value.toFixed(${field.scale}) + '%';
                         `;
                     quickEditSchema.body[0].onEvent["change"] = quickEditOnEvent(TempDisplayField);
                     break;
@@ -7896,6 +8071,131 @@ async function getQuickEditSchema(field, options){
                 }
                 
             });
+            if(field.type != 'avatar' && field.type != 'image' && field.type != 'file' && isAmisVersionforBatchEdit){
+                quickEditSchema.body.push({
+                    "name": "isBatchEdit",
+                    "type": "checkbox",
+                    "option": [
+                        {
+                            "type": "tpl",
+                            "tpl": "更新${COUNT(selectedItems)}个选定记录"
+                        },
+                        {
+                            "type": "spinner",
+                            "showOn": "${batchPermissionLoading}",
+                            "size": "sm",
+                            "className": "mr-4"
+                        }
+                    ],
+                    "visibleOn": "${ARRAYSOME(selectedItems, item => item._id === _id) && COUNT(selectedItems)>1 && quickedit_record_permissions.allowEdit && quickedit_record_permissions_loading == false}",
+                    "disabledOn": "${batchPermissionLoading}",
+                    "onEvent":{
+                        "change":{
+                            "actions":[
+                                {
+                                    "actionType": "setValue",
+                                    "componentId": quickEditId,
+                                    "args": {
+                                        "value":{
+                                            "batchPermissionLoading": true
+                                        }
+                                    },
+                                    "expression":"${event.data.value}"
+                                },
+                                {
+                                    "actionType": "ajax",
+                                    "args": {
+                                        "api": {
+                                          "url": "${context.rootUrl}/graphql",
+                                          "method": "post",
+                                          "headers": {
+                                            "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                                          },
+                                          "data": {
+                                            "query": "{rows:${objectName}(filters:[\"_id\",\"in\",${selectedItems | pick:_id | split | json}]){_id,_permissions{allowEdit}}}"
+                                          },
+                                          "adaptor": `
+                                            const noPermission = [];
+                                            payload.data.rows.forEach(function (row) {
+                                                if(!row._permissions.allowEdit){
+                                                    noPermission.push(row._id);
+                                                }
+                                            })
+                                            payload.data.noPermission = noPermission;
+                                            return payload;
+                                          `
+                                        }
+                                    },
+                                    "expression":"${event.data.value}"
+                                },
+                                {
+                                    "actionType": "setValue",
+                                    "componentId": quickEditId,
+                                    "args": {
+                                        "value":{
+                                            "batchPermissionLoading": false
+                                        }
+                                    },
+                                    "expression":"${event.data.value}"
+                                },
+                                {
+                                    "actionType": "dialog",
+                                    "dialog":{
+                                        "title": "记录权限",
+                                        "showCloseButton": false,
+                                        "body":[
+                                            {
+                                                "type": "tpl",
+                                                "tpl": "当前选中记录中，有${COUNT(noPermission)}条记录无编辑权限，是否需要批量编辑其他记录？"
+                                            }
+                                        ],
+                                        "onEvent":{
+                                            "confirm":{
+                                                "actions":[
+                                                    {
+                                                        "actionType": "custom",
+                                                        "script": `
+                                                            const noPermission = event.data.noPermission;
+                                                            const crudComponent = event.context.scoped.getComponentById("${options.crudId}");
+                                                            const selectedItems = crudComponent && crudComponent.props.store.selectedItems.concat();
+                                                            noPermission.forEach(function (item) {
+                                                                crudComponent && crudComponent.unSelectItem(_.find(selectedItems,{_id:item}));
+                                                            })
+                                                        `
+                                                    },
+                                                    {
+                                                        "actionType": "setValue",
+                                                        "componentId": quickEditId,
+                                                        "args": {
+                                                            "value":{
+                                                                "isBatchEdit": true
+                                                            }
+                                                        },
+                                                    }
+                                                ]
+                                            },
+                                            "cancel":{
+                                                "actions":[
+                                                    {
+                                                        "actionType": "setValue",
+                                                        "componentId": quickEditId,
+                                                        "args": {
+                                                            "value":{
+                                                                "isBatchEdit": false
+                                                            }
+                                                        },
+                                                    }
+                                                ]
+                                            }
+                                        }
+                                    },
+                                    "expression":"${COUNT(event.data.noPermission)>0}"
+                                }
+                            ]
+                        }
+                    }
+                });
+            }
         } else {
             quickEditSchema = false;
         }
@@ -7930,6 +8230,8 @@ async function getTableColumns(fields, options){
     const columns = [];
     if(!options.isLookup){
         columns.push({name: '_index',type: 'text', width: 32, placeholder: ""});
+        //将_display放入crud的columns中，可以通过setvalue修改行内数据域的_display，而不影响上层items的_display,用于批量编辑
+        columns.push({name: '_display',type: 'static', width: 32, placeholder: "",id: "_display_${_index}", className: "hidden"});
     }
     const allowEdit = options.permissions?.allowEdit && !options.isLookup && options.enable_inline_edit != false;
     
@@ -7961,7 +8263,7 @@ async function getTableColumns(fields, options){
                         {
                             "args": {
                                 "api": {
-                                    "url": "${context.rootUrl}/api/files/files/${versions[0]}?download=true",
+                                    "url": "${(versions[0] && versions[0].url) ? versions[0].url+'?download=true' : context.rootUrl+'/api/files/files/'+versions[0]+'?download=true'}",
                                     "method": "get",
                                     "headers": {
                                         "Authorization": "Bearer ${context.tenantId},${context.authToken}"
@@ -8008,7 +8310,7 @@ async function getTableColumns(fields, options){
         else if(field.type === 'select'){
             const map = getSelectMap(field.options);
             columnItem = Object.assign({}, {
-                type: "mapping",
+                type: "static-mapping",
                 name: field.name,
                 label: field.label,
                 map: map,
@@ -8023,7 +8325,7 @@ async function getTableColumns(fields, options){
             const tpl = await getFieldTpl(field, options);
             let type = 'text';
             if(tpl){
-                type = 'tpl';
+                type = 'static';
             }else if(field.type === 'html'){
                 type = 'markdown';
             }else if(field.type === 'url'){
@@ -8064,6 +8366,7 @@ async function getTableColumns(fields, options){
                 columnItem.quickEdit = quickEditSchema;
                 columnItem.quickEditEnabledOn = "${is_system !== true}";
             }
+            columnItem.id = `${options.objectName}_${field.name}_\${_index}`;
             columns.push(columnItem);
         }
     }
@@ -8342,7 +8645,7 @@ async function getTableOperation(ctx){
     }
     return {
         type: 'operation',
-        label: i18next__default["default"].t('frontend_operation'),
+        label: "",
         fixed: 'right',
         labelClassName: 'text-center',
         className: 'text-center steedos-listview-operation w-10',
@@ -8376,23 +8679,87 @@ async function getTableOperation(ctx){
     }
 }
 
+async function getDefaultCrudCard(columns, options) {
+    let labelFieldName = options?.labelFieldName || "name";
+    let titleColumn, bodyColumns = [];
+    columns.forEach(function (item) {
+        delete item.quickEdit;
+        delete item.width;
+        if (item.name === labelFieldName) {
+            titleColumn = item;
+        }
+        else {
+            if (item.name !== "_index") {
+                bodyColumns.push(item);
+            }
+        }
+    });
+    let card = {
+        "header": {
+            "title": titleColumn.tpl
+        },
+        body: bodyColumns,
+        // useCardLabel: false,
+        toolbar: []
+    };
+    let hideToolbarOperation = options.formFactor === 'SMALL' || ["split"].indexOf(options.displayAs) > -1;
+    if(!hideToolbarOperation){
+        let toolbarOperation = await getTableOperation(options);
+        if (toolbarOperation) {
+            toolbarOperation.className += " inline-block w-auto";
+        }
+        card.toolbar.push(toolbarOperation);
+    }
+    return card;
+}
+
 async function getTableSchema$1(fields, options){
     if(!options){
         options = {};
     }
     let { isLookup, hiddenColumnOperation } = options;
+    const defaults = options.defaults;
+    const listSchema = (defaults && defaults.listSchema) || {};
+
     let columns = [];
     let useMobileColumns = options.formFactor === 'SMALL' || ["split"].indexOf(options.displayAs) > -1;
     if(isLookup){
         // 在lookup手机端列表模式调式好之前不使用getMobileTableColumns
         useMobileColumns = false;
     }
+    if(listSchema.mode && listSchema.mode !== "table"){
+        // 如果指定的mode，则不走我们内置的手机端列表效果，使用steedos组件内部开发的默认card/list效果，或者由用户自己实现card/list模式的crud列表
+        useMobileColumns = false;
+    }
     if(useMobileColumns){
         columns = await getMobileTableColumns(fields, options);
     }
     else {
         columns = await getTableColumns(fields, options);
 
+        if(listSchema.mode === "cards"){
+            let card = listSchema.card;
+            if(!card){
+                card = await getDefaultCrudCard(columns, options);
+            }
+            return {
+                mode: "cards",
+                perPageAvailable: [5, 10, 20, 50, 100, 500],
+                name: "thelist",
+                headerToolbarClassName: "py-2 px-2 border-gray-300 border-solid border-b",
+                className: "",
+                draggable: false,
+                defaultParams: getDefaultParams(options),
+                card: card,
+                syncLocation: false,
+                keepItemSelectionOnPageChange: true,
+                checkOnItemClick: isLookup ? true : false,
+                labelTpl: `\${${options.labelFieldName}}`,
+                autoFillHeight: false, // 自动高度效果不理想,先关闭
+                columnsTogglable: false
+            }
+        }
+
         if(!isLookup && !hiddenColumnOperation){
             columns.push(await getTableOperation(options));
         }
@@ -8400,6 +8767,7 @@ async function getTableSchema$1(fields, options){
 
     return {
         mode: "table",
+        perPageAvailable: [5, 10, 20, 50, 100, 500],
         name: "thelist",
         headerToolbarClassName: "py-2 px-2 border-gray-300 border-solid border-b",
         className: "",
@@ -8870,18 +9238,30 @@ function getReadonlyFormAdaptor(object, fields, options){
         payload.status = 2;
         payload.msg = payload.errors[0].message;
     }
+    ${options && options.initApiAdaptor || ''}
     return payload;
 `
 }
 
 async function getReadonlyFormInitApi(object, recordId, fields, options){
+    let findOneOptions;
+    if (!recordId && options && options.isEditor) {
+        // 设计器中只读表单返回第一条记录
+        findOneOptions = {
+            filters: [],
+            queryOptions: "top: 1"
+        };
+    }
     return {
         method: "post",
         url: getApi$2() + '&objectName=${objectName}' + "&recordId=${recordId}",
         cache: API_CACHE,
-        // requestAdaptor: "console.log('getReadonlyFormInitApi requestAdaptor', api);return api;",
+        requestAdaptor: `
+            ${options && options.initApiRequestAdaptor || ''}
+            return api;
+        `,
         adaptor: getReadonlyFormAdaptor(object, fields, options),
-        data: await getFindOneQuery$1(object, recordId, fields, options),
+        data: await getFindOneQuery$1(object, recordId, fields, findOneOptions),
         headers: {
             Authorization: "Bearer ${context.tenantId},${context.authToken}"
         }
@@ -9022,7 +9402,7 @@ async function getEditFormInitApi(object, recordId, fields, options){
                     ${getScriptForRewriteValueForFileFields(fields)}
 
                     _.each(dataKeys, function(key){
-                        if(fieldKeys.indexOf(key)<0){
+                        if(fieldKeys.indexOf(key)<0 && key !== "_display"){
                             delete data[key];
                         }
                     })
@@ -9197,6 +9577,8 @@ async function getCalendarApi(mainObject, fields, options) {
 
     if(api.data.$self.additionalFilters){
       filters.push(api.data.$self.additionalFilters)
+    }else if(api.data.$self.event.data.additionalFilters){
+      filters.push(api.data.$self.event.data.additionalFilters)
     }
 
     var pageSize = api.data.pageSize || 10;
@@ -9522,6 +9904,7 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
     businessHours.endTime = `${calendarOptions.endDayHour}:00`;
   }
 
+  // api.trackExpression="\\\${additionalFilters}";
   const onEvent = {
     "getEvents": {
       "weight": 0,
@@ -9533,6 +9916,22 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
           "actionType": "custom",
           "script": onGetEventsScript
         }
+        // {
+        //   "actionType": "ajax",
+        //   "outputVar": "responseResult",
+        //   "args": {
+        //     "options": {
+        //     },
+        //     "api": api
+        //     // {
+        //     //   "url": "111",
+        //     //   "method": "post",
+        //     //   "data": {
+        //     //     "calendarOptions": JSON.stringify(calendarOptions);
+        //     //   }
+        //     // }
+        //   }
+        // }
       ]
     },
     "select": {
@@ -9856,7 +10255,7 @@ function deleteVariable(data, key) {
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-05-26 16:02:08
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-09-15 15:36:17
+ * @LastEditTime: 2023-10-12 18:25:05
  * @Description: 
  */
 
@@ -9876,8 +10275,9 @@ const getFieldSchemaArray = (formFields, ctx) => {
     }
 
     let forceHidden = false;
-    if(!recordId && field.readonly){
+    if(!recordId && field.readonly && !ctx.isEditor){
       // 新建记录时，只读字段先隐藏，后续支持显示后，即任务：https://github.com/steedos/steedos-platform/issues/3164 完成后再放开
+      // 表单只读时所有字段都是readonly，设计器中如果forceHidden会造成整个表单在只读的时候显示为空白了，所以要排除掉
       forceHidden = true;
     }
 
@@ -10119,6 +10519,9 @@ async function getObjectCRUD(objectSchema, fields, options){
     const nonpaged = objectSchema.paging && objectSchema.paging.enabled === false;
     const isTreeObject = objectSchema.enable_tree;
     const bulkActions = getBulkActions(objectSchema);
+    const defaults = options.defaults;
+    const listSchema = (defaults && defaults.listSchema) || {};
+
     const bodyProps = {
       // toolbar: getToolbar(),
       // headerToolbar: getObjectHeaderToolbar(objectSchema, options.formFactor, {showDisplayAs}),
@@ -10130,9 +10533,12 @@ async function getObjectCRUD(objectSchema, fields, options){
       filter: options.filterVisible !== false && await getObjectFilter(objectSchema, fields, options),
     };
     if(options.formFactor !== 'SMALL' || ["split"].indexOf(options.displayAs) == -1){
-      Object.assign(bodyProps, {
-        bulkActions: options.bulkActions != false ? bulkActions : false
-      });
+      if(listSchema.mode !== "cards"){
+        // card模式时默认不显示勾选框
+        Object.assign(bodyProps, {
+          bulkActions: options.bulkActions != false ? bulkActions : false
+        });
+      }
     }
     // yml里配置的 不分页和enable_tree:true 优先级最高，组件中输入的top次之。
     options.queryCount = true;
@@ -10191,17 +10597,19 @@ async function getObjectCRUD(objectSchema, fields, options){
       }
       let tableOptions = Object.assign({
         idFieldName: objectSchema.idFieldName, labelFieldName: labelFieldName, 
-        permissions:objectSchema.permissions,enable_inline_edit:objectSchema.enable_inline_edit
+        permissions:objectSchema.permissions,enable_inline_edit:objectSchema.enable_inline_edit,
+        crudId: listSchema.id || id
       }, options);
       tableOptions.amisData = createObject(options.amisData || {}, {});
       const table = await getTableSchema$1(fields, tableOptions);
-      delete table.mode;
+      // delete table.mode;
       //image与avatar需要在提交修改时特别处理
       const imageNames = ___default["default"].compact(___default["default"].map(___default["default"].filter(fields, (field) => ["image","avatar"].includes(field.type)), 'name'));
       const quickSaveApiRequestAdaptor = `
         var graphqlOrder = "";
         var imageNames = ${JSON.stringify(imageNames)};
-        api.data.rowsDiff.forEach(function (item, index) {
+        const rowsDiff = _.cloneDeep(api.data.rowsDiff);
+        rowsDiff.forEach(function (item, index) {
           for(key in item){
             if(_.includes(imageNames, key)){
               if(typeof item[key] == "string"){
@@ -10215,6 +10623,7 @@ async function getObjectCRUD(objectSchema, fields, options){
               }
             }
           }
+          item = _.omit(item, '_display');
           const itemOrder = 'update' + index + ':' + api.data.objectName + '__update(id:"' + item._id + '", doc:' + JSON.stringify(JSON.stringify(_.omit(item, '_id'))) + ') {_id}';
           graphqlOrder += itemOrder;
         })
@@ -10265,12 +10674,14 @@ async function getObjectCRUD(objectSchema, fields, options){
 
     }
 
-    const defaults = options.defaults;
-    
-    const listSchema = (defaults && defaults.listSchema) || {};
     body = defaultsDeep({}, listSchema, body);
     body = await getCrudSchemaWithDataFilter(body, { crudDataFilter, onCrudDataFilter, amisData, env });
 
+    let crudModeClassName = "";
+    if(body.mode){
+      crudModeClassName = `steedos-crud-mode-${body.mode}`;
+    }
+
     if (defaults) {
       const headerSchema = defaults.headerSchema;
       const footerSchema = defaults.footerSchema;
@@ -10299,7 +10710,7 @@ async function getObjectCRUD(objectSchema, fields, options){
     // TODO: data应该只留loaded，其他属性都改为从上层传递下来
     return {
       type: 'service',
-      className: '',
+      className: crudModeClassName,
       //目前crud的service层id不认用户自定义id，只支持默认规则id，许多地方的格式都写死了service_listview_${objectname}
       id: `service_${id}`,
       name: `page`,
@@ -10353,8 +10764,29 @@ const getFormFields = (objectSchema, formProps)=>{
   return lodash.sortBy(___default["default"].values(fields), "sort_no");
 };
 
+async function getFormSchemaWithDataFilter(form, options = {}){
+  const { formDataFilter, amisData, env } = options;
+  let onFormDataFilter = options.onFormDataFilter;
+  if (!onFormDataFilter && typeof formDataFilter === 'string') {
+    onFormDataFilter = new Function(
+      'form',
+      'env',
+      'data',
+      formDataFilter
+    );
+  }
+
+  try {
+    onFormDataFilter && (form = await onFormDataFilter(form, env, amisData) || form);
+  } catch (e) {
+    console.warn(e);
+  }
+  return form;
+}
+
 async function getObjectForm(objectSchema, ctx){
-    const { recordId, formFactor, layout = formFactor === 'SMALL' ? 'normal' : "normal", labelAlign, tabId, appId, defaults } = ctx;
+    const { recordId, formFactor, layout = formFactor === 'SMALL' ? 'normal' : "normal", labelAlign, tabId, appId, defaults, submitSuccActions = [], 
+      formDataFilter, onFormDataFilter, amisData, env } = ctx;
     const fields = ___default["default"].values(objectSchema.fields);
     const formFields = getFormFields(objectSchema, ctx);
     const formSchema =  defaults && defaults.formSchema || {};
@@ -10371,7 +10803,8 @@ async function getObjectForm(objectSchema, ctx){
       name: `page_edit_${recordId}`,
       api: await getEditFormInitApi(objectSchema, recordId, fields, ctx),
       data:{
-        editFormInited: false
+        editFormInited: false,
+        ...amisData
       },
       // data: {global: getGlobalData('edit'), recordId: recordId, objectName: objectSchema.name, context: {rootUrl: getRootUrl(), tenantId: getTenantId(), authToken: getAuthToken()}},
       initApi: null,
@@ -10424,9 +10857,10 @@ async function getObjectForm(objectSchema, ctx){
                 },
                 "expression": `\${_master.objectName != '${objectSchema.name}' && _master.objectName}`
               },
+              ...submitSuccActions,
               // {
               //   "actionType": "custom",
-              //   "script": "debugger;"
+              //   "script": `setTimeout(function(){doAction({'actionType': 'setValue','componentId': '${formSchema.id}','args': {'value': {'sort_no': 879}}})}, 300)`
               // },
               // {
               //   "args": {},
@@ -10437,20 +10871,22 @@ async function getObjectForm(objectSchema, ctx){
         }
       })]
     };
+    amisSchema.body[0] = await getFormSchemaWithDataFilter(amisSchema.body[0], { formDataFilter, onFormDataFilter, amisData, env });
     return amisSchema;
 }
 
 async function getObjectDetail(objectSchema, recordId, ctx){
-    const { formFactor, layout = formFactor === 'SMALL' ? 'normal' : "normal", labelAlign, formInitProps } = ctx;
+    const { formFactor, layout = formFactor === 'SMALL' ? 'normal' : "normal", labelAlign, 
+      formDataFilter, onFormDataFilter, amisData, env } = ctx;
     const fields = ___default["default"].values(objectSchema.fields);
     const formFields = getFormFields(objectSchema, ctx);
     const serviceId = `service_detail_page`;
-    return {
+    const amisSchema = {
         type: 'service',
         name: `page_readonly_${recordId}`,
         id: serviceId,
         data: {global: getGlobalData('read'), context: {rootUrl: getRootUrl(), tenantId: getTenantId(), authToken: getAuthToken()}},
-        api: await getReadonlyFormInitApi(objectSchema, recordId, fields, formInitProps),
+        api: await getReadonlyFormInitApi(objectSchema, recordId, fields, ctx),
         body: [
           {
             "type": "wrapper",   //form 的 hiddenOn 会导致 form onEvent 异常, 使用wrapper包裹一次form,并在wrapper上控制显隐
@@ -10469,7 +10905,11 @@ async function getObjectDetail(objectSchema, recordId, ctx){
                 "formData": "$$"
               },
               wrapWithPanel: false, 
-              body: await getFormBody(_$1.map(fields, (field)=>{field.readonly = true; return field;}), _$1.map(formFields, (field)=>{field.readonly = true; return field;}), Object.assign({}, ctx, {showSystemFields: true,fieldGroups: objectSchema.field_groups})),
+              body: await getFormBody(
+                _$1.map(fields, (field) => { field.readonly = true; return field; }),
+                _$1.map(formFields, (field) => { field.readonly = true; return field; }),
+                Object.assign({}, ctx, { showSystemFields: true, fieldGroups: objectSchema.field_groups })
+              ),
               className: 'steedos-amis-form bg-white',
               actions: [], // 不显示表单默认的提交按钮
               onEvent: {
@@ -10523,7 +10963,10 @@ async function getObjectDetail(objectSchema, recordId, ctx){
             ]
           }
         }
-    }
+    };
+
+    amisSchema.body[0].body = await getFormSchemaWithDataFilter(amisSchema.body[0].body, { formDataFilter, onFormDataFilter, amisData, env });
+    return amisSchema;
 }
 
 /*
@@ -10603,7 +11046,7 @@ const getRecordPermissions = async (objectName, recordId)=>{
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
  * @LastEditors: liaodaxue
- * @LastEditTime: 2023-09-25 17:18:08
+ * @LastEditTime: 2023-10-23 15:55:46
  * @Description:
  */
 
@@ -10894,11 +11337,15 @@ async function getRelatedListSchema(
     ctx
   ) {
     const uiSchema = await getUISchema(objectName);
+    if(!uiSchema){
+        return {}
+    }
+    const listViewNames = _$1.map(uiSchema.list_views, 'name');
     const listView =  _$1.find(
         uiSchema.list_views,
         (listView, name) => {
-            // 传入listViewName空值则取第一个
-            if(!listViewName){
+            // 传入listViewName空值 或者 不存在 则取第一个
+            if(!listViewName || listViewNames.indexOf(listViewName)<0){
                 listViewName = name;
             }
             return name === listViewName || listView._id === listViewName;
@@ -10978,8 +11425,8 @@ async function getRelatedListSchema(
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
- * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-09-21 17:35:06
+ * @LastEditors: liaodaxue
+ * @LastEditTime: 2023-10-20 11:38:25
  * @Description:
  */
 
@@ -11308,8 +11755,8 @@ async function getListSchema(
         "filtersFunction": listview_filters,
         "sort": sort,
         "ctx": ctx,
-        "requestAdaptor": listView.requestAdaptor,  
-        "adaptor": listView.adaptor,
+        "requestAdaptor": listView.requestAdaptor || ctx.requestAdaptor,  
+        "adaptor": listView.adaptor || ctx.adaptor,
         "headerToolbarItems": ctx.headerToolbarItems,
         "filterVisible": ctx.filterVisible,
         "rowClassNameExpr": ctx.rowClassNameExpr,
@@ -13954,10 +14401,18 @@ const getOpinionFieldStepsName = (field, top_keywords) => {
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-09-09 17:47:37
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-03-18 15:32:34
+ * @LastEditTime: 2023-10-10 13:57:02
  * @Description:
  */
 
+const getMoment = ()=>{
+  if(window.amisRequire){
+    return window.amisRequire("moment");
+  }else if(window.moment){
+    return window.moment;
+  }
+};
+
 const getTrace = ({ instance, traceId }) => {
   return _$1.find(instance.traces, (trace) => {
     return trace._id === traceId;
@@ -14177,6 +14632,8 @@ const getInstanceInfo = async ({ instanceId, box }) => {
     method: "get",
   });
 
+  const moment = getMoment();
+
   return {
     box: box,
     _id: instanceId,
@@ -14187,7 +14644,7 @@ const getInstanceInfo = async ({ instanceId, box }) => {
     applicant_name: instance.applicant_name,
     submitter: instance.submitter,
     submit_date: instance.submit_date
-      ? amisRequire("moment")(instance.submit_date).format("YYYY-MM-DD")
+      ? (moment && moment(instance.submit_date).format("YYYY-MM-DD"))
       : "",
     state: instance.state,
     approveValues: values,
@@ -14227,8 +14684,7 @@ const getInstanceInfo = async ({ instanceId, box }) => {
               finishDate = approve.is_read ? "已读" : "未处理";
               judge = null;
             } else {
-              finishDate =
-                amisRequire("moment")(finishDate).format("YYYY-MM-DD HH:mm");
+              finishDate = moment && moment(finishDate).format("YYYY-MM-DD HH:mm");
             }
 
             switch (judge) {
@@ -14318,6 +14774,7 @@ exports.getFileSrc = getFileSrc;
 exports.getFlowFormSchema = getFlowFormSchema;
 exports.getFormPageInitSchema = getFormPageInitSchema;
 exports.getFormSchema = getFormSchema;
+exports.getGlobalNowData = getGlobalNowData;
 exports.getIdsPickerSchema = getIdsPickerSchema;
 exports.getImageSrc = getImageSrc;
 exports.getInstanceInfo = getInstanceInfo;