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

package/dist/index.esm.js

@@ -444,7 +444,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: 
  */
 
@@ -624,9 +624,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>
     <% } %>`
 }
@@ -7329,7 +7333,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;
                         }
@@ -8295,11 +8299,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){
@@ -8311,6 +8314,7 @@ async function getTableSchema$1(fields, options){
     }
     else {
         columns = await getTableColumns(fields, options);
+
         if(!isLookup && !hiddenColumnOperation){
             columns.push(await getTableOperation(options));
         }
@@ -9615,6 +9619,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(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(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
@@ -9855,9 +10014,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);
@@ -9898,6 +10078,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}`;
@@ -9923,7 +10111,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 = ___default.compact(___default.map(___default.filter(fields, (field) => ["image","avatar"].includes(field.type)), 'name'));
@@ -9983,9 +10176,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;
@@ -10020,16 +10213,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
     }
 }
@@ -10681,7 +10868,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:
  */
 
@@ -11014,7 +11201,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 {
@@ -11117,7 +11306,7 @@ async function getTableSchema(
         fields = fields.concat(extraFields);
     }
     
-    const amisSchema = await getObjectCRUD(uiSchema, fields, {
+    let crudOptions = {
         tabId: objectName,
         appId: appName,
         objectName: objectName,
@@ -11126,8 +11315,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,
@@ -11911,161 +12101,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(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(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