@steedos-widgets/amis-lib 1.3.4-beta.6 → 1.3.4-beta.8

package/dist/index.esm.js

@@ -1830,7 +1830,7 @@ const parseSingleExpression = function (func, formData, dataPath, global, userSe
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-11-01 15:51:00
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-09-23 11:25:18
+ * @LastEditTime: 2023-09-25 14:53:05
  * @Description: 
  */
 
@@ -1909,10 +1909,15 @@ const getSchema$5 = async (uiSchema, ctx) => {
         }, 200);
     `;
     const getSelectedRowsScript = `
+        const isLookup = event.data.isLookup;
+        if(isLookup){
+            // lookup弹出窗口的新建功能不需要支持复制新建
+            return;
+        }
         const uiSchema = event.data.uiSchema;
         const objectName = event.data.objectName;
         const listViewRef = event.context.scoped.getComponentById("listview_" + objectName);
-        const selectedItems = listViewRef.props.store.toJSON().selectedItems || [];
+        const selectedItems = listViewRef && listViewRef.props.store.toJSON().selectedItems || [];
         event.data.selectedIds = _.map(selectedItems, uiSchema.idFieldName || '_id');
     `;
     return {
@@ -5335,10 +5340,11 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
       // "filter-toggler",
       ...(headerToolbarItems || []),
       "bulkActions",
-      {
-        "type": "columns-toggler",
-        "className": "hidden"
-      },
+      // 不能放开crud columns-toggler否则crud card模式会报错
+      // {
+      //   "type": "columns-toggler",
+      //   "className": "hidden"
+      // },
       ...toolbars,
       // {
       //     "type": "columns-toggler",
@@ -10216,6 +10222,13 @@ async function getObjectCRUD(objectSchema, fields, options){
             Authorization: "Bearer ${context.tenantId},${context.authToken}",
           },
           requestAdaptor: quickSaveApiRequestAdaptor,
+          adaptor: `
+              if(payload.errors){
+                  payload.status = 2;
+                  payload.msg = window.t ? window.t(payload.errors[0].message) : payload.errors[0].message;
+              }
+              return payload;
+          `
         },
         rowClassNameExpr: options.rowClassNameExpr
       }, bodyProps);
@@ -10560,7 +10573,7 @@ const getRecordPermissions = async (objectName, recordId)=>{
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
  * @LastEditors: liaodaxue
- * @LastEditTime: 2023-08-28 14:55:23
+ * @LastEditTime: 2023-09-25 17:18:08
  * @Description:
  */
 
@@ -10736,6 +10749,7 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
         // tableHiddenOn: hiddenEmptyTable ? "this.$count === 0" : null,
         appId: appId,
         crudClassName: 'border-t border-gray-300 hidden',
+        refField,
         ...ctx
     };
     const amisSchema= (await getRelatedListSchema(relatedObjectName, 'all', options)).amisSchema;
@@ -10850,10 +10864,33 @@ async function getRelatedListSchema(
     ctx
   ) {
     const uiSchema = await getUISchema(objectName);
-    const listView = uiSchema.list_views;
+    const listView =  find(
+        uiSchema.list_views,
+        (listView, name) => {
+            // 传入listViewName空值则取第一个
+            if(!listViewName){
+                listViewName = name;
+            }
+            return name === listViewName || listView._id === listViewName;
+        }
+    );
     const listViewProps = getRelatedListProps(uiSchema,listViewName, ctx);
     // console.log('listViewProps==>', listViewProps)
     const {columns: listViewColumns, sort: listViewSort, filter: listviewFilter, filtersFunction } = listViewProps;
+
+    const refFieldName = ctx.refField && ctx.refField.name;
+
+    let relatedListColumns = listViewColumns;
+    if(refFieldName){
+        relatedListColumns = listViewColumns.filter(function(columnItem){
+            if(typeof columnItem === "string"){
+                return columnItem !== refFieldName;
+            }
+            else {
+                return columnItem.field !== refFieldName;
+            }
+        });
+    }
   
     const defaults = ctx.defaults || {};
   
@@ -10891,7 +10928,7 @@ async function getRelatedListSchema(
     const amisSchema = {
         "type": "steedos-object-table",
         "objectApiName": objectName,
-        "columns": listViewColumns,
+        "columns": relatedListColumns,
         "extraColumns": listView.extra_columns,
         "filters": listviewFilter,
         "filtersFunction": filtersFunction,