@steedos-widgets/amis-object 1.3.17 → 1.3.18

package/dist/amis/AmisObjectTable.d.ts

@@ -1,9 +1,2 @@
 import './AmisObjectTable.less';
-export declare const AmisObjectTable: (props: any) => Promise<{
-    type: string;
-    className: string;
-    id: string;
-    name: string;
-    data: any;
-    body: any;
-}>;
+export declare const AmisObjectTable: (props: any) => Promise<any>;

package/dist/amis-object.cjs.css

@@ -1827,6 +1827,18 @@ body.steedos {
   .steedos-object-table thead tr th:nth-child(2) {
     display: none;
   }
+  .steedos-object-table.is-steedos-tree-table thead tr th:nth-child(3) {
+    display: none;
+  }
+  .steedos-object-table.is-steedos-tree-table thead tr th:nth-child(2) {
+    display: table-cell;
+  }
+  .steedos-object-table .is-steedos-crud-data-empty thead tr th:nth-child(3) {
+    display: table-cell;
+  }
+  .steedos-object-table .is-steedos-crud-data-empty thead tr th:nth-child(2) {
+    display: none;
+  }
   .steedos-object-table tbody td.antd-Field--quickEditable > div {
     display: flex;
     align-items: center;

package/dist/amis-object.cjs.js

@@ -5155,9 +5155,9 @@ function getFieldWidth(width){
     const defaultWidth = "unset";//用于使table内的td标签下生成div，实现将快速编辑按钮固定在右侧的效果，并不是为了unset效果
     if(typeof width == 'string'){
         if(isNaN(width)){
-            return width;
+            return width || defaultWidth;
         }else {
-            return Number(width);
+            return Number(width) || defaultWidth;
         }
     }else if(typeof width == 'number'){
         return width;
@@ -5258,6 +5258,7 @@ async function getTableColumns$1(fields, options){
                 width: getFieldWidth(field.width),
                 toggled: field.toggled,
                 className,
+                inputClassName: "inline",
                 static: true,
             }, field.amis, {name: field.name});
         }
@@ -5295,6 +5296,7 @@ async function getTableColumns$1(fields, options){
                     tpl: tpl,
                     toggled: field.toggled,
                     className,
+                    inputClassName: "inline",
                     static: true,
                     options: field.type === 'html' ? {html: true} : null
                     // toggled: true 
@@ -5316,8 +5318,8 @@ async function getTableColumns$1(fields, options){
         const href = Router$1.getObjectDetailPath({
             ...options,  formFactor: options.formFactor, appId: "${appId}", objectName: options.objectName || "${objectName}", recordId: `\${${options.idFieldName}}`
         });
-        columns[0].type = "tpl";
-        columns[0].tpl = `<a href="${href}">\${${columns[0].name}}</a>`;
+        columns[1].type = "tpl";
+        columns[1].tpl = `<a href="${href}">\${${columns[1].name}}</a>`;
     }
     return columns;
 }
@@ -6013,7 +6015,25 @@ async function getTableApi(mainObject, fields, options){
     if(enable_tree){
         const records = payload.data.rows || [];
         const getTreeOptions = SteedosUI.getTreeOptions
-        payload.data.rows = getTreeOptions(records,{"valueField":"_id"});
+        let isTreeOptionsComputed = false;
+        if(records.length === 1 && records[0].children){
+            isTreeOptionsComputed = true;
+        }
+        if(!isTreeOptionsComputed){
+            // 如果api接口设置在缓存，缓存期间并不会重新请求接口，payload.data.rows是上次计算后的结果
+            payload.data.rows = getTreeOptions(records,{"valueField":"_id"});
+        }
+        try{
+            setTimeout(() => {
+                let expandBtn = $('.steedos-object-listview-content .antd-Table-content .antd-Table-table thead .antd-Table-expandBtn');
+                if(expandBtn && expandBtn.length > 0 && !expandBtn.hasClass("is-active")){
+                    expandBtn[0].click();
+                }
+            }, 600);
+        }
+        catch(ex){
+            console.error("tree数据格式展开异常：", ex);
+        }
     }
 
 
@@ -9877,78 +9897,97 @@ function fields$1(){
 
 function fieldsExtend$4(){
   return {
+    "group": "",
     "label": {
       "is_wide": true
     },
     "name": {
+      "group": "",
       "amis": {
         "hidden": true,
         "required": false
       }
     },
     "object_name": {
+      "group": "",
       "amis": {
         "hidden": true
       }
     },
     "filter_scope": {
+      "group": "",
       "amis": {
         "hidden": true,
         "required": false
       }
     },
     "columns": {
+      "group": "",
       "amis": {
         "hidden": true,
         "required": false
       }
     },
     "mobile_columns":{
+      "group": "",
       "amis": {
         "hidden": true,
         "required": false
       }
     },
     "searchable_fields":{
+      "group": "",
       "amis": {
         "hidden": true,
         "required": false
       }
     },
     "filter_fields": {
+      "group": "",
       "amis": {
         "hidden": true,
         "required": false
       }
     },
     "scrolling_mode": {
+      "group": "",
       "amis": {
         "hidden": true,
         "required": false
       }
     },
     "sort": {
+      "group": "",
       "amis": {
         "hidden": true,
         "required": false
       }
     },
     "show_count": {
+      "group": "",
       "amis": {
         "hidden": true,
         "required": false
       }
     },
     "type": {
+      "group": "",
       "amis": {
         "hidden": true,
         "required": false
       }
     },
     "shared": {
+      "group": "",
       "amis": {
         "visibleOn": "${global.user.is_space_admin}"
       }
+    },
+    "filters": {
+      "group": "",
+      "amis": {
+        "hidden": true
+      }
     }
   }
 }
@@ -10095,6 +10134,12 @@ function fieldsExtend$3(){
       "amis": {
         "visibleOn": "${global.user.is_space_admin}"
       }
+    },
+    "filters": {
+      "group": "",
+      "amis": {
+        "hidden": true
+      }
     }
   }
 }
@@ -10433,7 +10478,6 @@ function fieldsExtend$1(){
       }
     },
     "mobile_columns": {
-      "group": instance.t('frontend_listview_control_columns_mobile_group'),
       "amis": {
         "type": "transfer",
         "sortable": true,
@@ -11385,7 +11429,12 @@ async function getObjectCRUD(objectSchema, fields, options){
         hiddenOn: options.tableHiddenOn,
         autoFillHeight,
         className: `flex-auto ${crudClassName || ""}`,
-        bodyClassName: "bg-white",
+        // 这里不可以用动态className，因为它会把样式类加到.antd-Crud和.antd-Table.antd-Crud-body这两层div中，而子表列表中crudClassName中有hidden样式类会造成所有子表都不显示的bug
+        // className: {
+        //   [`flex-auto ${crudClassName || ""}`]: "true",
+        //   "is-steedos-crud-data-empty": "${!items || COUNT(items) == 0}"
+        // },
+        bodyClassName: "bg-white",//上面className写成动态的class变量对象的话，bodyClassName不会生效，会被上面的className值覆盖
         crudClassName: crudClassName,
         quickSaveApi: {
           url: `\${context.rootUrl}/graphql`,
@@ -13276,8 +13325,6 @@ async function lookupToAmisTreeSelect(field, readonly, ctx) {
     return amisSchema;
 }
 
-const keywordsSearchBoxName = `__keywords_lookup`;
-
 const getReferenceToFieldSchema = (field, refObjectConfig)=>{
     let referenceTo = field.reference_to;
     if(!referenceTo){
@@ -13536,7 +13583,10 @@ async function lookupToAmisPicker(field, readonly, ctx){
     
     source.data.$term = "$term";
     source.data.$self = "$$";
-    
+
+    // field.name可能是带点的名称，比如审批王中子表字段'instances.instances_submitter'，如果不替换掉点，会造成审批王表单中新建子表行时报错
+    let keywordsSearchBoxName = `__keywords_lookup__${field.name.replace(/\./g, "_")}__to__${refObjectConfig.name}`;
+
     source.requestAdaptor = `
         let __changedFilterFormValues = api.data.$self.__changedFilterFormValues || {};
         let __changedSearchBoxValues = api.data.$self.__changedSearchBoxValues || {};
@@ -13679,6 +13729,14 @@ async function lookupToAmisPicker(field, readonly, ctx){
             }
         });
         payload.data.rows = treeRecords;
+        try{
+            setTimeout(() => {
+                $('.amis-dialog-widget.antd-Modal .antd-Table-content .antd-Table-table thead .antd-Table-expandBtn')[0]?.click();
+            }, 600);
+        }
+        catch(ex){
+            console.error("tree数据格式展开异常：", ex);
+        }
     }
     return payload;
     `;
@@ -13851,6 +13909,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
 
 async function lookupToAmisSelect(field, readonly, ctx){
     let referenceTo = await getReferenceTo(field);
+    const isMobile = window.innerWidth <= 768;
     const valueFieldKey = referenceTo && referenceTo.valueField?.name || '_id' ;
     // const labelFieldKey = referenceTo && referenceTo.labelField?.name || 'name';
 
@@ -14031,7 +14090,11 @@ async function lookupToAmisSelect(field, readonly, ctx){
         </span>
         <span class='pl-1.5'>\${label}</span>
     </span>`;
-    data.menuTpl = "${icon ? `"+select_menuTpl+"` : label}";
+    const menuTpl = "${icon ? `"+select_menuTpl+"` : label}";
+    // TODO: 待amis修复了此bug， 就可以撤销添加menuTpl的判断。
+    if(!(isMobile && field.multiple)){
+        data.menuTpl = menuTpl;
+    }
     if(field.multiple){
         data.multiple = true;
         data.extractValue = true;
@@ -14539,6 +14602,8 @@ function getSelectFieldOptions(field){
 }
 
 async function convertSFieldToAmisField(field, readonly, ctx) {
+    // console.log('convertSFieldToAmisField====>', field, readonly, ctx)
+    const isMobile = window.innerWidth <= 768;
     // 创建人和修改人、创建时间和修改时间不显示
     if(_$1__namespace.includes(OMIT_FIELDS, field.name) && ctx.showSystemFields != true){
         return;
@@ -14601,7 +14666,11 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
                     </span>
                     <span class='pl-1.5'>\${label}</span>
                 </span>`;
-                convertData.menuTpl = "${icon ? `"+select_menuTpl+"` : label}";
+                const menuTpl = "${icon ? `"+select_menuTpl+"` : label}";
+                // TODO: 待amis修复了此bug， 就可以撤销添加menuTpl的判断。
+                if(!(isMobile && field.multiple)){
+                    convertData.menuTpl = menuTpl;
+                }
                 if(field.multiple){
                     convertData.multiple = true;
                     convertData.extractValue = true;
@@ -15462,7 +15531,7 @@ async function getFormBody(permissionFields, formFields, ctx){
  * @Author: 殷亮辉 yinlianghui@hotoa.com
  * @Date: 2023-11-15 09:50:22
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-11-29 17:48:02
+ * @LastEditTime: 2023-12-04 17:36:50
  */
 
 /**
@@ -15792,11 +15861,20 @@ const getAmisInputTableSchema = async (props, readonly) => {
         ],
         "className": props.className
     };
+    let footerToolbar = _$1.clone(props.footerToolbar || []); //这里不clone的话，会造成死循环，应该是因为props属性变更会让组件重新渲染
     if (props.addable) {
         let buttonNewSchema = await getButtonNew(props);
-        schema.body.push(buttonNewSchema);
+        footerToolbar.unshift(buttonNewSchema);
+    }
+    if (footerToolbar.length) {
+        schema.body.push({
+            "type": "wrapper",
+            "size": "none",
+            "body": footerToolbar
+        });
     }
     if (props.amis) {
+        delete props.amis.id;
         Object.assign(schema.body[0], props.amis);
     }
     return schema;
@@ -19189,7 +19267,7 @@ var AmisObjectListView = function (props) { return __awaiter(void 0, void 0, voi
                 amisSchemaData = Object.assign({}, data, defaultData);
                 listViewId = (ctx === null || ctx === void 0 ? void 0 : ctx.listViewId) || amisSchemaData.listViewId;
                 allData = createObject(data, defaultData);
-                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: allData, env: env, requestAdaptor: requestAdaptor, adaptor: adaptor });
+                listViewSchemaProps = __assign$2(__assign$2({ top: top, perPage: perPage, 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: allData, env: env, requestAdaptor: requestAdaptor, adaptor: adaptor });
                 if (!headerSchema) {
                     headerSchema = getObjectListHeader$1(uiSchema, listName, ctx);
                 }
@@ -19205,6 +19283,9 @@ var AmisObjectListView = function (props) { return __awaiter(void 0, void 0, voi
                     serviceData.uiSchema = uiSchema;
                 }
                 serviceData.defaultListName = listName ? listName : (_h = _$1.first(_$1.values(uiSchema.list_views))) === null || _h === void 0 ? void 0 : _h.name;
+                if (!showHeader) {
+                    headerSchema = {};
+                }
                 // console.timeEnd('AmisObjectListView')
                 // console.log('serviceData===>', serviceData)
                 // console.log('headerSchema===>', headerSchema)
@@ -19288,7 +19369,7 @@ 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, formFactor, _b, className, requestAdaptor, adaptor, _c, filterVisible, headerToolbarItems, crudDataFilter, onCrudDataFilter, env, crudMode, _d, hiddenColumnOperation, ctx, crud, columns, defaults, objectApiName, schemaKeys, listSchema, setDataToComponentId, amisFilters, tableFilters, amisSchemaData, allData, appId, amisSchema;
+    var $schema, filters, filtersFunction, amisCondition, top, headerSchema, includedFields, fieldsExtend, sort, sortField, sortOrder, extraColumns, data, defaultData, _a, formFactor, _b, className, requestAdaptor, adaptor, _c, filterVisible, headerToolbarItems, crudDataFilter, onCrudDataFilter, env, crudMode, _d, hiddenColumnOperation, ctx, crud, columns, defaults, objectApiName, schemaKeys, listSchema, setDataToComponentId, amisFilters, tableFilters, amisSchemaData, allData, appId, tableSchema, amisSchema, uiSchema;
     return __generator(this, function (_e) {
         switch (_e.label) {
             case 0:
@@ -19342,12 +19423,14 @@ var AmisObjectTable = function (props) { return __awaiter(void 0, void 0, void 0
                 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, crudDataFilter: crudDataFilter, onCrudDataFilter: onCrudDataFilter, amisData: allData, env: env }))];
             case 1:
-                amisSchema = (_e.sent()).amisSchema;
+                tableSchema = _e.sent();
+                amisSchema = tableSchema.amisSchema;
+                uiSchema = tableSchema.uiSchema;
                 amisSchema.data = Object.assign({}, amisSchema.data, amisSchemaData);
                 if (_$1.has(props, 'objectApiName')) {
                     amisSchema.data.objectName = objectApiName;
                 }
-                amisSchema.className = "steedos-object-table ".concat(amisSchema.className, " h-full flex flex-col ").concat(className);
+                amisSchema.className = "steedos-object-table ".concat(uiSchema.enable_tree ? "is-steedos-tree-table" : "", " ").concat(amisSchema.className, " h-full flex flex-col ").concat(className);
                 amisSchema.objectApiName = objectApiName; //设计器中切换对象时画布中显示的列未同步变更
                 // console.timeEnd('AmisObjectTable')
                 return [2 /*return*/, amisSchema];
@@ -19511,12 +19594,12 @@ var AmisRecordService = function (props) { return __awaiter(void 0, void 0, void
 }); };
 
 var AmisRecordDetailRelatedList = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-    var $schema, objectApiName, recordId, relatedObjectApiName, data, relatedKey, top, perPage, hiddenEmptyTable, appId, relatedLabel, _a, className, columns, sort, filters, visible_on, requestAdaptor, adaptor, formFactor, formData, schema;
+    var $schema, objectApiName, recordId, relatedObjectApiName, data, relatedKey, top, perPage, hiddenEmptyTable, appId, relatedLabel, _a, className, columns, sort, filters, visible_on, requestAdaptor, adaptor, visibleOn, formFactor, formData, schema;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0:
-                $schema = props.$schema, objectApiName = props.objectApiName, recordId = props.recordId, relatedObjectApiName = props.relatedObjectApiName, data = props.data, relatedKey = props.relatedKey, top = props.top, perPage = props.perPage, hiddenEmptyTable = props.hiddenEmptyTable, appId = props.appId, relatedLabel = props.relatedLabel, _a = props.className, className = _a === void 0 ? '' : _a, columns = props.columns, sort = props.sort, filters = props.filters, visible_on = props.visible_on, requestAdaptor = props.requestAdaptor, adaptor = props.adaptor;
+                $schema = props.$schema, objectApiName = props.objectApiName, recordId = props.recordId, relatedObjectApiName = props.relatedObjectApiName, data = props.data, relatedKey = props.relatedKey, top = props.top, perPage = props.perPage, hiddenEmptyTable = props.hiddenEmptyTable, appId = props.appId, relatedLabel = props.relatedLabel, _a = props.className, className = _a === void 0 ? '' : _a, columns = props.columns, sort = props.sort, filters = props.filters, visible_on = props.visible_on, requestAdaptor = props.requestAdaptor, adaptor = props.adaptor, visibleOn = props.visibleOn;
                 formFactor = props.formFactor;
                 if (!formFactor) {
                     formFactor = window.innerWidth < 768 ? 'SMALL' : 'LARGE';
@@ -19551,6 +19634,10 @@ var AmisRecordDetailRelatedList = function (props) { return __awaiter(void 0, vo
                         }
                     });
                 }
+                // 因为 visibleOn 的值格式是字符串，所以这里加个判断条件。
+                if (visibleOn) {
+                    schema.visibleOn = visibleOn;
+                }
                 return [2 /*return*/, schema];
         }
     });
@@ -21216,7 +21303,7 @@ var AmisInputTable = function (props) { return __awaiter(void 0, void 0, void 0,
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                props.$schema, props.fields, props.name, props.id, props.data, props.columns, props.amis, props.className, props.tableClassName;
+                props.$schema, props.fields, props.name, props.id, props.data, props.columns, props.amis, props.className, props.tableClassName, props.footerToolbar;
                 return [4 /*yield*/, getAmisInputTableSchema(props)];
             case 1:
                 amisSchema = _a.sent();