@steedos-widgets/amis-object 1.3.3 → 1.3.4-beta.1

package/dist/amis/AmisObjectTable.d.ts

@@ -4,10 +4,6 @@ export declare const AmisObjectTable: (props: any) => Promise<{
     className: string;
     id: string;
     name: string;
-    data: {
-        objectName: any;
-        recordPermissions: any;
-        uiSchema: any;
-    };
-    body: {};
+    data: any;
+    body: any;
 }>;

package/dist/amis-object.cjs.css

@@ -857,6 +857,9 @@ fieldset.antd-Collapse > legend{
 .pb-4 {
     padding-bottom: 1rem
 }
+.pl-0 {
+    padding-left: 0px
+}
 .text-left {
     text-align: left
 }

package/dist/amis-object.cjs.js

@@ -3613,7 +3613,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: 
  */
 
@@ -3793,9 +3793,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>
     <% } %>`
 }
@@ -10498,7 +10502,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;
                         }
@@ -11464,11 +11468,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){
@@ -11480,6 +11483,7 @@ async function getTableSchema$1(fields, options){
     }
     else {
         columns = await getTableColumns$1(fields, options);
+
         if(!isLookup && !hiddenColumnOperation){
             columns.push(await getTableOperation(options));
         }
@@ -12784,6 +12788,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$1 = function() {
+    __assign$1 = 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$1.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$1(__assign$1({}, 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_1(data[key_1])) {
+            data = data[key_1] = __assign$1({}, 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_1(data[key_2])) {
+            data = data[key_2] = __assign$1({}, 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
@@ -13024,9 +13183,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);
@@ -13067,6 +13247,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}`;
@@ -13092,7 +13280,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 || {}, {}).__super;
+      const table = await getTableSchema$1(fields, tableOptions);
       delete table.mode;
       //image与avatar需要在提交修改时特别处理
       const imageNames = _$1__default["default"].compact(_$1__default["default"].map(_$1__default["default"].filter(fields, (field) => ["image","avatar"].includes(field.type)), 'name'));
@@ -13152,9 +13345,9 @@ async function getObjectCRUD(objectSchema, fields, options){
           requestAdaptor: quickSaveApiRequestAdaptor,
         },
         rowClassNameExpr: options.rowClassNameExpr
-      }, 
-        bodyProps,
-        );
+      }, bodyProps);
+
+      body = await getCrudSchemaWithDataFilter(body, { crudDataFilter, onCrudDataFilter, amisData, env });
     }
 
     const defaults = options.defaults;
@@ -13189,16 +13382,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
     }
 }
@@ -13850,7 +14037,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-15 09:04:49
  * @Description:
  */
 
