@steedos-widgets/amis-object 1.2.26 → 1.2.28

package/dist/amis-object.umd.js

@@ -106,18 +106,6 @@
         }
     }
 
-    function __values(o) {
-        var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-        if (m) return m.call(o);
-        if (o && typeof o.length === "number") return {
-            next: function () {
-                if (o && i >= o.length) o = void 0;
-                return { value: o && o[i++], done: !o };
-            }
-        };
-        throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-    }
-
     function __read(o, n) {
         var m = typeof Symbol === "function" && o[Symbol.iterator];
         if (!m) return o;
@@ -3826,6 +3814,10 @@
                 if(___default.includes(['percent','time','filesize','date','datetime','boolean','number','currency', 'select', 'file', 'image', 'avatar', 'formula', 'summary', 'object', 'grid'], field.type)){
                     displayFields.push(`${field.name}`);
                 }
+            }else {
+                objectFieldName = field.name.split('.')[0];
+                fieldsName.push(objectFieldName);
+                displayFields.push(objectFieldName);
             }
         }
 
@@ -4906,8 +4898,8 @@
     /*
      * @Author: baozhoutao@steedos.com
      * @Date: 2022-11-01 15:51:00
-     * @LastEditors: liaodaxue
-     * @LastEditTime: 2023-06-06 11:12:33
+     * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+     * @LastEditTime: 2023-06-28 23:19:41
      * @Description: 
      */
 
@@ -4958,6 +4950,16 @@
         return {
             data: formSchema
         };
+    `;
+        const onDialogCancelScript = `
+        // 这里加setTimeout是因为amis的Bug，它会先触发cancel事件执行此脚本关闭父窗口然后再关闭子窗口
+        // 正确的顺序应该是先关闭子窗口再关闭父窗口，顺序错了会造成第二次点击新建按钮的时候异常
+        setTimeout(function(){
+            doAction({
+                "actionType": "cancel",
+                "componentId": "object_actions_drawer_${uiSchema.name}"
+            });
+        }, 200);
     `;
         return {
             "type": "service",
@@ -5019,6 +5021,17 @@
                                         "closeOnEsc": false,
                                         "closeOnOutside": false,
                                         "size": "lg",
+                                        "onEvent": {
+                                            "cancel": {
+                                                "actions": [
+                                                    {
+                                                        "actionType": "custom",
+                                                        "script": onDialogCancelScript,
+                                                        "expression": "${window:innerWidth < 768}",
+                                                    }
+                                                ]
+                                            }
+                                        },
                                         "actions": [
                                             {
                                                 type: 'button',
@@ -5081,7 +5094,7 @@
      * @Author: baozhoutao@steedos.com
      * @Date: 2022-11-01 15:49:58
      * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
-     * @LastEditTime: 2023-03-27 11:36:49
+     * @LastEditTime: 2023-06-28 23:22:31
      * @Description:
      */
 
@@ -5110,6 +5123,17 @@
           ? JSON.parse(page.schema)
           : page.schema;
       }
+      
+      const onDialogCancelScript = `
+    // 这里加setTimeout是因为amis的Bug，它会先触发cancel事件执行此脚本关闭父窗口然后再关闭子窗口
+    // 正确的顺序应该是先关闭子窗口再关闭父窗口，顺序错了会造成第二次点击编辑按钮的时候异常
+    setTimeout(function(){
+      doAction({
+        "actionType": "cancel",
+        "componentId": "object_actions_drawer_${uiSchema.name}"
+      });
+    }, 200);
+  `;
 
       return {
         type: "service",
@@ -5133,6 +5157,17 @@
                       closeOnOutside: false,
                       showCloseButton: true,
                       size: "lg",
+                      "onEvent": {
+                        "cancel": {
+                          "actions": [
+                            {
+                              "actionType": "custom",
+                              "script": onDialogCancelScript,
+                              "expression": "${window:innerWidth < 768}",
+                            }
+                          ]
+                        }
+                      },
                     },
                   },
                 ],
@@ -5429,6 +5464,7 @@
                                   label: instance.t('frontend_import_data_file'),
                                   required: true,
                                   type: "input-file",
+                                  accept: ".xlsx,.xls",
                                   className: "m-1",
                                   labelClassName: "text-left",
                                   clearValueOnHidden: true,
@@ -6093,6 +6129,7 @@
                         "drawer": {
                           "type": "drawer",
                           "title": "操作",
+                          "id": "object_actions_drawer_" + objectSchema.name,
                           "body": [
                             {
                               "type": "button-group",
@@ -6115,7 +6152,6 @@
                               "size": "lg"
                             }
                           ],
-                          "id": "u:9815f7366b9f",
                           "position": "bottom",
                           "closeOnOutside": true,
                           "resizable": false,
@@ -6126,8 +6162,7 @@
                       }
                     ]
                   }
-                },
-                "id": "u:ee7c7929e6ae"
+                }
               }
         }else {
             if(moreButtons.length > 0){
@@ -6159,6 +6194,7 @@
                         "drawer": {
                           "type": "drawer",
                           "title": "操作",
+                          "id": "object_actions_drawer_" + objectSchema.name,
                           "body": [
                             {
                               "type": "button-group",
@@ -6182,7 +6218,6 @@
                               "size": "lg"
                             }
                           ],
-                          "id": "u:9815f7366b9f",
                           "position": "bottom",
                           "closeOnOutside": true,
                           "resizable": false,
@@ -6193,8 +6228,7 @@
                       }
                     ]
                   }
-                },
-                "id": "u:ee7c7929e6ae"
+                }
               }
         }else {
             return ___default__default["default"].map(buttons, (button) => {
@@ -6223,6 +6257,7 @@
                         "drawer": {
                           "type": "drawer",
                           "title": "操作",
+                          "id": "object_actions_drawer_" + objectSchema.name,
                           "body": [
                             {
                               "type": "button-group",
@@ -8799,6 +8834,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         const fieldsArr = [];
 
         const listName = "all";
+        
+        const isMobile = window.innerWidth < 768;
 
         const listView = ___default__namespace.find(
             refObjectConfig.list_views,
@@ -8875,6 +8912,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         
         source.data.$term = "$term";
         source.data.$self = "$$";
+
        
         source.requestAdaptor = `
         const selfData = JSON.parse(JSON.stringify(api.data.$self));
