@steedos-widgets/amis-object 6.3.12-beta.1 → 6.3.12-beta.11

package/dist/amis-object.cjs.css

@@ -1515,6 +1515,15 @@ fieldset.antd-Collapse > legend{
 .steedos-record-related-list .antd-Table-headToolbar {
   display: none;
 }
+.steedos-record-related-list.enable-header-toolbar .antd-Table-headToolbar {
+  display: block;
+}
+.steedos-record-related-list.enable-header-toolbar .steedos-record-related-crud.hidden {
+  display: block;
+}
+.steedos-record-related-list.enable-header-toolbar .steedos-record-related-crud.hidden .antd-Table-contentWrap {
+  display: none;
+}
 .steedos-record-related-list .antd-Images {
   display: inline !important;
 }

package/dist/amis-object.cjs.js

@@ -88,13 +88,6 @@ function __rest(s, e) {
     return t;
 }
 
-function __decorate(decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-}
-
 function __awaiter(thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -8015,7 +8008,7 @@ const parseSingleExpression$1 = function (func, formData, dataPath, global, user
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-11-01 15:51:00
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-02-18 18:37:35
+ * @LastEditTime: 2024-12-26 20:28:43
  * @Description: 
  */
 
@@ -8175,20 +8168,23 @@ const getSchema$5 = async (uiSchema, ctx) => {
                                         {
                                             type: 'button',
                                             actionType: 'cancel',
-                                            label: instance.t('frontend_form_cancel')
+                                            label: instance.t('frontend_form_cancel'),
+                                            className: 'form-btn-cancel'
                                         },
                                         {
                                             type: 'button',
                                             label: instance.t('frontend_form_save_and_new'),
                                             actionType: 'confirm',
                                             close: false,
-                                            id: "confirmAndNew"
+                                            id: "confirmAndNew",
+                                            className: 'form-btn-save_and_new'
                                         },
                                         {
                                             type: 'button',
                                             actionType: 'confirm',
                                             label: instance.t('frontend_form_save'),
-                                            primary: true
+                                            primary: true,
+                                            className: 'form-btn-save'
                                         },
                                     ]
                                 }
@@ -9347,11 +9343,30 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
   const filterFormSchema = await getObjectFieldsFilterFormSchema(ctx);
   const keywordsSearchBoxName = ctx.keywordsSearchBoxName || "__keywords";
   const onSearchScript = `
-    // console.log("===onSearchScript=form==");
+    let isLookup = event.data.isLookup;
+    let __lookupField = event.data.__lookupField;
     const scope = event.context.scoped;
+    let crud = SteedosUI.getClosestAmisComponentByType(scope, "crud");
     var filterForm = scope.parent.parent.getComponents().find(function(n){
       return n.props.type === "form";
     });
+    // 使用filterForm.getValues()的话，并不能拿到本地存储中的过滤条件，所以需要从event.data中取，因为本地存储中的过滤条件自动填充到表单上时filterForm.getValues()拿不到。
+    let filterFormValues = event.data;
+    // 同步__changedFilterFormValues中的值
+    // crud && crud.setData({__changedFilterFormValues: {}});
+    let __changedFilterFormValuesKey = "__changedFilterFormValues";
+    if(isLookup && __lookupField){
+      let lookupTag = "__lookup__" + __lookupField.name + "__" + __lookupField.reference_to;
+      if(__lookupField.reference_to_field){
+        lookupTag += "__" + __lookupField.reference_to_field;
+      }
+      __changedFilterFormValuesKey += lookupTag;
+    }
+    if(crud){
+      let crudData = crud.getData();
+      crudData[__changedFilterFormValuesKey] = filterFormValues;
+      crud.setData(crudData);
+    }
     filterForm.handleFormSubmit(event);
     // var filterFormValues = filterForm.getValues();
     // var listView = scope.parent.parent.parent.getComponents().find(function(n){
@@ -9400,10 +9415,7 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     }
     filterService.setData({showFieldsFilter});
     // resizeWindow();//已迁移到搜索栏表单提交事件中执行，因为表单项change后也会触发表单提交了
-    // 使用filterForm.getValues()的话，并不能拿到本地存储中的过滤条件，所以需要从event.data中取。
-    let filterFormValues = event.data;
     let isFieldsFilterEmpty = SteedosUI.isFilterFormValuesEmpty(filterFormValues);
-    let crud = SteedosUI.getClosestAmisComponentByType(scope, "crud");
     let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service");
     crudService && crudService.setData({isFieldsFilterEmpty, showFieldsFilter});
   `;
@@ -10789,7 +10801,7 @@ async function getObjectListHeaderFieldsFilterBar(objectSchema, listViewName, ct
  * @param {*} objectSchema 对象UISchema
  * @returns amisSchema
  */
-function getObjectListHeader$1(objectSchema, listViewName, ctx) {
+function getObjectListHeader(objectSchema, listViewName, ctx) {
   if (!ctx) {
     ctx = {};
   }
@@ -13206,8 +13218,8 @@ const getRecordPermissions = async (objectName, recordId)=>{
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-02-18 14:46:50
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2025-01-08 13:32:51
  * @Description:
  */
 
@@ -13281,7 +13293,7 @@ async function getObjectRelatedList(
 
 // 获取单个相关表
 async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObjectName, relatedKey, ctx){
-    let { top, perPage, appId, relatedLabel, className, columns, sort, filters, visible_on } = ctx;
+    let { top, perPage, appId, relatedLabel, className, columns, sort, filters, visible_on, enableHeaderToolbar } = ctx;
     // console.log('getRecordDetailRelatedListSchema==>',objectName,recordId,relatedObjectName)
     const relatedObjectUiSchema = await getUISchema(relatedObjectName);
     if(!relatedObjectUiSchema){
@@ -13346,6 +13358,10 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
     let headerToolbar = [];
     if(!isMobile){
         headerToolbar.push("bulkActions");
+        if (enableHeaderToolbar) {
+            // 通过 enableHeaderToolbar = true 可以控制是否显示内置的带过滤器的headerToolbar
+            headerToolbar = undefined;
+        }
     }
     const options = {
         globalFilter,
@@ -13384,7 +13400,7 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
         amisSchema: {
             type: "service",
             id: componentId,
-            className: `steedos-record-related-list mb-4 last:mb-0 ${componentId} ${className}`,
+            className: `steedos-record-related-list mb-4 last:mb-0 ${componentId} ${className} ${enableHeaderToolbar ? 'enable-header-toolbar' : ''}`,
             data: {
                 relatedKey: relatedKey,   
                 listViewId: `amis-\${appId}-${relatedObjectName}-listview`,
@@ -13486,6 +13502,7 @@ async function getRelatedListSchema(
     listViewName,
     ctx
   ) {
+    const { enableHeaderToolbar } = ctx;
     const uiSchema = await getUISchema(objectName);
     if(!uiSchema){
         return {}
@@ -13538,10 +13555,14 @@ async function getRelatedListSchema(
     delete ctx.filters;
 
     delete ctx.globalFilter;
+    delete ctx.enableHeaderToolbar;
 
     const adaptor = `
         try{
             if(setDataToComponentId){
+                // 子表列表在headerToolbar过滤器中设置过过滤条件的话，始终显示子表列表，无论是否查询到数据
+                // 改为使用css样式控制子表列表放开headerToolbar时，始终显示crud，只隐藏crud内部的表格，从而始终显示headerToolbar不受这里逻辑影响
+                // var headerToolbarFilterChanged = context.isFieldsFilterEmpty === false;
                 if(payload.data.count){
                     setTimeout(function(){
                         // 设计器中获取不到window.$从而导致报错， 所以用纯js替换下。
@@ -13564,7 +13585,7 @@ async function getRelatedListSchema(
         "filters": listviewFilter,
         "filtersFunction": filtersFunction,
         "sort": listViewSort,
-        "filterVisible": false,
+        "filterVisible": !!enableHeaderToolbar,
         "requestAdaptor": ctx.requestAdaptor,  
         "adaptor": adaptor + ctx.adaptor || '',
         "ctx": ctx,
@@ -19215,7 +19236,7 @@ async function getListviewInitSchema(objectApiName, listViewName, ctx) {
         const defaults = ctx.defaults || {};
         if(!defaults.headerSchema){
             //传入isListviewInit是区别于对象列表类型的微页面，即getListPageInitSchema函数中该属性为false
-            const headerSchema = await getObjectListHeader$1(uiSchema, listViewName, {
+            const headerSchema = await getObjectListHeader(uiSchema, listViewName, {
                 onlySecordLine: true,
                 isListviewInit: true
             });
@@ -21764,7 +21785,7 @@ var index_esm$1 = /*#__PURE__*/Object.freeze({
     getObjectFieldsFilterBarSchema: getObjectFieldsFilterBarSchema,
     getObjectFieldsFilterButtonSchema: getObjectFieldsFilterButtonSchema,
     getObjectFieldsFilterFormSchema: getObjectFieldsFilterFormSchema,
-    getObjectListHeader: getObjectListHeader$1,
+    getObjectListHeader: getObjectListHeader,
     getObjectListHeaderFieldsFilterBar: getObjectListHeaderFieldsFilterBar,
     getObjectListHeaderFirstLine: getObjectListHeaderFirstLine,
     getObjectListHeaderSecordLine: getObjectListHeaderSecordLine,
@@ -22268,6 +22289,7 @@ var Collapse = /** @class */ (function (_super) {
         _this.basicCollapse = React__default["default"].createRef();
         return _this;
     }
+    // @autobind
     Collapse.prototype.handleCollapseChange = function (collapsed) {
         return __awaiter(this, void 0, void 0, function () {
             var _a, dispatchEvent, onCollapse, eventData, changeEvent, toggleEvent;
@@ -22335,9 +22357,6 @@ var Collapse = /** @class */ (function (_super) {
         'collapseHeader',
         'size'
     ];
-    __decorate([
-        amisCore.autobind
-    ], Collapse.prototype, "handleCollapseChange", null);
     return Collapse;
 }(React__default["default"].Component));
 var FieldSetControl = /** @class */ (function (_super) {
@@ -24710,14 +24729,17 @@ var Container = /** @class */ (function (_super) {
     function Container() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
+    // @autobind
     Container.prototype.handleClick = function (e) {
         var _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data;
         dispatchEvent(e, data);
     };
+    // @autobind
     Container.prototype.handleMouseEnter = function (e) {
         var _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data;
         dispatchEvent(e, data);
     };
+    // @autobind
     Container.prototype.handleMouseLeave = function (e) {
         var _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data;
         dispatchEvent(e, data);
@@ -24771,15 +24793,6 @@ var Container = /** @class */ (function (_super) {
             enableUserSelect: false
         }
     };
-    __decorate([
-        amisCore.autobind
-    ], Container.prototype, "handleClick", null);
-    __decorate([
-        amisCore.autobind
-    ], Container.prototype, "handleMouseEnter", null);
-    __decorate([
-        amisCore.autobind
-    ], Container.prototype, "handleMouseLeave", null);
     return Container;
 }(React__default["default"].Component));
 // @Renderer({
@@ -25003,7 +25016,7 @@ var AmisObjectListView = function (props) { return __awaiter(void 0, void 0, voi
                 allData = createObject(data, defaultData);
                 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);
+                    headerSchema = getObjectListHeader(uiSchema, listName, ctx);
                 }
                 headerSchema.className = "steedos-object-listview-header " + headerSchema.className || "";
                 serviceData = Object.assign({}, { showDisplayAs: showDisplayAs, displayAs: displayAs, recordPermissions: uiSchema.permissions, _id: null, $listviewId: listName, isObjectListview: true });
@@ -25349,12 +25362,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, visibleOn, crud, crudDataFilter, onCrudDataFilter, env, 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, crud, crudDataFilter, onCrudDataFilter, env, enableHeaderToolbar, 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, visibleOn = props.visibleOn, crud = props.crud, crudDataFilter = props.crudDataFilter, onCrudDataFilter = props.onCrudDataFilter, env = props.env;
+                $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, crud = props.crud, crudDataFilter = props.crudDataFilter, onCrudDataFilter = props.onCrudDataFilter, env = props.env, enableHeaderToolbar = props.enableHeaderToolbar;
                 formFactor = props.formFactor;
                 if (!formFactor) {
                     formFactor = window.innerWidth < 768 ? 'SMALL' : 'LARGE';
@@ -25391,7 +25404,8 @@ var AmisRecordDetailRelatedList = function (props) { return __awaiter(void 0, vo
                         crud: crud,
                         crudDataFilter: crudDataFilter,
                         onCrudDataFilter: onCrudDataFilter,
-                        env: env
+                        env: env,
+                        enableHeaderToolbar: enableHeaderToolbar
                     })];
             case 1:
                 schema = (_c.sent()).amisSchema;
@@ -25531,7 +25545,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: baozhoutao@steedos.com
- * @LastEditTime: 2024-10-10 16:30:41
+ * @LastEditTime: 2025-01-07 17:14:16
  * @Description:
  */
 var AmisAppLauncher = function (props) { return __awaiter(void 0, void 0, void 0, function () {
@@ -25818,7 +25832,7 @@ var AmisAppLauncher = function (props) { return __awaiter(void 0, void 0, void 0
                         ]
                     }
                 },
-                isMobile && isSpaceAdmin ? null : {
+                isMobile || !isSpaceAdmin ? null : {
                     "type": "button",
                     "level": "link",
                     "label": "+ 新建应用",
@@ -27010,7 +27024,7 @@ function generateRandomString$1(length) {
     return _$1.sampleSize(characters, length).join('');
 }
 var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-    var steedosField, field, _a, readonly, _b, ctx, config, fStatic, env, inInputTable, className, _c, appId, formFactor, editorClassName, lookupATagClick, defaultSource, source, fieldBaseProps, referenceTo_1, fieldValue, fieldRefObject, _d, _e, _f, _g, res, valueOptions_1, fieldValue, values, disPlayValue_1, _h, _j, _k, _l, schema, fieldSchema, fieldValue, hasImageOrFile_1, fieldHtml_1, schema, map, tableFields, _m, _o, subField, subFieldName, fieldAmis, schema, error_1;
+    var steedosField, field, _a, readonly, _b, ctx, config, fStatic, env, inInputTable, className, _c, appId, formFactor, editorClassName, lookupATagClick, defaultSource, source, fieldBaseProps, referenceTo_1, fieldValue, fieldRefObject, _d, _e, _f, _g, res, valueOptions_1, fieldValue, values, disPlayValue_1, _h, _j, _k, _l, schema, fieldSchema, fieldValue, fieldHtml_1, schema, map, tableFields, _m, _o, subField, subFieldName, fieldAmis, schema, error_1;
     var _p, _q, _r, _s, _t, _u, _v, _w, _x, e_1, _y;
     var _z, _0, _1, _2, _3, _4, _5;
     return __generator(this, function (_6) {
@@ -27342,18 +27356,11 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                 if (steedosField.type === 'file' && fieldSchema.disabled) {
                     fieldValue = fieldSchema.value;
                     if (fieldValue && fieldValue.length) {
-                        hasImageOrFile_1 = false;
                         _$1.forEach(fieldValue, function (item) {
                             var fileName = item.name;
                             var match = fileName.match(/\.([^\.]+)$/);
-                            var fileType = match ? match[0] : '';
-                            if ([".pdf", ".jpg", ".jpeg", ".png", ".gif"].indexOf(fileType) > -1) {
-                                hasImageOrFile_1 = true;
-                            }
+                            match ? match[0] : '';
                         });
-                        if (!hasImageOrFile_1) {
-                            return [2 /*return*/, fieldSchema];
-                        }
                         fieldHtml_1 = "";
                         _$1.forEach(fieldValue, function (item) {
                             var fileName = item.name;