@steedos-widgets/amis-object 6.3.1 → 6.3.2

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: `
@@ -24297,8 +24304,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, 33, , 34]);
+                if (!(fStatic && (steedosField.type === 'lookup' || steedosField.type === 'master_detail'))) return [3 /*break*/, 16];
                 lookupATagClick = 'onclick="return false;"';
                 if (window.innerWidth < 768) {
                     lookupATagClick = "";
@@ -24334,10 +24341,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 +24531,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*/, 30];
+                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 +24552,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 +24565,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,55 +24585,55 @@ 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];
+                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*/, 27];
-            case 17:
-                if (!(steedosField.type === "percent")) return [3 /*break*/, 18];
+                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*/, 27];
-            case 18:
-                if (!(steedosField.type === "password")) return [3 /*break*/, 19];
+                return [3 /*break*/, 29];
+            case 20:
+                if (!(steedosField.type === "password")) return [3 /*break*/, 21];
                 Object.assign(schema, {
                     "tpl": "******"
                 });
-                return [3 /*break*/, 27];
-            case 19:
-                if (!(steedosField.type === "select")) return [3 /*break*/, 20];
+                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*/, 27];
-            case 20:
-                if (!(steedosField.type === "color")) return [3 /*break*/, 21];
+                return [3 /*break*/, 29];
+            case 22:
+                if (!(steedosField.type === "color")) return [3 /*break*/, 23];
                 Object.assign(schema, {
                     "defaultColor": null
                 });
-                return [3 /*break*/, 27];
-            case 21:
-                if (!(steedosField.type === "number" || steedosField.type === 'currency')) return [3 /*break*/, 22];
+                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*/, 27];
-            case 22:
-                if (!(steedosField.type === "table")) return [3 /*break*/, 23];
+                return [3 /*break*/, 29];
+            case 24:
+                if (!(steedosField.type === "table")) return [3 /*break*/, 25];
                 if (steedosField.subFields) {
                     tableFields = [];
                     try {
@@ -24650,9 +24665,9 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                         }
                     });
                 }
-                return [3 /*break*/, 27];
-            case 23:
-                if (!(steedosField.type === "image")) return [3 /*break*/, 24];
+                return [3 /*break*/, 29];
+            case 25:
+                if (!(steedosField.type === "image")) return [3 /*break*/, 26];
                 Object.assign(schema, {
                     enlargeAble: true,
                     showToolbar: true,
@@ -24683,15 +24698,15 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                         return value;
                     }
                 });
-                return [3 /*break*/, 27];
-            case 24:
-                if (!(steedosField.type === "file")) return [3 /*break*/, 26];
+                return [3 /*break*/, 29];
+            case 26:
+                if (!(steedosField.type === "file")) return [3 /*break*/, 28];
                 return [4 /*yield*/, index.convertSFieldToAmisField(steedosField, true, ctx)];
-            case 25: 
+            case 27: 
             // 附件static模式先保持原来的逻辑，依赖_display，审批王中相关功能在creator中
             // convertSFieldToAmisField中会合并steedosField.amis，所以也不需要再次合并steedosField.amis，直接return就好
             return [2 /*return*/, _5.sent()];
-            case 26:
+            case 28:
                 if (steedosField.type === 'formula' || steedosField.type === 'summary') {
                     if (steedosField.data_type === 'number' || steedosField.data_type === 'currency') {
                         Object.assign(schema, {
@@ -24752,11 +24767,11 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                         disabled: true
                     });
                 }
-                _5.label = 27;
-            case 27:
+                _5.label = 29;
+            case 29:
                 Object.assign(schema, steedosField.amis || {});
                 return [2 /*return*/, schema];
-            case 28:
+            case 30:
                 if (!ctx.className) {
                     ctx.className = className;
                 }
@@ -24817,16 +24832,16 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                     }
                 }
                 return [4 /*yield*/, index.convertSFieldToAmisField(steedosField, readonly, ctx)];
-            case 29:
+            case 31:
                 schema = _5.sent();
                 // console.log(`AmisSteedosField return schema`, schema)
                 return [2 /*return*/, schema];
-            case 30: return [3 /*break*/, 32];
-            case 31:
+            case 32: return [3 /*break*/, 34];
+            case 33:
                 error_1 = _5.sent();
                 console.log("error", error_1);
-                return [3 /*break*/, 32];
-            case 32: return [2 /*return*/, null];
+                return [3 /*break*/, 34];
+            case 34: return [2 /*return*/, null];
         }
     });
 }); };