@steedos-widgets/amis-object 6.3.2 → 6.3.4

package/dist/amis-object.cjs.css

@@ -1371,6 +1371,9 @@ fieldset.antd-Collapse > legend{
     .md\:overflow-auto {
         overflow: auto
     }
+    .md\:border-b {
+        border-bottom-width: 1px
+    }
 }
 @media (min-width: 1024px) {
     .lg\:z-\[1000\] {

package/dist/amis-object.cjs.js

@@ -10958,7 +10958,7 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
 
   // console.log('=======================max=========================', max)
 
-  if(objectSchema.compactLayouts){
+  if(objectSchema.compactLayouts && objectSchema.compactLayouts.length > 0){
     const details = [];
     _.each(_.slice(_.difference(objectSchema.compactLayouts, [objectSchema.NAME_FIELD_KEY]), 0, max), (fieldName)=>{
       const field = objectSchema.fields[fieldName];
@@ -12154,18 +12154,19 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
   }
   let toolbarReloadButton;
   const onReloadScript = `
-    // const scope = event.context.scoped;
-    // var listView = scope.parent.getComponents().find(function(n){
-    //   return n.props.type === "crud";
-    // });
-    // listView.handleChangePage(1);
-
-
     // 触发搜索，而不是reload，因为使用search-box可以在amissdk是3.6.3-patch.8+实现在非第一页的情况下，快速搜索输入框中过滤条件变更时再点刷新可以自动跳转翻页到第一页
     const scope = event.context.scoped;
     const sb = SteedosUI.getClosestAmisComponentByType(scope, "search-box");
-    const sbValue = sb.state.value;
-    sb.handleSearch(sbValue);
+    if (sb) {
+      const sbValue = sb.state.value;
+      sb.handleSearch(sbValue);
+    }else{
+      var listView = scope.parent.getComponents().find(function(n){
+        return n.props.type === "crud";
+      });
+      listView.handleChangePage(1);
+    }
+    
   `;
   toolbarReloadButton = {
     // "type": "reload",//不可以直接使用reload，因为它不会设置页码到第一页，这在加载更多按钮的翻页模式下会有问题
@@ -12856,9 +12857,10 @@ async function getFormSchemaWithDataFilter(form, options = {}){
 async function getObjectForm(objectSchema, ctx){
     const { recordId, formFactor, layout = formFactor === 'SMALL' ? 'normal' : "horizontal", labelAlign, tabId, appId, defaults, submitSuccActions = [], 
       formDataFilter, onFormDataFilter, amisData, env } = ctx;
+    let enableTabs = ctx.enableTabs;
     //优先识别组件上的enableTabs属性，若不存在，则识别对象上定义的
-    if (typeof ctx.enableTabs !== 'boolean') {
-      ctx.enableTabs = objectSchema.enable_form_tabs;
+    if (typeof enableTabs !== 'boolean') {
+      enableTabs = objectSchema.enable_form_tabs;
     }
     const fields = _$1__default["default"].values(objectSchema.fields);
     const formFields = getFormFields$1(objectSchema, ctx);
@@ -12902,7 +12904,7 @@ async function getObjectForm(objectSchema, ctx){
         body: {
           type: 'wrapper',
           className: 'p-0 m-0',
-          body: await getFormBody(fields, formFields, Object.assign({}, ctx, {fieldGroups: objectSchema.field_groups, omitReadonlyFields: true})),
+          body: await getFormBody(fields, formFields, Object.assign({}, ctx, {fieldGroups: objectSchema.field_groups, omitReadonlyFields: true, enableTabs})),
           hiddenOn: "${editFormInited != true}",
         },
         panelClassName:'m-0 sm:rounded-lg shadow-none border-none',
@@ -12957,6 +12959,11 @@ async function getObjectDetail(objectSchema, recordId, ctx){
     const fields = _$1__default["default"].values(objectSchema.fields);
     const formFields = getFormFields$1(objectSchema, ctx);
     const serviceId = `service_detail_page`;
+    let enableTabs = ctx.enableTabs;
+    //优先识别组件上的enableTabs属性，若不存在，则识别对象上定义的
+    if (typeof enableTabs !== 'boolean') {
+      enableTabs = objectSchema.enable_form_tabs;
+    }
     const amisSchema = {
         type: 'service',
         name: `page_readonly_${recordId}`,
@@ -12983,7 +12990,7 @@ async function getObjectDetail(objectSchema, recordId, ctx){
               body: await getFormBody(
                 _$1.map(fields, (field) => { field.readonly = true; return field; }),
                 _$1.map(formFields, (field) => { field.readonly = true; return field; }),
-                Object.assign({}, ctx, { showSystemFields: true, fieldGroups: objectSchema.field_groups })
+                Object.assign({}, ctx, { showSystemFields: true, fieldGroups: objectSchema.field_groups, enableTabs })
               ),
               className: 'steedos-amis-form bg-white',
               actions: [], // 不显示表单默认的提交按钮
@@ -22150,6 +22157,7 @@ var SteedosSkeleton = function (props) {
         }))) : null));
 };
 
+// md:border-b
 var AmisObjectForm = function (props) { return __awaiter(void 0, void 0, void 0, function () {
     var $schema, recordId, defaultData, mode, _a, layout, labelAlign, appId, fieldsExtend, _b, excludedFields, _c, fields, _d, form, _e, className, enableInitApi, initApiRequestAdaptor, initApiAdaptor, apiRequestAdaptor, apiAdaptor, enableTabs, tabsMode, submitSuccActions, data, formDataFilter, onFormDataFilter, env, objectApiName, schemaKeys, formSchema, defaults, options, globalData, amisSchema, uiSchema, allData, schema, schema, formData;
     return __generator(this, function (_f) {
@@ -22215,7 +22223,7 @@ var AmisObjectForm = function (props) { return __awaiter(void 0, void 0, void 0,
                         initApiRequestAdaptor: initApiRequestAdaptor,
                         initApiAdaptor: initApiAdaptor,
                         enableTabs: enableTabs,
-                        tabsMode: tabsMode,
+                        tabsMode: tabsMode || "vertical",
                         formDataFilter: formDataFilter,
                         onFormDataFilter: onFormDataFilter,
                         amisData: allData,
@@ -24212,6 +24220,9 @@ function getAmisStaticFieldType(type, data_type, options) {
     else if (type === 'color') {
         return 'static-color';
     }
+    else if (type === 'file') {
+        return 'control';
+    }
     return type;
 }
 function getLookupLinkOnClick(field, options) {
@@ -24304,7 +24315,7 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                 }
                 _5.label = 1;
             case 1:
-                _5.trys.push([1, 33, , 34]);
+                _5.trys.push([1, 22, , 23]);
                 if (!(fStatic && (steedosField.type === 'lookup' || steedosField.type === 'master_detail'))) return [3 /*break*/, 16];
                 lookupATagClick = 'onclick="return false;"';
                 if (window.innerWidth < 768) {
@@ -24541,7 +24552,7 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                 // console.log(`steedos field [lookup] schema:`, schema)
                 return [2 /*return*/, schema];
             case 16:
-                if (!fStatic) return [3 /*break*/, 30];
+                if (!fStatic) return [3 /*break*/, 19];
                 if (!props.data.hasOwnProperty("_display")) return [3 /*break*/, 18];
                 return [4 /*yield*/, index.convertSFieldToAmisField(steedosField, true, ctx)];
             case 17:
@@ -24591,123 +24602,138 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                     static: true,
                     label: steedosField.label
                 });
-                if (!(steedosField.type === "time" || steedosField.type === "input-time-range")) return [3 /*break*/, 19];
-                Object.assign(schema, {
-                    inputFormat: 'HH:mm',
-                    timeFormat: 'HH:mm',
-                    format: '1970-01-01THH:mm:00.000[Z]',
-                });
-                return [3 /*break*/, 29];
-            case 19:
-                if (!(steedosField.type === "percent")) return [3 /*break*/, 20];
-                Object.assign(schema, {
-                    "percent": steedosField.scale ? steedosField.scale : true
-                });
-                return [3 /*break*/, 29];
-            case 20:
-                if (!(steedosField.type === "password")) return [3 /*break*/, 21];
-                Object.assign(schema, {
-                    "tpl": "******"
-                });
-                return [3 /*break*/, 29];
-            case 21:
-                if (!(steedosField.type === "select")) return [3 /*break*/, 22];
-                map = getSelectMap(steedosField.options);
-                Object.assign(schema, {
-                    "placeholder": "",
-                    "map": map
-                });
-                return [3 /*break*/, 29];
-            case 22:
-                if (!(steedosField.type === "color")) return [3 /*break*/, 23];
-                Object.assign(schema, {
-                    "defaultColor": null
-                });
-                return [3 /*break*/, 29];
-            case 23:
-                if (!(steedosField.type === "number" || steedosField.type === 'currency')) return [3 /*break*/, 24];
-                // amis input-number和number组件中的precision表示小数位数，并不是魔方平台的精度概念，要转换下，否则小数点后会显示很多的0
-                Object.assign(schema, {
-                    "precision": steedosField.scale || 0,
-                    "kilobitSeparator": steedosField.enable_thousands //识别enable_thousands，控制千分位分隔符
-                });
-                return [3 /*break*/, 29];
-            case 24:
-                if (!(steedosField.type === "table")) return [3 /*break*/, 25];
-                if (steedosField.subFields) {
-                    tableFields = [];
-                    try {
-                        for (_m = __values(steedosField.subFields), _o = _m.next(); !_o.done; _o = _m.next()) {
-                            subField = _o.value;
-                            if (!subField.name.endsWith(".$")) {
-                                subFieldName = subField.name.replace("".concat(steedosField._prefix || '').concat(steedosField.name, ".$."), '').replace("".concat(steedosField.name, "."), '');
-                                // const gridSub = await convertSFieldToAmisField(Object.assign({}, subField, {name: subFieldName, isTableField: true}), readonly, ctx);
-                                tableFields.push(Object.assign({}, subField, { name: subFieldName }));
+                if (steedosField.type === "time" || steedosField.type === "input-time-range") {
+                    Object.assign(schema, {
+                        inputFormat: 'HH:mm',
+                        timeFormat: 'HH:mm',
+                        format: '1970-01-01THH:mm:00.000[Z]',
+                    });
+                }
+                else if (steedosField.type === "percent") {
+                    Object.assign(schema, {
+                        "percent": steedosField.scale ? steedosField.scale : true
+                    });
+                }
+                else if (steedosField.type === "password") {
+                    Object.assign(schema, {
+                        "tpl": "******"
+                    });
+                }
+                else if (steedosField.type === "select") {
+                    map = getSelectMap(steedosField.options);
+                    Object.assign(schema, {
+                        "placeholder": "",
+                        "map": map
+                    });
+                }
+                else if (steedosField.type === "color") {
+                    Object.assign(schema, {
+                        "defaultColor": null
+                    });
+                }
+                else if (steedosField.type === "number" || steedosField.type === 'currency') {
+                    // amis input-number和number组件中的precision表示小数位数，并不是魔方平台的精度概念，要转换下，否则小数点后会显示很多的0
+                    Object.assign(schema, {
+                        "precision": steedosField.scale || 0,
+                        "kilobitSeparator": steedosField.enable_thousands //识别enable_thousands，控制千分位分隔符
+                    });
+                }
+                else if (steedosField.type === "table") {
+                    if (steedosField.subFields) {
+                        tableFields = [];
+                        try {
+                            for (_m = __values(steedosField.subFields), _o = _m.next(); !_o.done; _o = _m.next()) {
+                                subField = _o.value;
+                                if (!subField.name.endsWith(".$")) {
+                                    subFieldName = subField.name.replace("".concat(steedosField._prefix || '').concat(steedosField.name, ".$."), '').replace("".concat(steedosField.name, "."), '');
+                                    // const gridSub = await convertSFieldToAmisField(Object.assign({}, subField, {name: subFieldName, isTableField: true}), readonly, ctx);
+                                    tableFields.push(Object.assign({}, subField, { name: subFieldName }));
+                                }
                             }
                         }
-                    }
-                    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                    finally {
-                        try {
-                            if (_o && !_o.done && (_y = _m.return)) _y.call(_m);
+                        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                        finally {
+                            try {
+                                if (_o && !_o.done && (_y = _m.return)) _y.call(_m);
+                            }
+                            finally { if (e_1) throw e_1.error; }
                         }
-                        finally { if (e_1) throw e_1.error; }
+                        Object.assign(schema, {
+                            type: 'steedos-input-table',
+                            editable: false,
+                            addable: false,
+                            removable: false,
+                            draggable: false,
+                            fields: tableFields,
+                            amis: {
+                                columnsTogglable: false
+                            }
+                        });
                     }
-                    Object.assign(schema, {
-                        type: 'steedos-input-table',
-                        editable: false,
-                        addable: false,
-                        removable: false,
-                        draggable: false,
-                        fields: tableFields,
-                        amis: {
-                            columnsTogglable: false
-                        }
-                    });
                 }
-                return [3 /*break*/, 29];
-            case 25:
-                if (!(steedosField.type === "image")) return [3 /*break*/, 26];
-                Object.assign(schema, {
-                    enlargeAble: true,
-                    showToolbar: true,
-                    pipeIn: function (value, data) {
-                        if (steedosField.multiple) {
-                            if (!value) {
-                                value = [defaultImageValue];
+                else if (steedosField.type === "image") {
+                    Object.assign(schema, {
+                        enlargeAble: true,
+                        showToolbar: true,
+                        pipeIn: function (value, data) {
+                            if (steedosField.multiple) {
+                                if (!value) {
+                                    value = [defaultImageValue];
+                                }
+                                value = value.map(function (item) {
+                                    if (item && item.split("/").length === 1) {
+                                        // 不是url格式时转为url格式显示
+                                        return window.getImageFieldUrl(window.Meteor.absoluteUrl("/api/files/images/".concat(item)));
+                                    }
+                                    else {
+                                        return item;
+                                    }
+                                });
                             }
-                            value = value.map(function (item) {
-                                if (item && item.split("/").length === 1) {
-                                    // 不是url格式时转为url格式显示
-                                    return window.getImageFieldUrl(window.Meteor.absoluteUrl("/api/files/images/".concat(item)));
+                            else {
+                                if (_$1.isArray(value)) {
+                                    value = value[0];
                                 }
-                                else {
-                                    return item;
+                                if (value && value.split("/").length === 1) {
+                                    // 不是url格式时转为url格式显示
+                                    return window.getImageFieldUrl(window.Meteor.absoluteUrl("/api/files/images/".concat(value)));
                                 }
-                            });
-                        }
-                        else {
-                            if (_$1.isArray(value)) {
-                                value = value[0];
-                            }
-                            if (value && value.split("/").length === 1) {
-                                // 不是url格式时转为url格式显示
-                                return window.getImageFieldUrl(window.Meteor.absoluteUrl("/api/files/images/".concat(value)));
                             }
+                            return value;
                         }
-                        return value;
-                    }
-                });
-                return [3 /*break*/, 29];
-            case 26:
-                if (!(steedosField.type === "file")) return [3 /*break*/, 28];
-                return [4 /*yield*/, index.convertSFieldToAmisField(steedosField, true, ctx)];
-            case 27: 
-            // 附件static模式先保持原来的逻辑，依赖_display，审批王中相关功能在creator中
-            // convertSFieldToAmisField中会合并steedosField.amis，所以也不需要再次合并steedosField.amis，直接return就好
-            return [2 /*return*/, _5.sent()];
-            case 28:
-                if (steedosField.type === 'formula' || steedosField.type === 'summary') {
+                    });
+                }
+                else if (steedosField.type === "file") {
+                    Object.assign(schema, {
+                        "body": [
+                            {
+                                "type": "service",
+                                "api": {
+                                    "method": "post",
+                                    "url": "${context.rootUrl}/graphql?file=${".concat(steedosField.name, "}"),
+                                    "headers": {
+                                        "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                                    },
+                                    "data": {
+                                        "query": "{fileData:cfs_files_filerecord(filters:[\"_id\",\"in\",${".concat(steedosField.name, "|asArray|json}]){_id,original}}")
+                                    }
+                                },
+                                "body": [
+                                    {
+                                        "type": "each",
+                                        "source": "${fileData}",
+                                        "className": "flex flex-col",
+                                        "items": {
+                                            "type": "tpl",
+                                            "tpl": "<a href='${context.rootUrl}/api/files/files/${_id}?download=true' target='_blank'>${original.name}</a>"
+                                        }
+                                    }
+                                ]
+                            }
+                        ]
+                    }, { name: "" });
+                }
+                else if (steedosField.type === 'formula' || steedosField.type === 'summary') {
                     if (steedosField.data_type === 'number' || steedosField.data_type === 'currency') {
                         Object.assign(schema, {
                             "precision": steedosField.scale || 0
@@ -24767,11 +24793,9 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                         disabled: true
                     });
                 }
-                _5.label = 29;
-            case 29:
                 Object.assign(schema, steedosField.amis || {});
                 return [2 /*return*/, schema];
-            case 30:
+            case 19:
                 if (!ctx.className) {
                     ctx.className = className;
                 }
@@ -24832,16 +24856,16 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                     }
                 }
                 return [4 /*yield*/, index.convertSFieldToAmisField(steedosField, readonly, ctx)];
-            case 31:
+            case 20:
                 schema = _5.sent();
                 // console.log(`AmisSteedosField return schema`, schema)
                 return [2 /*return*/, schema];
-            case 32: return [3 /*break*/, 34];
-            case 33:
+            case 21: return [3 /*break*/, 23];
+            case 22:
                 error_1 = _5.sent();
                 console.log("error", error_1);
-                return [3 /*break*/, 34];
-            case 34: return [2 /*return*/, null];
+                return [3 /*break*/, 23];
+            case 23: return [2 /*return*/, null];
         }
     });
 }); };