@steedos-widgets/amis-object 6.3.1 → 6.3.3

package/dist/amis-object.cjs.css

@@ -2492,6 +2492,7 @@ body.steedos {
 .steedos-app-menu.stacked .antd-Nav-SearchBox.is-active {
   width: calc(100% - 1rem);
   margin: 0 0.5rem;
+  margin-bottom: 0.5rem;
 }
 
 #steedosGlobalFooterRoot .steedos-global-footer {

package/dist/amis-object.cjs.js

@@ -4986,6 +4986,11 @@ async function getQuickEditSchema(object, columnField, options){
         const submitEvent = {
             submit: {
                 actions: [
+                    {
+                        "actionType": "validate",
+                        "componentId": quickEditId,
+                        "outputVar": "form_validate_result"
+                    },
                     {
                         actionType: "custom",
                         script: `
@@ -5002,10 +5007,12 @@ async function getQuickEditSchema(object, columnField, options){
                                 doAction({actionType: 'setValue', "args": {"value": event.data._display},componentId: "${options.objectName}" + "_display_" + event.data._index});
                                 doAction({actionType: 'setValue', "args": {"value": event.data.${field.name}},componentId: "${options.objectName + "_" + field.name + "_"}" + event.data._index});
                             }
-                        `
+                        `,
+                        expression: "${!form_validate_result.error}"
                     },
                     {
-                        "actionType": "closeDialog"
+                        "actionType": "closeDialog",
+                        expression: "${!form_validate_result.error}"
                     }
                 ]
             }
@@ -6604,7 +6611,7 @@ function getReadonlyFormAdaptor(object, fields, options){
             nameLabel = `record._display.${nameField.name}.label`;
         }
     } else if (nameField){
-        nameLabel = `(record._display ? record._display.${nameField.name} : record.${nameField.name})`;
+        nameLabel = `(record._display && record._display.${nameField.name}) || record.${nameField.name}`;
     }
     return  `
     if(payload.data.data.length === 0){
@@ -6797,7 +6804,7 @@ async function getEditFormInitApi(object, recordId, fields, options){
     
     return {
         method: "post",
-        url: getApi$2() + '&objectName=${objectName}' ,
+        url: getApi$2() + '&objectName=${objectName}' + "&recordId=${recordId}",
         // sendOn: "!!this.recordId",
         cache: API_CACHE,
         requestAdaptor: `
@@ -12849,9 +12856,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);
@@ -12895,7 +12903,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',
@@ -12950,6 +12958,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}`,
@@ -12976,7 +12989,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: [], // 不显示表单默认的提交按钮
@@ -22208,7 +22221,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,
@@ -24205,6 +24218,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) {
@@ -24297,8 +24313,8 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                 }
                 _5.label = 1;
             case 1:
-                _5.trys.push([1, 31, , 32]);
-                if (!(fStatic && (steedosField.type === 'lookup' || steedosField.type === 'master_detail'))) return [3 /*break*/, 14];
+                _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) {
                     lookupATagClick = "";
@@ -24334,10 +24350,10 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                 };
                 if (!inInputTable) return [3 /*break*/, 2];
                 fieldBaseProps = Object.assign({}, fieldBaseProps, { type: 'select', source: source });
-                return [3 /*break*/, 13];
+                return [3 /*break*/, 15];
             case 2:
                 referenceTo_1 = steedosField.reference_to;
-                if (!referenceTo_1) return [3 /*break*/, 13];
+                if (!referenceTo_1) return [3 /*break*/, 14];
                 if (_$1.isArray(referenceTo_1)) {
                     fieldValue = (_2 = props.data) === null || _2 === void 0 ? void 0 : _2[steedosField.name];
                     if (fieldValue && fieldValue.o) {
@@ -24524,16 +24540,20 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
             case 12:
                 fieldBaseProps = Object.assign({}, fieldBaseProps, { type: 'static', tpl: '-', className: "".concat(fieldBaseProps.className || '', " text-muted") });
                 _5.label = 13;
-            case 13:
+            case 13: return [3 /*break*/, 15];
+            case 14:
+                fieldBaseProps = Object.assign({}, fieldBaseProps, { type: 'select', source: source });
+                _5.label = 15;
+            case 15:
                 schema = Object.assign({}, fieldBaseProps, _$1.pick(steedosField.amis || {}, ['className', 'inline', 'label', 'labelAlign', 'name', 'labelRemark', 'description', 'placeholder', 'staticClassName', 'staticLabelClassName', 'staticInputClassName', 'staticSchema']));
                 schema.placeholder = "";
                 // console.log(`steedos field [lookup] schema:`, schema)
                 return [2 /*return*/, schema];
-            case 14:
-                if (!fStatic) return [3 /*break*/, 28];
-                if (!props.data.hasOwnProperty("_display")) return [3 /*break*/, 16];
+            case 16:
+                if (!fStatic) return [3 /*break*/, 19];
+                if (!props.data.hasOwnProperty("_display")) return [3 /*break*/, 18];
                 return [4 /*yield*/, index.convertSFieldToAmisField(steedosField, true, ctx)];
-            case 15:
+            case 17:
                 fieldSchema = _5.sent();
                 if (steedosField.type === 'file' && fieldSchema.disabled) {
                     fieldValue = fieldSchema.value;
@@ -24541,7 +24561,9 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                         hasImageOrFile_1 = false;
                         _$1.forEach(fieldValue, function (item) {
                             var fileName = item.name;
-                            if ([".pdf", ".jpg", ".jpeg", ".png", ".gif"].indexOf(fileName.toLowerCase().slice(-4)) > -1) {
+                            var match = fileName.match(/\.([^\.]+)$/);
+                            var fileType = match ? match[0] : '';
+                            if ([".pdf", ".jpg", ".jpeg", ".png", ".gif"].indexOf(fileType) > -1) {
                                 hasImageOrFile_1 = true;
                             }
                         });
@@ -24552,8 +24574,10 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                         _$1.forEach(fieldValue, function (item) {
                             var fileName = item.name;
                             var fileUrl = item.url;
+                            var match = fileName.match(/\.([^\.]+)$/);
+                            var fileType = match ? match[0] : '';
                             var filePreviewHtml = '';
-                            if ([".pdf", ".jpg", ".jpeg", ".png", ".gif"].indexOf(fileName.toLowerCase().slice(-4)) > -1) {
+                            if ([".pdf", ".jpg", ".jpeg", ".png", ".gif"].indexOf(fileType) > -1) {
                                 var indexOfQuestionMark = fileUrl.indexOf('?');
                                 if (indexOfQuestionMark > -1) {
                                     var filePreviewUrl = fileUrl.substring(0, indexOfQuestionMark);
@@ -24570,129 +24594,144 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                     }
                 }
                 return [2 /*return*/, fieldSchema];
-            case 16:
+            case 18:
                 schema = Object.assign({}, steedosField, {
                     type: getAmisStaticFieldType(steedosField.type, steedosField.data_type, steedosField),
                     static: true,
                     label: steedosField.label
                 });
-                if (!(steedosField.type === "time" || steedosField.type === "input-time-range")) return [3 /*break*/, 17];
-                Object.assign(schema, {
-                    inputFormat: 'HH:mm',
-                    timeFormat: 'HH:mm',
-                    format: '1970-01-01THH:mm:00.000[Z]',
-                });
-                return [3 /*break*/, 27];
-            case 17:
-                if (!(steedosField.type === "percent")) return [3 /*break*/, 18];
-                Object.assign(schema, {
-                    "percent": steedosField.scale ? steedosField.scale : true
-                });
-                return [3 /*break*/, 27];
-            case 18:
-                if (!(steedosField.type === "password")) return [3 /*break*/, 19];
-                Object.assign(schema, {
-                    "tpl": "******"
-                });
-                return [3 /*break*/, 27];
-            case 19:
-                if (!(steedosField.type === "select")) return [3 /*break*/, 20];
-                map = getSelectMap(steedosField.options);
-                Object.assign(schema, {
-                    "placeholder": "",
-                    "map": map
-                });
-                return [3 /*break*/, 27];
-            case 20:
-                if (!(steedosField.type === "color")) return [3 /*break*/, 21];
-                Object.assign(schema, {
-                    "defaultColor": null
-                });
-                return [3 /*break*/, 27];
-            case 21:
-                if (!(steedosField.type === "number" || steedosField.type === 'currency')) return [3 /*break*/, 22];
-                // amis input-number和number组件中的precision表示小数位数，并不是魔方平台的精度概念，要转换下，否则小数点后会显示很多的0
-                Object.assign(schema, {
-                    "precision": steedosField.scale || 0,
-                    "kilobitSeparator": steedosField.enable_thousands //识别enable_thousands，控制千分位分隔符
-                });
-                return [3 /*break*/, 27];
-            case 22:
-                if (!(steedosField.type === "table")) return [3 /*break*/, 23];
-                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*/, 27];
-            case 23:
-                if (!(steedosField.type === "image")) return [3 /*break*/, 24];
-                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*/, 27];
-            case 24:
-                if (!(steedosField.type === "file")) return [3 /*break*/, 26];
-                return [4 /*yield*/, index.convertSFieldToAmisField(steedosField, true, ctx)];
-            case 25: 
-            // 附件static模式先保持原来的逻辑，依赖_display，审批王中相关功能在creator中
-            // convertSFieldToAmisField中会合并steedosField.amis，所以也不需要再次合并steedosField.amis，直接return就好
-            return [2 /*return*/, _5.sent()];
-            case 26:
-                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
@@ -24752,11 +24791,9 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                         disabled: true
                     });
                 }
-                _5.label = 27;
-            case 27:
                 Object.assign(schema, steedosField.amis || {});
                 return [2 /*return*/, schema];
-            case 28:
+            case 19:
                 if (!ctx.className) {
                     ctx.className = className;
                 }
@@ -24817,16 +24854,16 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                     }
                 }
                 return [4 /*yield*/, index.convertSFieldToAmisField(steedosField, readonly, ctx)];
-            case 29:
+            case 20:
                 schema = _5.sent();
                 // console.log(`AmisSteedosField return schema`, schema)
                 return [2 /*return*/, schema];
-            case 30: return [3 /*break*/, 32];
-            case 31:
+            case 21: return [3 /*break*/, 23];
+            case 22:
                 error_1 = _5.sent();
                 console.log("error", error_1);
-                return [3 /*break*/, 32];
-            case 32: return [2 /*return*/, null];
+                return [3 /*break*/, 23];
+            case 23: return [2 /*return*/, null];
         }
     });
 }); };