@@ -14183,7 +14370,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 {
@@ -14286,7 +14475,7 @@ async function getTableSchema(
         fields = fields.concat(extraFields);
     }
     
-    const amisSchema = await getObjectCRUD(uiSchema, fields, {
+    let crudOptions = {
         tabId: objectName,
         appId: appName,
         objectName: objectName,
@@ -14295,8 +14484,9 @@ async function getTableSchema(
         sort,
         headerToolbarItems: ctx.headerToolbarItems,
         buttons: await getListViewItemButtons(uiSchema, ctx)
-    });
-    console.log('getTableSchema====>amisSchema', amisSchema);
+    };
+    crudOptions.amisData = createObject(ctx.amisData || {}, {}).__super;
+    const amisSchema = await getObjectCRUD(uiSchema, fields, crudOptions);
     // console.timeEnd('getTableSchema');
     return {
         uiSchema,
@@ -15080,161 +15270,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$1 = function() {
-    __assign$1 = 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$1.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$1(__assign$1({}, 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_1(data[key_1])) {
-            data = data[key_1] = __assign$1({}, 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_1(data[key_2])) {
-            data = data[key_2] = __assign$1({}, 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
@@ -17895,14 +17930,14 @@ var AmisObjectForm = function (props) { return __awaiter(void 0, void 0, void 0,
 }); };
 
 var AmisObjectListView = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-    var $schema, top, perPage, _a, showHeader, data, defaultData, _b, crud, _c, className, crudClassName, _d, showDisplayAs, sideSchema, _f, filterVisible, headerToolbarItems, rowClassNameExpr, _g, hiddenColumnOperation, headerSchema, ctx, listName, defaults, objectApiName, displayAs, formFactor, isMobile, uiSchema, listView, schemaKeys, listSchema, setDataToComponentId, amisSchemaData, listViewId, listViewSchemaProps, serviceData;
+    var $schema, top, perPage, _a, showHeader, data, defaultData, _b, crud, _c, className, crudClassName, _d, showDisplayAs, sideSchema, _f, filterVisible, headerToolbarItems, rowClassNameExpr, _g, hiddenColumnOperation, columns, crudDataFilter, onCrudDataFilter, env, rebuildOn, headerSchema, ctx, listName, defaults, objectApiName, displayAs, formFactor, isMobile, uiSchema, listView, schemaKeys, listSchema, setDataToComponentId, amisSchemaData, listViewId, listViewSchemaProps, serviceData;
     var _h;
     return __generator(this, function (_j) {
         switch (_j.label) {
             case 0:
                 // console.time('AmisObjectListView')
                 console.log("AmisObjectListView props", props);
-                $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, _g = props.hiddenColumnOperation, hiddenColumnOperation = _g === void 0 ? false : _g;
+                $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, _g = props.hiddenColumnOperation, hiddenColumnOperation = _g === void 0 ? false : _g, columns = props.columns, crudDataFilter = props.crudDataFilter, onCrudDataFilter = props.onCrudDataFilter, env = props.env, rebuildOn = props.rebuildOn;
                 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);
@@ -17980,9 +18015,9 @@ var AmisObjectListView = function (props) { return __awaiter(void 0, void 0, voi
                 if (!setDataToComponentId) {
                     setDataToComponentId = "service_listview_".concat(objectApiName);
                 }
-                amisSchemaData = Object.assign({}, data, defaultData);
+                amisSchemaData = createObject(data, defaultData);
                 listViewId = (ctx === null || ctx === void 0 ? void 0 : ctx.listViewId) || amisSchemaData.listViewId;
-                listViewSchemaProps = __assign$2(__assign$2({ top: top, perPage: perPage, showHeader: showHeader, defaults: defaults }, ctx), { listViewId: listViewId, setDataToComponentId: setDataToComponentId, filterVisible: filterVisible, showDisplayAs: showDisplayAs, displayAs: displayAs, headerToolbarItems: headerToolbarItems, rowClassNameExpr: rowClassNameExpr, hiddenColumnOperation: hiddenColumnOperation });
+                listViewSchemaProps = __assign$2(__assign$2({ top: top, perPage: perPage, showHeader: showHeader, defaults: defaults }, ctx), { listViewId: listViewId, setDataToComponentId: setDataToComponentId, filterVisible: filterVisible, showDisplayAs: showDisplayAs, displayAs: displayAs, headerToolbarItems: headerToolbarItems, rowClassNameExpr: rowClassNameExpr, hiddenColumnOperation: hiddenColumnOperation, columns: columns, crudDataFilter: crudDataFilter, onCrudDataFilter: onCrudDataFilter, amisData: amisSchemaData, env: env });
                 if (!headerSchema) {
                     headerSchema = getObjectListHeader$1(uiSchema, listName, ctx);
                 }
@@ -18025,16 +18060,17 @@ var AmisObjectListView = function (props) { return __awaiter(void 0, void 0, voi
                                             body: __spreadArray(__spreadArray([], __read(headerSchema), false), [
                                                 {
                                                     "type": "service",
+                                                    "id": "service_schema_api_" + objectApiName,
                                                     "schemaApi": {
                                                         // 这里url上加objectApiName属性是因为设计器中切换对象时不会变更列表视图界面，不可以用objectName=${objectName}使用作用域中objectName变量是因为设计器那边不会监听识别data变化来render组件
-                                                        "url": "${context.rootUrl}/graphql?objectName=" + objectApiName + "&listName=${listName}&display=${display}",
+                                                        "url": "${context.rootUrl}/graphql?objectName=" + objectApiName + "&listName=${listName}&display=${display}&rebuildOn=" + rebuildOn,
                                                         "method": "post",
                                                         "messages": {},
                                                         "headers": {
                                                             "Authorization": "Bearer ${context.tenantId},${context.authToken}"
                                                         },
                                                         "requestAdaptor": "api.data={query: '{spaces__findOne(id: \"none\"){_id,name}}'};return api;",
-                                                        "adaptor": "\n                        // console.log('service listview schemaApi adaptor....', api.body); \n                        let { appId, objectName, defaultListName: listName, display, formFactor: defaultFormFactor} = api.body;\n                        if(api.body.listName){\n                          listName = api.body.listName;\n                        }\n                        return new Promise((resolve)=>{\n                          const listViewSchemaProps = ".concat(JSON.stringify(listViewSchemaProps), ";\n                          const formFactor = ([\"split\"].indexOf(display) > -1) ? 'SMALL': defaultFormFactor;\n                          listViewSchemaProps.formFactor = formFactor;\n                          listViewSchemaProps.displayAs = display;\n                          \n                          window.getListSchema(appId, objectName, listName, listViewSchemaProps).then((schema)=>{\n                            try{\n                              const uiSchema = schema.uiSchema;\n                              const listView = _.find(\n                                uiSchema.list_views,\n                                (listView, name) => {\n                                    // \u4F20\u5165listViewName\u7A7A\u503C\u5219\u53D6\u7B2C\u4E00\u4E2A\n                                    if(!listName){\n                                      listName = name;\n                                    }\n                                    return name === listName || listView._id === listName;\n                                }\n                              );\n                              if(listView){\n                                window.Steedos && window.Steedos.setDocumentTitle && window.Steedos.setDocumentTitle({pageName: listView.label || listView.name})\n                              }\n                            }catch(e){\n                              console.error(e)\n                            }\n                            payload.data = schema.amisSchema;\n                            // console.log(\"schema================>\", schema)\n                            resolve(payload)\n                          });\n                        });\n                      ")
+                                                        "adaptor": "\n                        // console.log('service listview schemaApi adaptor....', api.body); \n                        let { appId, objectName, defaultListName: listName, display, formFactor: defaultFormFactor} = api.body;\n                        if(api.body.listName){\n                          listName = api.body.listName;\n                        }\n                        return new Promise((resolve)=>{\n                          const listViewSchemaProps = ".concat(JSON.stringify(listViewSchemaProps), ";\n                          const formFactor = ([\"split\"].indexOf(display) > -1) ? 'SMALL': defaultFormFactor;\n                          listViewSchemaProps.formFactor = formFactor;\n                          listViewSchemaProps.displayAs = display;\n                          console.log(\"====listViewSchemaProps===>\", listName, display, listViewSchemaProps)\n                          window.getListSchema(appId, objectName, listName, listViewSchemaProps).then((schema)=>{\n                            try{\n                              const uiSchema = schema.uiSchema;\n                              const listView = _.find(\n                                uiSchema.list_views,\n                                (listView, name) => {\n                                    // \u4F20\u5165listViewName\u7A7A\u503C\u5219\u53D6\u7B2C\u4E00\u4E2A\n                                    if(!listName){\n                                      listName = name;\n                                    }\n                                    return name === listName || listView._id === listName;\n                                }\n                              );\n                              if(listView){\n                                window.Steedos && window.Steedos.setDocumentTitle && window.Steedos.setDocumentTitle({pageName: listView.label || listView.name})\n                              }\n                            }catch(e){\n                              console.error(e)\n                            }\n                            payload.data = schema.amisSchema;\n                            console.log(\"payload================>\", payload)\n                            resolve(payload)\n                          });\n                        });\n                      ")
                                                     },
                                                     // "body": body,
                                                     // "data": serviceData
@@ -18077,13 +18113,11 @@ function getTableColumns(columns, includedFields, fieldsExtend) {
     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, crud, _b, formFactor, _c, className, requestAdaptor, adaptor, _d, filterVisible, headerToolbarItems, ctx, columns, defaults, objectApiName, schemaKeys, listSchema, setDataToComponentId, amisFilters, tableFilters, amisSchemaData, appId, amisSchema;
+    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, crudDataFilter, onCrudDataFilter, env, 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.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;
+                $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, crudDataFilter = props.crudDataFilter, onCrudDataFilter = props.onCrudDataFilter, env = props.env;
                 ctx = props.ctx;
                 if (!ctx) {
                     ctx = {};
@@ -18113,20 +18147,19 @@ var AmisObjectTable = function (props) { return __awaiter(void 0, void 0, void 0
                 }
                 amisFilters = amisCondition && conditionsToFilters(amisCondition);
                 tableFilters = filters || amisFilters;
-                amisSchemaData = Object.assign({}, data, defaultData);
+                amisSchemaData = createObject(data, defaultData);
                 appId = (data === null || data === void 0 ? void 0 : data.appId) || (defaultData === null || defaultData === void 0 ? void 0 : defaultData.appId);
                 // ctx中值为undefined的属性不能保留，否则会导致 filters等被覆盖。
                 ctx = _$1.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 }))];
+                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, crudDataFilter: crudDataFilter, onCrudDataFilter: onCrudDataFilter, amisData: amisSchemaData, env: env }))];
             case 1:
                 amisSchema = (_e.sent()).amisSchema;
-                amisSchema.data = Object.assign({}, amisSchema.data, amisSchemaData);
+                amisSchema.data = createObject(amisSchema.data, amisSchemaData);
                 if (_$1.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];
         }
@@ -18424,7 +18457,7 @@ var AmisProvider = function (props) { return __awaiter(void 0, void 0, void 0, f
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-09-01 14:44:57
  * @LastEditors: liaodaxue
- * @LastEditTime: 2023-09-19 11:12:17
+ * @LastEditTime: 2023-09-19 15:20:58
  * @Description:
  */
 var AmisAppLauncher = function (props) { return __awaiter(void 0, void 0, void 0, function () {
@@ -18648,7 +18681,7 @@ var AmisAppLauncher = function (props) { return __awaiter(void 0, void 0, void 0
                                                     "actions": [
                                                         {
                                                             "actionType": "custom",
-                                                            "script": "\nconst path = context.props.data.path;\ndoAction({\n  actionType: 'url',\n  args: {\n    \"url\": path,\n    \"blank\": false\n  }\n});"
+                                                            "script": "\nconst path = context.props.data.path;\ndoAction({\n  actionType: 'link',\n  args: {\n    \"url\": path,\n    \"blank\": false\n  }\n});"
                                                         },
                                                         {
                                                             "actionType": "broadcast",