@steedos-widgets/amis-lib 1.3.3 → 1.3.4-beta.10

package/dist/index.cjs.js

@@ -471,7 +471,7 @@ function getLookupListView(refObjectConfig) {
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-05-23 09:53:08
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-08-29 15:04:39
+ * @LastEditTime: 2023-09-19 14:38:39
  * @Description: 
  */
 
@@ -479,39 +479,39 @@ function getCreatedInfoTpl(formFactor){
     const href = Router.getObjectDetailPath({
         formFactor, appId: "admin", objectName: 'users', recordId: '${created_by._id}'
     });
-    return `<div><a href='${href}'>\${_display.created_by.label}</a>\${_display.created}</div>`
+    return `<span><a href='${href}'>\${_display.created_by.label}</a>\${_display.created}</span>`
 }
 
 function getModifiedInfoTpl(formFactor){
     const href = Router.getObjectDetailPath({
         formFactor, appId: "admin", objectName: 'users', recordId: '${modified_by._id}'
     });
-    return `<div><a href='${href}'>\${_display.modified_by.label}</a>\${_display.modified}</div>`
+    return `<span><a href='${href}'>\${_display.modified_by.label}</a>\${_display.modified}</span>`
 }
 
 function getNumberTpl(field){
-    return `<div>\${_display.${field.name}}</div>`
+    return `<span>\${_display.${field.name}}</span>`
 }
 
 function getTimeTpl(field){
-    return `<div>\${_display.${field.name}}</div>`
+    return `<span>\${_display.${field.name}}</span>`
 }
 
 function getDateTpl(field){
-    return `<div>\${_display.${field.name}}</div>`
+    return `<span>\${_display.${field.name}}</span>`
 }
 
 
 function getDateTimeTpl(field){
-    return `<div>\${_display.${field.name}}</div>`
+    return `<span>\${_display.${field.name}}</span>`
 }
 
 function getUiFieldTpl(field){
-    return `<div>\${_display.${field.name}}</div>`
+    return `<span>\${_display.${field.name}}</span>`
 }
 
 function getUiFileSizeTpl(field){
-    return `<div>\${_display.${field.name}}</div>`
+    return `<span>\${_display.${field.name}}</span>`
 }
 
 //TODO 处理name字段
@@ -522,7 +522,7 @@ async function getRefObjectNameFieldName(field){
 }
 
 function getSelectTpl(field){
-    return `<div>\${_display.${field.name}}</div>`
+    return `<span>\${_display.${field.name}}</span>`
 }
 function getSelectMap(selectOptions){
     let map = {};
@@ -651,9 +651,13 @@ async function getLookupTpl(field, ctx){
 }
 
 function getSwitchTpl(field){
+    let fieldDataStrTpl = `data._display.${field.name}`;
+    if(field.isTableField){
+        fieldDataStrTpl = `data.${field.name}`;
+    }
     return `<% if (data.${field.name}) { %>
-    <span class="slds-icon_container slds-icon-utility-check slds-current-color" title="<%=data._display.${field.name}%>">
-        <span ><%= data._display.${field.name} === "√" ? "<svg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 24 24' stroke-width='1.5' stroke='currentColor' class='w-4 h-4'><path stroke-linecap='round' stroke-linejoin='round' d='M4.5 12.75l6 6 9-13.5' /></svg>" : data._display.${field.name} %></span>
+    <span class="slds-icon_container slds-icon-utility-check slds-current-color" title="<%=${fieldDataStrTpl}%>">
+        <span ><%= ${fieldDataStrTpl} === "√" ? "<svg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 24 24' stroke-width='1.5' stroke='currentColor' class='w-4 h-4'><path stroke-linecap='round' stroke-linejoin='round' d='M4.5 12.75l6 6 9-13.5' /></svg>" : ${fieldDataStrTpl} %></span>
     </span>
     <% } %>`
 }
@@ -1231,7 +1235,7 @@ var frontend_display_type_is_split = "分栏视图";
 var frontend_display_as = "显示为";
 var frontend_record_sum = "个项目";
 var frontend_button_reload_tooltip = "刷新";
-var frontend_button_search_tooltip = "查询";
+var frontend_button_search_tooltip = "筛选";
 var frontend_fields_filter_button_search = "搜索";
 var frontend_fields_filter_button_settings = "设置搜索项";
 var frontend_button_listview_control_tooltip = "列表视图控制";
@@ -1853,7 +1857,7 @@ const parseSingleExpression = function (func, formData, dataPath, global, userSe
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-11-01 15:51:00
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-06-28 23:19:41
+ * @LastEditTime: 2023-09-25 14:53:05
  * @Description: 
  */
 
@@ -1872,18 +1876,31 @@ const getSchema$5 = async (uiSchema, ctx) => {
             formSchema = _.isString(payload.schema) ? JSON.parse(payload.schema) : payload.schema;
         }
 
+        const fields = ${JSON.stringify(uiSchema.fields)};
+        const selectedRowResponseResult = api.body.selectedRowResponseResult;
+        let defaultData = {}; 
+
+        if(!_.isEmpty(selectedRowResponseResult)){
+            const fieldsKeys = _.keys(fields);
+            // 如果新建记录时复制的数据中有omit或其他不相关字段数据时不应该一起保存到数据库，
+            // 原规则见：https://github.com/steedos/steedos-frontend/issues/297
+            _.forEach(selectedRowResponseResult, (val, key) => {
+              if (fieldsKeys.indexOf(key) > -1 && fields[key].omit !== true) {
+                defaultData[key] = val;
+              }
+            })
+        }
+
         const _master = api.body._master;
         if(_master && _master._isRelated){
             const relatedKey = _master.relatedKey;
             const masterObjectName = _master.objectName;
             const recordId = _master.recordId;
             let relatedKeySaveValue = recordId;
-            const fields = ${JSON.stringify(uiSchema.fields)};
             const relatedField = fields[relatedKey];
             if(relatedField.reference_to_field && relatedField.reference_to_field !== '_id'){
                 relatedKeySaveValue = _master.record[relatedField.reference_to_field];
             }
-            let defaultData = {}; 
             let relatedKeyValue; 
             if(!_.isString(relatedField.reference_to)){
                 relatedKeyValue = { o: masterObjectName, ids: [relatedKeySaveValue] };
@@ -1893,6 +1910,9 @@ const getSchema$5 = async (uiSchema, ctx) => {
                 relatedKeyValue = relatedKeySaveValue;
             }
             defaultData[relatedKey]=relatedKeyValue;
+        }
+
+        if(!_.isEmpty(defaultData)){
             if(payload.schema){
                 // 表单微页面第一层要求是page
                 formSchema.data.defaultData = defaultData;
@@ -1915,6 +1935,18 @@ const getSchema$5 = async (uiSchema, ctx) => {
             });
         }, 200);
     `;
+    const getSelectedRowsScript = `
+        const isLookup = event.data.isLookup;
+        if(isLookup){
+            // lookup弹出窗口的新建功能不需要支持复制新建
+            return;
+        }
+        const uiSchema = event.data.uiSchema;
+        const objectName = event.data.objectName;
+        const listViewRef = event.context.scoped.getComponentById("listview_" + objectName);
+        const selectedItems = listViewRef && listViewRef.props.store.toJSON().selectedItems || [];
+        event.data.selectedIds = _.map(selectedItems, uiSchema.idFieldName || '_id');
+    `;
     return {
         "type": "service",
         "body": [
@@ -1927,6 +1959,21 @@ const getSchema$5 = async (uiSchema, ctx) => {
                     "click": {
                         "weight": 0,
                         "actions": [
+                            {
+                                "actionType": "custom",
+                                "script": getSelectedRowsScript
+                            },
+                            {
+                                "actionType": "ajax",
+                                "outputVar": "selectedRowResponseResult",
+                                "args": {
+                                    "api": {
+                                        "url": "${context.rootUrl}/api/v1/${uiSchema.name}/${selectedIds|first}",
+                                        "method": "get"
+                                    }
+                                },
+                                "expression": "${selectedIds.length > 0}"
+                            },
                             {
                                 "actionType": "dialog",
                                 "dialog": {
@@ -1944,7 +1991,8 @@ const getSchema$5 = async (uiSchema, ctx) => {
                                         "displayAs": "${displayAs}",
                                         "uiSchema": "${uiSchema}",
                                         "isLookup": "${isLookup}",
-                                        "listName": "${listName}"
+                                        "listName": "${listName}",
+                                        "selectedRowResponseResult": "${selectedRowResponseResult}",
                                     },
                                     "title":i18next__default["default"].t('frontend_form_new') + " ${uiSchema.label | raw}",
                                     "body": [
@@ -1956,7 +2004,8 @@ const getSchema$5 = async (uiSchema, ctx) => {
                                                 "data": {
                                                     "isLookup": "${isLookup}",
                                                     "_master": "${_master}",
-                                                    "url": "${context.rootUrl}/api/pageSchema/form?app=${appId}&objectApiName=${objectName}&formFactor=${formFactor}"
+                                                    "url": "${context.rootUrl}/api/pageSchema/form?app=${appId}&objectApiName=${objectName}&formFactor=${formFactor}",
+                                                    "selectedRowResponseResult": "${selectedRowResponseResult}"
                                                 },
                                                 "url": "${context.rootUrl}/api/pageSchema/form?app=${appId}&objectApiName=${objectName}&formFactor=${formFactor}",
                                                 "method": "get",
@@ -2887,9 +2936,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": [
@@ -2905,16 +2975,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",
@@ -2939,7 +3000,7 @@ const getObjectDetailButtonsSchemas = (objectSchema, recordId, ctx)=>{
                 type: "steedos-dropdown-button",
                 label: "",
                 buttons: moreButtons,
-                className: 'slds-icon',
+                className: 'slds-icon ml-1',
                 visibleOn: moreButtonsVisibleOn
             };
             buttons.push(dropdownButtonsSchema);
@@ -3682,13 +3743,15 @@ function getObjectListHeaderFirstLine(objectSchema, listViewName, ctx) {
     "visibleOn": "${display == 'split'?false:true}"
   }];
   if(ctx.formFactor !== 'SMALL'){
+    const restButtons = Array.isArray(amisButtonsSchema) ? amisButtonsSchema.filter(obj => obj.name !== "standard_new"):[];
     buttonSchema.push({
       "type": "flex",
       "items":[
         standardNewButton,
-        {
+        (restButtons.length > 0) && {
           "type": "dropdown-button",
-          "buttons": Array.isArray(amisButtonsSchema) ? amisButtonsSchema.filter(obj => obj.name !== "standard_new"):{},
+          "buttons": restButtons,
+          "className": " ml-1",
           "menuClassName": "p-none split-dropdown-buttons",
           "align": "right",
           "size": "sm"
@@ -3820,7 +3883,6 @@ async function getObjectListHeaderSecordLine(objectSchema, listViewName, ctx) {
       },
       {
         "body": [
-          fieldsFilterButtonSchema,
           {
             "type": "button",
             "label": "",
@@ -3829,6 +3891,7 @@ async function getObjectListHeaderSecordLine(objectSchema, listViewName, ctx) {
             "target": amisListViewId,
             "className": "bg-white p-2 rounded border-gray-300 text-gray-500"
           },
+          fieldsFilterButtonSchema,
           // {
           //   "type": "button",
           //   "label": "",
@@ -4076,7 +4139,7 @@ async function getObjectRecordDetailRelatedListHeader(relatedObjectSchema, relat
                     "body": [
                       {
                         "type": "tpl",
-                        "tpl": `<a class="text-black text-base font-bold" href="/app/\${appId}/\${_master.objectName}/\${_master.recordId}/\${objectName}/grid?related_field_name=\${relatedKey}">${relatedLabel}(\${$count})</a>`,
+                        "tpl": `<a class="text-black text-base font-bold hover:font-bold" href="/app/\${appId}/\${_master.objectName}/\${_master.recordId}/\${objectName}/grid?related_field_name=\${relatedKey}">${relatedLabel}(\${$count})</a>`,
                         "inline": false,
                         "wrapperComponent": "",
                         "className": "",
@@ -5165,7 +5228,7 @@ function getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLooku
       {
         "type": "search-box",
         "name": keywordsSearchBoxName,
-        "placeholder": "快速搜索",
+        "placeholder": "搜索此列表",
         "value": crudKeywords,
         "clearable": true,
         "clearAndSubmit": true
@@ -5288,10 +5351,10 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
     if(toolbarCount){
       toolbars.push(toolbarCount);
     }
-    toolbars.push(toolbarReloadButton);
     if(toolbarFilter){
       toolbars.push(toolbarFilter);
     }
+    toolbars.push(toolbarReloadButton);
     toolbars.push(toolbarDisplayAsButton);
     toolbars.push(toolbarDQuickSearchBox);
     return [
@@ -5307,19 +5370,20 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
       toolbars.push(toolbarFilter);
     }
     toolbars.push(toolbarReloadButton);
+    toolbars.push(toolbarDisplayAsButton);
     if(mainObject?.permissions?.allowCreateListViews){
       toolbars.push(getSettingListviewToolbarButtonSchema());
     }
-    toolbars.push(toolbarDisplayAsButton);
     toolbars.push(toolbarDQuickSearchBox);
     return [
       // "filter-toggler",
       ...(headerToolbarItems || []),
       "bulkActions",
-      {
-        "type": "columns-toggler",
-        "className": "hidden"
-      },
+      // 不能放开crud columns-toggler否则crud card模式会报错
+      // {
+      //   "type": "columns-toggler",
+      //   "className": "hidden"
+      // },
       ...toolbars,
       // {
       //     "type": "columns-toggler",
@@ -5926,10 +5990,13 @@ async function lookupToAmisPicker(field, readonly, ctx){
     const op = api.data.$self.op;
     if(!_.isEmpty(op)){
         // op不为空，表示处于字段初始编辑状态，不是点击后出现弹窗状态。
+        // 这里不可以用_.pick函数让payload只返回labelField和valueField，因为字段上配置的amis autoFill功能可能依赖了其他字段
+        /*
         const rows = _.map(payload.data.rows, (item)=>{
             return _.pick(item, ["${referenceTo.labelField.name}", "${referenceTo.valueField.name}"]);
         })
         payload.data.rows = rows;
+        */
         return payload;
     }
     if(enable_tree){
@@ -7356,7 +7423,7 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
                             label: subField.label,
                             quickEdit: readonly ? false : gridSub
                         };
-                        if(subField.type === 'lookup'){
+                        if(["lookup", "boolean", "toggle"].indexOf(subField.type) > -1){
                             gridItemSchema.type = gridSub.type;
                             gridItemSchema.tpl = gridSub.tpl;
                         }
@@ -8290,7 +8357,7 @@ async function getTableOperation(ctx){
         label: i18next__default["default"].t('frontend_operation'),
         fixed: 'right',
         labelClassName: 'text-center',
-        className: 'text-center steedos-listview-operation w-20',
+        className: 'text-center steedos-listview-operation w-10',
         buttons: [
               {
                 "type": "steedos-dropdown-button",
@@ -8322,11 +8389,10 @@ async function getTableOperation(ctx){
 }
 
 async function getTableSchema$1(fields, options){
-    let isLookup = options && options.isLookup;
-    let hiddenColumnOperation = options && options.hiddenColumnOperation;
     if(!options){
         options = {};
     }
+    let { isLookup, hiddenColumnOperation } = options;
     let columns = [];
     let useMobileColumns = options.formFactor === 'SMALL' || ["split"].indexOf(options.displayAs) > -1;
     if(isLookup){
@@ -8338,6 +8404,7 @@ async function getTableSchema$1(fields, options){
     }
     else {
         columns = await getTableColumns(fields, options);
+
         if(!isLookup && !hiddenColumnOperation){
             columns.push(await getTableOperation(options));
         }
@@ -8346,7 +8413,7 @@ async function getTableSchema$1(fields, options){
     return {
         mode: "table",
         name: "thelist",
-        headerToolbarClassName: "py-2 px-2 border-gray-300 bg-gray-100 border-solid border-b",
+        headerToolbarClassName: "py-2 px-2 border-gray-300 border-solid border-b",
         className: "",
         draggable: false,
         defaultParams: getDefaultParams(options),
@@ -9642,6 +9709,161 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
   return amisSchema;
 }
 
+/******************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */
+
+var __assign = function() {
+    __assign = Object.assign || function __assign(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+
+/**
+ * 将例如像 a.b.c 或 a[1].b 的字符串转换为路径数组
+ *
+ * @param string 要转换的字符串
+ */
+var keyToPath = function (string) {
+    var result = [];
+    if (string.charCodeAt(0) === '.'.charCodeAt(0)) {
+        result.push('');
+    }
+    string.replace(new RegExp('[^.[\\]]+|\\[(?:([^"\'][^[]*)|(["\'])((?:(?!\\2)[^\\\\]|\\\\.)*?)\\2)\\]|(?=(?:\\.|\\[\\])(?:\\.|\\[\\]|$))', 'g'), function (match, expression, quote, subString) {
+        var key = match;
+        if (quote) {
+            key = subString.replace(/\\(\\)?/g, '$1');
+        }
+        else if (expression) {
+            key = expression.trim();
+        }
+        result.push(key);
+        return '';
+    });
+    return result;
+};
+
+// 方便取值的时候能够把上层的取到，但是获取的时候不会全部把所有的数据获取到。
+function createObject(superProps, props, properties) {
+    if (superProps && Object.isFrozen(superProps)) {
+        superProps = cloneObject(superProps);
+    }
+    var obj = superProps
+        ? Object.create(superProps, __assign(__assign({}, properties), { __super: {
+                value: superProps,
+                writable: false,
+                enumerable: false
+            } }))
+        : Object.create(Object.prototype, properties);
+    props &&
+        isObject(props) &&
+        Object.keys(props).forEach(function (key) { return (obj[key] = props[key]); });
+    return obj;
+}
+function cloneObject(target, persistOwnProps) {
+    if (persistOwnProps === void 0) { persistOwnProps = true; }
+    var obj = target && target.__super
+        ? Object.create(target.__super, {
+            __super: {
+                value: target.__super,
+                writable: false,
+                enumerable: false
+            }
+        })
+        : Object.create(Object.prototype);
+    persistOwnProps &&
+        target &&
+        Object.keys(target).forEach(function (key) { return (obj[key] = target[key]); });
+    return obj;
+}
+function extendObject(target, src, persistOwnProps) {
+    if (persistOwnProps === void 0) { persistOwnProps = true; }
+    var obj = cloneObject(target, persistOwnProps);
+    src && Object.keys(src).forEach(function (key) { return (obj[key] = src[key]); });
+    return obj;
+}
+function isObject(obj) {
+    var typename = typeof obj;
+    return (obj &&
+        typename !== 'string' &&
+        typename !== 'number' &&
+        typename !== 'boolean' &&
+        typename !== 'function' &&
+        !Array.isArray(obj));
+}
+function setVariable(data, key, value, convertKeyToPath) {
+    data = data || {};
+    if (key in data) {
+        data[key] = value;
+        return;
+    }
+    var parts = convertKeyToPath !== false ? keyToPath(key) : [key];
+    var last = parts.pop();
+    while (parts.length) {
+        var key_1 = parts.shift();
+        if (isPlainObject__default["default"](data[key_1])) {
+            data = data[key_1] = __assign({}, data[key_1]);
+        }
+        else if (Array.isArray(data[key_1])) {
+            data[key_1] = data[key_1].concat();
+            data = data[key_1];
+        }
+        else if (data[key_1]) {
+            // throw new Error(`目标路径不是纯对象，不能覆盖`);
+            // 强行转成对象
+            data[key_1] = {};
+            data = data[key_1];
+        }
+        else {
+            data[key_1] = {};
+            data = data[key_1];
+        }
+    }
+    data[last] = value;
+}
+function deleteVariable(data, key) {
+    if (!data) {
+        return;
+    }
+    else if (data.hasOwnProperty(key)) {
+        delete data[key];
+        return;
+    }
+    var parts = keyToPath(key);
+    var last = parts.pop();
+    while (parts.length) {
+        var key_2 = parts.shift();
+        if (isPlainObject__default["default"](data[key_2])) {
+            data = data[key_2] = __assign({}, data[key_2]);
+        }
+        else if (data[key_2]) {
+            throw new Error("\u76EE\u6807\u8DEF\u5F84\u4E0D\u662F\u7EAF\u5BF9\u8C61\uFF0C\u4E0D\u80FD\u4FEE\u6539");
+        }
+        else {
+            break;
+        }
+    }
+    if (data && data.hasOwnProperty && data.hasOwnProperty(last)) {
+        delete data[last];
+    }
+}
+
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-05-26 16:02:08
@@ -9882,9 +10104,30 @@ function getBulkActions(objectSchema){
       ]
 }
 
+async function getCrudSchemaWithDataFilter(crud, options = {}){
+  const { crudDataFilter, amisData, env } = options;
+  let onCrudDataFilter = options.onCrudDataFilter;
+  if (!onCrudDataFilter && typeof crudDataFilter === 'string') {
+    onCrudDataFilter = new Function(
+      'crud',
+      'env',
+      'data',
+      crudDataFilter
+    );
+  }
+
+  try {
+    onCrudDataFilter && (crud = await onCrudDataFilter(crud, env, amisData) || crud);
+  } catch (e) {
+    console.warn(e);
+  }
+  return crud;
+}
+
 async function getObjectCRUD(objectSchema, fields, options){
     // console.time('getObjectCRUD');
-    const { top, perPage, showDisplayAs = false, displayAs, crudClassName = "" } = options;
+    const { top, perPage, showDisplayAs = false, displayAs, crudClassName = "",
+      crudDataFilter, onCrudDataFilter, amisData, env } = options;
     const nonpaged = objectSchema.paging && objectSchema.paging.enabled === false;
     const isTreeObject = objectSchema.enable_tree;
     const bulkActions = getBulkActions(objectSchema);
@@ -9925,6 +10168,14 @@ async function getObjectCRUD(objectSchema, fields, options){
       filterVisible: options.filterVisible
     });
 
+    options.amisData = createObject(options.amisData, {
+      objectName: objectSchema.name,
+      // _id: null,
+      recordPermissions: objectSchema.permissions,
+      uiSchema: objectSchema,
+      // loaded: false //crud接收适配器中设置为true，否则就是刷新浏览器第一次加载
+    });
+
 
     let body = null;
     const id = `listview_${objectSchema.name}`;
@@ -9950,7 +10201,12 @@ async function getObjectCRUD(objectSchema, fields, options){
       if(objectSchema.name === 'organizations'){
         labelFieldName = 'name';
       }
-      const table = await getTableSchema$1(fields, Object.assign({idFieldName: objectSchema.idFieldName, labelFieldName: labelFieldName, permissions:objectSchema.permissions,enable_inline_edit:objectSchema.enable_inline_edit}, options));
+      let tableOptions = Object.assign({
+        idFieldName: objectSchema.idFieldName, labelFieldName: labelFieldName, 
+        permissions:objectSchema.permissions,enable_inline_edit:objectSchema.enable_inline_edit
+      }, options);
+      tableOptions.amisData = createObject(options.amisData || {}, {});
+      const table = await getTableSchema$1(fields, tableOptions);
       delete table.mode;
       //image与avatar需要在提交修改时特别处理
       const imageNames = ___default["default"].compact(___default["default"].map(___default["default"].filter(fields, (field) => ["image","avatar"].includes(field.type)), 'name'));
@@ -10008,17 +10264,26 @@ async function getObjectCRUD(objectSchema, fields, options){
             Authorization: "Bearer ${context.tenantId},${context.authToken}",
           },
           requestAdaptor: quickSaveApiRequestAdaptor,
+          adaptor: `
+              if(payload.errors){
+                  payload.status = 2;
+                  payload.msg = window.t ? window.t(payload.errors[0].message) : payload.errors[0].message;
+              }
+              return payload;
+          `
         },
         rowClassNameExpr: options.rowClassNameExpr
-      }, 
-        bodyProps,
-        );
+      }, bodyProps);
+
     }
 
     const defaults = options.defaults;
+    
+    const listSchema = (defaults && defaults.listSchema) || {};
+    body = defaultsDeep({}, listSchema, body);
+    body = await getCrudSchemaWithDataFilter(body, { crudDataFilter, onCrudDataFilter, amisData, env });
+
     if (defaults) {
-      const listSchema = defaults.listSchema || {};
-      body = defaultsDeep({}, listSchema, body);
       const headerSchema = defaults.headerSchema;
       const footerSchema = defaults.footerSchema;
       if (headerSchema || footerSchema) {
@@ -10047,16 +10312,10 @@ async function getObjectCRUD(objectSchema, fields, options){
     return {
       type: 'service',
       className: '',
-      //目前crud的service层id不认用户自定义id，只支持默认规则id
+      //目前crud的service层id不认用户自定义id，只支持默认规则id，许多地方的格式都写死了service_listview_${objectname}
       id: `service_${id}`,
       name: `page`,
-      data: {
-        objectName: objectSchema.name,
-        // _id: null,
-        recordPermissions: objectSchema.permissions,
-        uiSchema: objectSchema,
-        // loaded: false //crud接收适配器中设置为true，否则就是刷新浏览器第一次加载
-      },
+      data: options.amisData,
       body: body
     }
 }
@@ -10356,7 +10615,7 @@ const getRecordPermissions = async (objectName, recordId)=>{
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
  * @LastEditors: liaodaxue
- * @LastEditTime: 2023-08-28 14:55:23
+ * @LastEditTime: 2023-09-25 17:18:08
  * @Description:
  */
 
@@ -10531,7 +10790,8 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
         setDataToComponentId: componentId,
         // tableHiddenOn: hiddenEmptyTable ? "this.$count === 0" : null,
         appId: appId,
-        crudClassName: 'border-t border-slate-300 hidden',
+        crudClassName: 'border-t border-gray-300 hidden',
+        refField,
         ...ctx
     };
     const amisSchema= (await getRelatedListSchema(relatedObjectName, 'all', options)).amisSchema;
@@ -10543,7 +10803,7 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
         amisSchema: {
             type: "service",
             id: componentId,
-            className: `steedos-record-related-list ${componentId} rounded border border-slate-300 bg-gray-100 mb-4 ${className}`,
+            className: `steedos-record-related-list ${componentId} rounded border border-gray-300 bg-gray-100 mb-4 ${className}`,
             data: {
                 relatedKey: relatedKey,   
                 listViewId: `amis-\${appId}-${relatedObjectName}-listview`,
@@ -10646,10 +10906,33 @@ async function getRelatedListSchema(
     ctx
   ) {
     const uiSchema = await getUISchema(objectName);
-    const listView = uiSchema.list_views;
+    const listView =  _$1.find(
+        uiSchema.list_views,
+        (listView, name) => {
+            // 传入listViewName空值则取第一个
+            if(!listViewName){
+                listViewName = name;
+            }
+            return name === listViewName || listView._id === listViewName;
+        }
+    );
     const listViewProps = getRelatedListProps(uiSchema,listViewName, ctx);
     // console.log('listViewProps==>', listViewProps)
     const {columns: listViewColumns, sort: listViewSort, filter: listviewFilter, filtersFunction } = listViewProps;
+
+    const refFieldName = ctx.refField && ctx.refField.name;
+
+    let relatedListColumns = listViewColumns;
+    if(refFieldName){
+        relatedListColumns = listViewColumns.filter(function(columnItem){
+            if(typeof columnItem === "string"){
+                return columnItem !== refFieldName;
+            }
+            else {
+                return columnItem.field !== refFieldName;
+            }
+        });
+    }
   
     const defaults = ctx.defaults || {};
   
@@ -10687,7 +10970,7 @@ async function getRelatedListSchema(
     const amisSchema = {
         "type": "steedos-object-table",
         "objectApiName": objectName,
-        "columns": listViewColumns,
+        "columns": relatedListColumns,
         "extraColumns": listView.extra_columns,
         "filters": listviewFilter,
         "filtersFunction": filtersFunction,
@@ -10708,7 +10991,7 @@ async function getRelatedListSchema(
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-09-14 13:57:32
+ * @LastEditTime: 2023-09-21 17:35:06
  * @Description:
  */
 
@@ -11041,7 +11324,9 @@ async function getListSchema(
         "adaptor": listView.adaptor,
         "headerToolbarItems": ctx.headerToolbarItems,
         "filterVisible": ctx.filterVisible,
-        "rowClassNameExpr": ctx.rowClassNameExpr
+        "rowClassNameExpr": ctx.rowClassNameExpr,
+        "crudDataFilter": ctx.crudDataFilter,
+        "onCrudDataFilter": ctx.onCrudDataFilter
     };
     // console.log(`getListSchema===>`,amisSchema)
     return {
@@ -11144,7 +11429,7 @@ async function getTableSchema(
         fields = fields.concat(extraFields);
     }
     
-    const amisSchema = await getObjectCRUD(uiSchema, fields, {
+    let crudOptions = {
         tabId: objectName,
         appId: appName,
         objectName: objectName,
@@ -11153,8 +11438,9 @@ async function getTableSchema(
         sort,
         headerToolbarItems: ctx.headerToolbarItems,
         buttons: await getListViewItemButtons(uiSchema, ctx)
-    });
-    console.log('getTableSchema====>amisSchema', amisSchema);
+    };
+    crudOptions.amisData = createObject(ctx.amisData || {}, {});
+    const amisSchema = await getObjectCRUD(uiSchema, fields, crudOptions);
     // console.timeEnd('getTableSchema');
     return {
         uiSchema,
@@ -11226,7 +11512,7 @@ async function getRecordDetailSchema(objectName, appId, props = {}){
     };
     const content = {
         "type": "tabs",
-        "className": "sm:mt-3 bg-white sm:shadow sm:rounded sm:border border-slate-300 p-4",
+        "className": "sm:mt-3 bg-white sm:rounded sm:border border-gray-300 p-4",
         "tabs": [
             detailed
         ],
@@ -11413,7 +11699,7 @@ async function getListPageInitSchema(objectApiName, formFactor, userSession) {
             "columnsTogglable": false,
             "showHeader": true,
             // "headerSchema": headerSchema
-            className: "sm:border bg-white sm:shadow sm:rounded border-slate-300 border-solid"
+            className: "sm:border bg-white sm:rounded border-gray-300 border-solid"
         }]
     }
 }
@@ -11471,7 +11757,7 @@ async function getRecordPageInitSchema(objectApiName){
                 ]
             }
         ],
-        "className": "sm:mt-3 flex flex-col region-main bg-white sm:shadow sm:rounded sm:border border-slate-300",
+        "className": "sm:mt-3 flex flex-col region-main bg-white sm:rounded sm:border border-gray-300",
         "linksClassName": "pl-4 pt-2"
     };
     if(relatedList.length){
@@ -11938,161 +12224,6 @@ const registerRemoteAssets = async (assetUrls)=>{
     }
 };
 
-/******************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-
-var __assign = function() {
-    __assign = Object.assign || function __assign(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-
-/**
- * 将例如像 a.b.c 或 a[1].b 的字符串转换为路径数组
- *
- * @param string 要转换的字符串
- */
-var keyToPath = function (string) {
-    var result = [];
-    if (string.charCodeAt(0) === '.'.charCodeAt(0)) {
-        result.push('');
-    }
-    string.replace(new RegExp('[^.[\\]]+|\\[(?:([^"\'][^[]*)|(["\'])((?:(?!\\2)[^\\\\]|\\\\.)*?)\\2)\\]|(?=(?:\\.|\\[\\])(?:\\.|\\[\\]|$))', 'g'), function (match, expression, quote, subString) {
-        var key = match;
-        if (quote) {
-            key = subString.replace(/\\(\\)?/g, '$1');
-        }
-        else if (expression) {
-            key = expression.trim();
-        }
-        result.push(key);
-        return '';
-    });
-    return result;
-};
-
-// 方便取值的时候能够把上层的取到，但是获取的时候不会全部把所有的数据获取到。
-function createObject(superProps, props, properties) {
-    if (superProps && Object.isFrozen(superProps)) {
-        superProps = cloneObject(superProps);
-    }
-    var obj = superProps
-        ? Object.create(superProps, __assign(__assign({}, properties), { __super: {
-                value: superProps,
-                writable: false,
-                enumerable: false
-            } }))
-        : Object.create(Object.prototype, properties);
-    props &&
-        isObject(props) &&
-        Object.keys(props).forEach(function (key) { return (obj[key] = props[key]); });
-    return obj;
-}
-function cloneObject(target, persistOwnProps) {
-    if (persistOwnProps === void 0) { persistOwnProps = true; }
-    var obj = target && target.__super
-        ? Object.create(target.__super, {
-            __super: {
-                value: target.__super,
-                writable: false,
-                enumerable: false
-            }
-        })
-        : Object.create(Object.prototype);
-    persistOwnProps &&
-        target &&
-        Object.keys(target).forEach(function (key) { return (obj[key] = target[key]); });
-    return obj;
-}
-function extendObject(target, src, persistOwnProps) {
-    if (persistOwnProps === void 0) { persistOwnProps = true; }
-    var obj = cloneObject(target, persistOwnProps);
-    src && Object.keys(src).forEach(function (key) { return (obj[key] = src[key]); });
-    return obj;
-}
-function isObject(obj) {
-    var typename = typeof obj;
-    return (obj &&
-        typename !== 'string' &&
-        typename !== 'number' &&
-        typename !== 'boolean' &&
-        typename !== 'function' &&
-        !Array.isArray(obj));
-}
-function setVariable(data, key, value, convertKeyToPath) {
-    data = data || {};
-    if (key in data) {
-        data[key] = value;
-        return;
-    }
-    var parts = convertKeyToPath !== false ? keyToPath(key) : [key];
-    var last = parts.pop();
-    while (parts.length) {
-        var key_1 = parts.shift();
-        if (isPlainObject__default["default"](data[key_1])) {
-            data = data[key_1] = __assign({}, data[key_1]);
-        }
-        else if (Array.isArray(data[key_1])) {
-            data[key_1] = data[key_1].concat();
-            data = data[key_1];
-        }
-        else if (data[key_1]) {
-            // throw new Error(`目标路径不是纯对象，不能覆盖`);
-            // 强行转成对象
-            data[key_1] = {};
-            data = data[key_1];
-        }
-        else {
-            data[key_1] = {};
-            data = data[key_1];
-        }
-    }
-    data[last] = value;
-}
-function deleteVariable(data, key) {
-    if (!data) {
-        return;
-    }
-    else if (data.hasOwnProperty(key)) {
-        delete data[key];
-        return;
-    }
-    var parts = keyToPath(key);
-    var last = parts.pop();
-    while (parts.length) {
-        var key_2 = parts.shift();
-        if (isPlainObject__default["default"](data[key_2])) {
-            data = data[key_2] = __assign({}, data[key_2]);
-        }
-        else if (data[key_2]) {
-            throw new Error("\u76EE\u6807\u8DEF\u5F84\u4E0D\u662F\u7EAF\u5BF9\u8C61\uFF0C\u4E0D\u80FD\u4FEE\u6539");
-        }
-        else {
-            break;
-        }
-    }
-    if (data && data.hasOwnProperty && data.hasOwnProperty(last)) {
-        delete data[last];
-    }
-}
-
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-12-17 17:03:40