@@ -8910,6 +8948,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             }
         }
 
+
         if(allowSearchFields){
             allowSearchFields.forEach(function(key){
                 const keyValue = selfData[key];
@@ -9025,7 +9064,6 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             pickerSchema.affixHeader = false;
 
             var headerToolbarItems = [];
-            const isMobile = window.innerWidth < 768;
             if(referenceTo.objectName === "space_users" && field.reference_to_field === "user" && !isMobile){
                  headerToolbarItems = getLookupSapceUserTreeSchema();
                  pickerSchema["style"] = {
@@ -9106,7 +9144,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                     }
                     
                     const ctx = ${JSON.stringify(ctx)};
-                    const componentId = ctx.defaults.formSchema.id ? 'service-'+ctx.defaults.formSchema.id : 'new-'+ctx.defaults.formSchema.objectApiName;
+                    const componentId = ctx.defaults.formSchema.id;
                     doAction({
                         actionType: 'setValue',
                         componentId: componentId, 
@@ -9360,6 +9398,11 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                 // ids人员点选模式
                 return await lookupToAmisIdsPicker(field, readonly, ctx);
             }
+            if(!field.filters || field.filters.length == 0){
+                field.filters = [["user_accepted", "=", true]];
+            }else {
+                field.filters = [ ["user_accepted", "=", true], "and", field.filters ];
+            }
             // 左侧树右侧人员列表的下拉框模式，不再支持，而是执行下面的lookupToAmisPicker函数弹出选人窗口
             // return await lookupToAmisSelectUser(field, readonly, ctx);
         }
@@ -9500,7 +9543,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
      * @Author: baozhoutao@steedos.com
      * @Date: 2023-01-13 17:27:54
      * @LastEditors: liaodaxue
-     * @LastEditTime: 2023-06-16 15:58:21
+     * @LastEditTime: 2023-06-30 10:29:52
      * @Description: 
      */
 
@@ -9508,12 +9551,16 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     const getMarkdownFieldSchema = (field, readonly, ctx)=>{
         if(readonly){
             return {
-                "type": "markdown",
-                "name": field.name,
-                "options": {
-                    "linkify": true,
-                    "html": true,
-                    "breaks": true
+                "type": "control",
+                "label": field.label,
+                "body": {
+                  "type": "markdown",
+                  "name": field.name,
+                  "options": {
+                      "linkify": true,
+                      "html": true,
+                      "breaks": true
+                  }
                 }
               }
         }else {
@@ -10594,6 +10641,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     async function getTableColumns$1(fields, options){
         const columns = [{name: '_index',type: 'text', width: 32, placeholder: ""}];
         const allowEdit = options.permissions?.allowEdit && options.permissions?.modifyAllRecords && !options.isLookup && options.enable_inline_edit != false;
+        const defaultWidth = "unset";//用于使table内的td标签下生成div，实现将快速编辑按钮固定在右侧的效果，并不是为了unset效果
         for (const field of fields) {
             //增加quickEdit属性，实现快速编辑
             const quickEditSchema = allowEdit ? await getQuickEditSchema(field, options) : allowEdit;
@@ -10650,7 +10698,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                     type: "switch",
                     name: field.name,
                     label: field.label,
-                    width: field.width,
+                    width: field.width || defaultWidth,
                     toggled: field.toggled,
                     quickEdit: quickEditSchema,
                     className:"whitespace-nowrap",
@@ -10665,7 +10713,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                     label: field.label,
                     map: map,
                     sortable: field.sortable,
-                    width: field.width,
+                    width: field.width || defaultWidth,
                     toggled: field.toggled,
                     className:"whitespace-nowrap",
                     quickEdit: quickEditSchema
@@ -10694,7 +10742,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                         label: field.label,
                         sortable: field.sortable,
                         // searchable: field.searchable,
-                        width: field.width,
+                        width: field.width || defaultWidth,
                         type: type,
                         tpl: tpl,
                         toggled: field.toggled,
@@ -11101,6 +11149,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         let valueField = mainObject.key_field || '_id';
         const api = await getApi(mainObject, null, fields, {count: options.queryCount, alias: 'rows', limit: top, queryOptions: `filters: {__filters}, top: {__top}, skip: {__skip}, sort: "{__sort}"`});
 
+        api.url += "&objectName=${objectName}";//设计器上对象表格组件需要切换对象重新请求列表数据
         if(options.isRelated){
             api.url += "&recordId=${_master.recordId}";
         }
@@ -11430,12 +11479,18 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         //     }
         // })
 
+        var fieldNames = ___default__namespace.map(fields, function(n){return n.name});
         return  `
     if(payload.data.data.length === 0){
         var isEditor = !!${options && options.isEditor};
         if(isEditor){
+            var fieldNames = ${JSON.stringify(fieldNames)};
+            var emptyDoc = {};//这里如果不把每个字段值设置为空的话，表单上会显示上一次表单上的字段值
+            fieldNames.forEach(function(n){
+                emptyDoc[n] = null;
+            });
             // 设计器中始终显示表单，有记录则显示第一条记录，没记录时显示为空表单
-            payload.data.data = [{}];
+            payload.data.data = [emptyDoc];
         }
         else{
             return {
@@ -12239,8 +12294,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     /*
      * @Author: baozhoutao@steedos.com
      * @Date: 2022-05-26 16:02:08
-     * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
-     * @LastEditTime: 2023-06-04 15:49:23
+     * @LastEditors: liaodaxue
+     * @LastEditTime: 2023-06-29 17:27:19
      * @Description: 
      */
 
@@ -12334,7 +12389,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         const section = await getSection(formFields, permissionFields, fieldSchemaArray, key, ctx);
         if (section.body.length > 0) {
           if (section.visibleOn) {
-            sectionVisibleOns.push(section.visibleOn);
+            sectionVisibleOns.push("("+section.visibleOn+")");
           }
           else {
             sectionVisibleOns.push("true");
@@ -12672,8 +12727,12 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         if(___default__default["default"].has(formSchema, 'className')){
           formSchema.className = 'steedos-amis-form';
         }
+        if(!formSchema.id){
+          formSchema.id = 'form_' + objectSchema.name;
+        }
         const amisSchema =  {
           type: 'service',
+          id: `service_${formSchema.id}`,
           className: 'p-0',
           name: `page_edit_${recordId}`,
           api: await getEditFormInitApi(objectSchema, recordId, fields, ctx),
@@ -12744,11 +12803,6 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             }
           })]
         };
-        if(formSchema.id){
-          amisSchema.id = `service-${formSchema.id}`;
-        }else {
-          amisSchema.id = `new-${objectSchema.name}`;
-        }
         return amisSchema;
     }
 
@@ -16777,85 +16831,71 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     });
 
     var getSchema = function (field, value, ctx) { return __awaiter(void 0, void 0, void 0, function () {
-        var refTo, leftName, options, refTo_1, refTo_1_1, item, refObject_1, e_1_1, refObject, rightSchema;
-        var e_1, _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var refTo, leftName, refObject, rightSchema;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
                 case 0:
                     refTo = field.reference_to;
                     if (refTo && ___default.isFunction(refTo)) {
                         refTo = refTo();
                     }
                     leftName = "".concat(field.name, "__left");
-                    options = [];
-                    _b.label = 1;
-                case 1:
-                    _b.trys.push([1, 6, 7, 8]);
-                    refTo_1 = __values(refTo), refTo_1_1 = refTo_1.next();
-                    _b.label = 2;
-                case 2:
-                    if (!!refTo_1_1.done) return [3 /*break*/, 5];
-                    item = refTo_1_1.value;
-                    return [4 /*yield*/, getUISchema(item, false)];
-                case 3:
-                    refObject_1 = _b.sent();
-                    options.push({
-                        label: refObject_1.label,
-                        value: item,
-                        icon: refObject_1.icon
-                    });
-                    _b.label = 4;
-                case 4:
-                    refTo_1_1 = refTo_1.next();
-                    return [3 /*break*/, 2];
-                case 5: return [3 /*break*/, 8];
-                case 6:
-                    e_1_1 = _b.sent();
-                    e_1 = { error: e_1_1 };
-                    return [3 /*break*/, 8];
-                case 7:
-                    try {
-                        if (refTo_1_1 && !refTo_1_1.done && (_a = refTo_1.return)) _a.call(refTo_1);
-                    }
-                    finally { if (e_1) throw e_1.error; }
-                    return [7 /*endfinally*/];
-                case 8:
+                    // const options = [];
+                    // for (const item of refTo) {
+                    //   const refObject = await getUISchema(item, false);
+                    //   options.push({
+                    //       label: refObject.label,
+                    //       value: item,
+                    //       icon: refObject.icon
+                    //   });
+                    // }
                     // console.log(`getSchema refTo`, refTo);
                     // console.log(`getSchema options`, options);
                     // console.log(`getSchema value=========>`, value);
                     if (!value || !value.o) {
                         value = {
-                            o: options[0].value,
+                            o: refTo[0],
                             ids: []
                         };
                     }
                     return [4 /*yield*/, getUISchema(value.o, false)];
-                case 9:
-                    refObject = _b.sent();
+                case 1:
+                    refObject = _a.sent();
                     rightSchema = null;
-                    if (!(refObject.enable_enhanced_lookup == true)) return [3 /*break*/, 11];
+                    if (!(refObject.enable_enhanced_lookup == true)) return [3 /*break*/, 3];
                     return [4 /*yield*/, lookupToAmisPicker(Object.assign({}, field, { reference_to: value.o }), false, ctx)];
-                case 10:
-                    rightSchema = _b.sent();
-                    return [3 /*break*/, 13];
-                case 11:
+                case 2:
+                    rightSchema = _a.sent();
+                    return [3 /*break*/, 5];
+                case 3:
                     if (!ctx) {
                         ctx = {};
                     }
                     ctx.isRefToMutiple = ___default.isArray(refTo);
                     return [4 /*yield*/, lookupToAmisSelect(Object.assign({}, field, { reference_to: value.o }), false, ctx)];
-                case 12:
-                    rightSchema = _b.sent();
-                    _b.label = 13;
-                case 13: return [2 /*return*/, {
+                case 4:
+                    rightSchema = _a.sent();
+                    _a.label = 5;
+                case 5: return [2 /*return*/, {
                         "type": "input-group",
                         "label": false,
                         "body": [
                             {
                                 "type": "select",
-                                "inputClassName": "select_left",
+                                "inputClassName": "lookup-left",
                                 "name": leftName,
-                                "options": options,
+                                // "options": options,
+                                "source": {
+                                    "method": "post",
+                                    "url": "${context.rootUrl}/graphql",
+                                    "data": {
+                                        "query": "{options:objects(filters: {__filters}, top: {__top}, sort: \"{__sort}\"){_id label:label value:name icon},count:objects__count(filters:{__filters})}"
+                                    },
+                                    "headers": {
+                                        "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                                    },
+                                    "requestAdaptor": "\nvar filters = [\"name\",\"in\", ".concat(JSON.stringify(refTo), "]; \nvar top = ").concat(JSON.stringify(refTo), ".length;\n\nvar sort = \"\";\napi.data.query = api.data.query.replace(/{__filters}/g, JSON.stringify(filters)).replace('{__top}', top).replace('{__sort}', sort.trim());\nreturn api;"),
+                                },
                                 "value": "".concat(value.o)
                             },
                             Object.assign({}, rightSchema, {
@@ -17186,16 +17226,16 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     };
 
     var AmisObjectForm = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-        var $schema, recordId, defaultData, mode, layout, labelAlign, appId, fieldsExtend, _a, excludedFields, _b, fields, _c, className, initApiRequestAdaptor, initApiAdaptor, apiRequestAdaptor, apiAdaptor, enableTabs, tabsMode, objectApiName, schemaKeys, formSchema, defaults, options, globalData, amisSchema, uiSchema, schema, schema, formData;
-        return __generator(this, function (_d) {
-            switch (_d.label) {
+        var $schema, recordId, defaultData, mode, layout, labelAlign, appId, fieldsExtend, _a, excludedFields, _b, fields, _c, form, _d, className, initApiRequestAdaptor, initApiAdaptor, apiRequestAdaptor, apiAdaptor, enableTabs, tabsMode, objectApiName, schemaKeys, formSchema, defaults, options, globalData, amisSchema, uiSchema, schema, schema, formData;
+        return __generator(this, function (_e) {
+            switch (_e.label) {
                 case 0:
-                    $schema = props.$schema, recordId = props.recordId, defaultData = props.defaultData, mode = props.mode, layout = props.layout, labelAlign = props.labelAlign, appId = props.appId, fieldsExtend = props.fieldsExtend, _a = props.excludedFields, excludedFields = _a === void 0 ? null : _a, _b = props.fields, fields = _b === void 0 ? null : _b, _c = props.className, className = _c === void 0 ? "" : _c, initApiRequestAdaptor = props.initApiRequestAdaptor, initApiAdaptor = props.initApiAdaptor, apiRequestAdaptor = props.apiRequestAdaptor, apiAdaptor = props.apiAdaptor, enableTabs = props.enableTabs, tabsMode = props.tabsMode;
+                    $schema = props.$schema, recordId = props.recordId, defaultData = props.defaultData, mode = props.mode, layout = props.layout, labelAlign = props.labelAlign, appId = props.appId, fieldsExtend = props.fieldsExtend, _a = props.excludedFields, excludedFields = _a === void 0 ? null : _a, _b = props.fields, fields = _b === void 0 ? null : _b, _c = props.form, form = _c === void 0 ? {} : _c, _d = props.className, className = _d === void 0 ? "" : _d, initApiRequestAdaptor = props.initApiRequestAdaptor, initApiAdaptor = props.initApiAdaptor, apiRequestAdaptor = props.apiRequestAdaptor, apiAdaptor = props.apiAdaptor, enableTabs = props.enableTabs, tabsMode = props.tabsMode;
                     objectApiName = props.objectApiName || "space_users";
-                    schemaKeys = ___default.difference(___default.keys($schema), ["type", "mode", "layout", "defaultData"]);
+                    schemaKeys = ___default.difference(___default.keys($schema), ["id", "form", "type", "mode", "layout", "defaultData"]);
                     formSchema = ___default.pick(props, schemaKeys);
                     defaults = {
-                        formSchema: formSchema
+                        formSchema: Object.assign({}, formSchema, form)
                     };
                     options = {
                         recordId: recordId,
@@ -17225,7 +17265,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                             tabsMode: tabsMode
                         }))];
                 case 1:
-                    schema = _d.sent();
+                    schema = _e.sent();
                     amisSchema = schema.amisSchema;
                     if (defaultData) {
                         // 让ObjectForm支持props中的dafaultData属性与上层组件配置的defaultData混合
@@ -17247,10 +17287,10 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                     }
                     return [4 /*yield*/, getViewSchema(objectApiName, recordId, options)];
                 case 3:
-                    schema = _d.sent();
+                    schema = _e.sent();
                     amisSchema = schema.amisSchema;
                     uiSchema = schema.uiSchema;
-                    _d.label = 4;
+                    _e.label = 4;
                 case 4:
                     formData = {};
                     // formData.recordId = recordId || null;
@@ -17271,12 +17311,12 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     }); };
 
     var AmisObjectListView = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-        var $schema, top, perPage, _a, showHeader, data, defaultData, _b, className, crudClassName, _c, showDisplayAs, sideSchema, _e, filterVisible, headerToolbarItems, rowClassNameExpr, headerSchema, ctx, listName, defaults, objectApiName, displayAs, formFactor, isMobile, uiSchema, listView, schemaKeys, listSchema, setDataToComponentId, amisSchemaData, listViewId, listViewSchemaProps, serviceData;
-        var _f;
-        return __generator(this, function (_g) {
-            switch (_g.label) {
+        var $schema, top, perPage, _a, showHeader, data, defaultData, _b, crud, _c, className, crudClassName, _d, showDisplayAs, sideSchema, _f, filterVisible, headerToolbarItems, rowClassNameExpr, headerSchema, ctx, listName, defaults, objectApiName, displayAs, formFactor, isMobile, uiSchema, listView, schemaKeys, listSchema, setDataToComponentId, amisSchemaData, listViewId, listViewSchemaProps, serviceData;
+        var _g;
+        return __generator(this, function (_h) {
+            switch (_h.label) {
                 case 0:
-                    $schema = props.$schema, top = props.top, perPage = props.perPage, _a = props.showHeader, showHeader = _a === void 0 ? true : _a, data = props.data, defaultData = props.defaultData, _b = props.className, className = _b === void 0 ? "" : _b, crudClassName = props.crudClassName, _c = props.showDisplayAs, showDisplayAs = _c === void 0 ? false : _c, sideSchema = props.sideSchema, props.columnsTogglable, _e = props.filterVisible, filterVisible = _e === void 0 ? true : _e, headerToolbarItems = props.headerToolbarItems, rowClassNameExpr = props.rowClassNameExpr;
+                    $schema = props.$schema, top = props.top, perPage = props.perPage, _a = props.showHeader, showHeader = _a === void 0 ? true : _a, data = props.data, defaultData = props.defaultData, _b = props.crud, crud = _b === void 0 ? {} : _b, _c = props.className, className = _c === void 0 ? "" : _c, crudClassName = props.crudClassName, _d = props.showDisplayAs, showDisplayAs = _d === void 0 ? false : _d, sideSchema = props.sideSchema, props.columnsTogglable, _f = props.filterVisible, filterVisible = _f === void 0 ? true : _f, headerToolbarItems = props.headerToolbarItems, rowClassNameExpr = props.rowClassNameExpr;
                     headerSchema = props.headerSchema;
                     ctx = props.ctx;
                     listName = (defaultData === null || defaultData === void 0 ? void 0 : defaultData.listName) || (data === null || data === void 0 ? void 0 : data.listName) || (props === null || props === void 0 ? void 0 : props.listName);
@@ -17305,7 +17345,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                     }
                     return [4 /*yield*/, getUISchema(objectApiName, false)];
                 case 1:
-                    uiSchema = _g.sent();
+                    uiSchema = _h.sent();
                     listView = ___default.find(uiSchema.list_views, function (listView, name) {
                         // 传入listViewName空值则取第一个
                         if (!listName) {
@@ -17324,7 +17364,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                     }
                     listName = listView.name;
                     if (!(ctx && ctx.defaults)) {
-                        schemaKeys = ___default.difference(___default.keys($schema), ["type", "showHeader", "id"]);
+                        schemaKeys = ___default.difference(___default.keys($schema), ["type", "showHeader", "id", "crud"]);
                         listSchema = ___default.pick(props, schemaKeys);
                         // className不传入crud组件，crud单独识别crudClassName属性
                         listSchema.className = crudClassName;
@@ -17347,7 +17387,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                             ]
                         };
                         defaults = {
-                            listSchema: listSchema
+                            listSchema: Object.assign({}, listSchema, crud)
                         };
                     }
                     setDataToComponentId = ctx && ctx.setDataToComponentId;
@@ -17370,7 +17410,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                     if (!___default.has(data, 'uiSchema')) {
                         serviceData.uiSchema = uiSchema;
                     }
-                    serviceData.defaultListName = listName ? listName : (_f = ___default.first(___default.values(uiSchema.list_views))) === null || _f === void 0 ? void 0 : _f.name;
+                    serviceData.defaultListName = listName ? listName : (_g = ___default.first(___default.values(uiSchema.list_views))) === null || _g === void 0 ? void 0 : _g.name;
                     // console.timeEnd('AmisObjectListView')
                     // console.log('serviceData===>', serviceData)
                     // console.log('headerSchema===>', headerSchema)
@@ -17400,7 +17440,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                                                     {
                                                         "type": "service",
                                                         "schemaApi": {
-                                                            "url": "${context.rootUrl}/graphql?listName=${listName}&display=${display}",
+                                                            // 这里url上加objectApiName属性是因为设计器中切换对象时不会变更列表视图界面，不可以用objectName=${objectName}使用作用域中objectName变量是因为设计器那边不会监听识别data变化来render组件
+                                                            "url": "${context.rootUrl}/graphql?objectName=" + objectApiName + "&listName=${listName}&display=${display}",
                                                             "method": "post",
                                                             "messages": {},
                                                             "headers": {
@@ -17450,13 +17491,13 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         return tableColumns;
     }
     var AmisObjectTable = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-        var $schema, filters, filtersFunction, amisCondition, top, headerSchema, includedFields, fieldsExtend, sort, sortField, sortOrder, extraColumns, data, defaultData, _a, formFactor, _b, className, requestAdaptor, adaptor, _c, filterVisible, headerToolbarItems, ctx, columns, defaults, objectApiName, schemaKeys, listSchema, setDataToComponentId, amisFilters, tableFilters, amisSchemaData, appId, amisSchema;
-        return __generator(this, function (_d) {
-            switch (_d.label) {
+        var $schema, filters, filtersFunction, amisCondition, top, headerSchema, includedFields, fieldsExtend, sort, sortField, sortOrder, extraColumns, data, defaultData, _a, crud, _b, formFactor, _c, className, requestAdaptor, adaptor, _d, filterVisible, headerToolbarItems, ctx, columns, defaults, objectApiName, schemaKeys, listSchema, setDataToComponentId, amisFilters, tableFilters, amisSchemaData, appId, amisSchema;
+        return __generator(this, function (_e) {
+            switch (_e.label) {
                 case 0:
                     // console.time('AmisObjectTable')
                     console.log("AmisObjectTable props", props);
-                    $schema = props.$schema, filters = props.filters, filtersFunction = props.filtersFunction, amisCondition = props.amisCondition, top = props.top, headerSchema = props.headerSchema, includedFields = props.fields, fieldsExtend = props.fieldsExtend, sort = props.sort, sortField = props.sortField, sortOrder = props.sortOrder, extraColumns = props.extraColumns, data = props.data, defaultData = props.defaultData, _a = props.formFactor, formFactor = _a === void 0 ? window.innerWidth < 768 ? 'SMALL' : 'LARGE' : _a, _b = props.className, className = _b === void 0 ? "" : _b, requestAdaptor = props.requestAdaptor, adaptor = props.adaptor, _c = props.filterVisible, filterVisible = _c === void 0 ? true : _c, headerToolbarItems = props.headerToolbarItems;
+                    $schema = props.$schema, filters = props.filters, filtersFunction = props.filtersFunction, amisCondition = props.amisCondition, top = props.top, headerSchema = props.headerSchema, includedFields = props.fields, fieldsExtend = props.fieldsExtend, sort = props.sort, sortField = props.sortField, sortOrder = props.sortOrder, extraColumns = props.extraColumns, data = props.data, defaultData = props.defaultData, _a = props.crud, crud = _a === void 0 ? {} : _a, _b = props.formFactor, formFactor = _b === void 0 ? window.innerWidth < 768 ? 'SMALL' : 'LARGE' : _b, _c = props.className, className = _c === void 0 ? "" : _c, requestAdaptor = props.requestAdaptor, adaptor = props.adaptor, _d = props.filterVisible, filterVisible = _d === void 0 ? true : _d, headerToolbarItems = props.headerToolbarItems;
                     ctx = props.ctx;
                     if (!ctx) {
                         ctx = {};
@@ -17468,12 +17509,12 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                     defaults = {};
                     objectApiName = props.objectApiName || "space_users";
                     if (!(ctx && ctx.defaults)) {
-                        schemaKeys = ___default.difference(___default.keys($schema), ["type", "objectApiName", "columns", "extraColumns", "id"]);
+                        schemaKeys = ___default.difference(___default.keys($schema), ["type", "objectApiName", "columns", "extraColumns", "id", "crud"]);
                         listSchema = ___default.pick(props, schemaKeys);
                         // className不传入crud组件，crud单独识别crudClassName属性
                         listSchema.className = "";
                         defaults = {
-                            listSchema: listSchema
+                            listSchema: Object.assign({}, listSchema, crud)
                         };
                     }
                     // 支持通过直接定义headerSchema属性来定制表头，而不一定要通过ctx.defaults.headerSchema传入
@@ -17492,9 +17533,13 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                     ctx = ___default.pickBy(ctx, function (value) { return value !== undefined; });
                     return [4 /*yield*/, getTableSchema(appId, objectApiName, columns, __assign$2(__assign$2({ filters: tableFilters, filtersFunction: filtersFunction, top: top, sort: sort, sortField: sortField, sortOrder: sortOrder, extraColumns: extraColumns, defaults: defaults }, ctx), { setDataToComponentId: setDataToComponentId, requestAdaptor: requestAdaptor, adaptor: adaptor, filterVisible: filterVisible, headerToolbarItems: headerToolbarItems }))];
                 case 1:
-                    amisSchema = (_d.sent()).amisSchema;
+                    amisSchema = (_e.sent()).amisSchema;
                     amisSchema.data = Object.assign({}, amisSchema.data, amisSchemaData);
+                    if (___default.has(props, 'objectApiName')) {
+                        amisSchema.data.objectName = objectApiName;
+                    }
                     amisSchema.className = "steedos-object-table h-full flex flex-col ".concat(className);
+                    amisSchema.objectApiName = objectApiName; //设计器中切换对象时画布中显示的列未同步变更
                     // console.log(`AmisObjectTable===>amisSchema`, amisSchema)
                     // console.timeEnd('AmisObjectTable')
                     return [2 /*return*/, amisSchema];