@steedos-widgets/amis-object 3.6.0-beta.9 → 3.6.1

package/dist/amis-object.cjs.css

@@ -479,6 +479,9 @@ fieldset.antd-Collapse > legend{
 .m-0 {
     margin: 0px
 }
+.m-1 {
+    margin: 0.25rem
+}
 .m-2 {
     margin: 0.5rem
 }

package/dist/amis-object.cjs.js

@@ -4790,11 +4790,11 @@ async function getQuickEditSchema(field, options){
                             if(event.data.isBatchEdit){
                                 selectedItems.forEach(function(selectedItem){
                                     selectedItem._display.${field.name} = event.data._display.${field.name};
-                                    doAction({actionType: 'setValue', "args": {"value": selectedItem._display},componentId: "_display_" + selectedItem._index});
+                                    doAction({actionType: 'setValue', "args": {"value": selectedItem._display},componentId: ${options.objectName} + "_display_" + selectedItem._index});
                                     doAction({actionType: 'setValue', "args": {"value": event.data.${field.name}},componentId: "${options.objectName + "_" + field.name + "_"}" + selectedItem._index});
                                 })
                             }else{
-                                doAction({actionType: 'setValue', "args": {"value": event.data._display},componentId: "_display_" + event.data._index});
+                                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});
                             }
                         `
@@ -11626,7 +11626,7 @@ async function getObjectCRUD(objectSchema, fields, options){
 
     if(body.columns && options.formFactor != 'SMALL'){
       //将_display放入crud的columns的倒数第二列中（最后一列会影响固定列），可以通过setvalue修改行内数据域的_display，而不影响上层items的_display,用于批量编辑
-      body.columns.splice(body.columns.length - 1, 0, {name: '_display',type: 'static', width: 32, placeholder: "",id: "_display_${_index}", className: "hidden"});
+      body.columns.splice(body.columns.length - 1, 0, {name: '_display',type: 'static', width: 32, placeholder: "",id: objectSchema.name + "_display_${_index}", className: "hidden"});
     }
 
     if (defaults) {
@@ -13579,6 +13579,8 @@ function getLookupSapceUserTreeSchema(isMobile){
             _.each(children, (item) => {
                 if (item.children) {
                     item.children = getChildren(records, item.children)
+                }else{
+                    item.children = [];
                 }
             })
             return children;
@@ -13933,6 +13935,14 @@ async function lookupToAmisPicker(field, readonly, ctx){
         })
         payload.data.rows = rows;
         */
+        if(enable_tree){
+            const rows = _.map(payload.data.rows, (item)=>{
+                delete item.children;
+                delete item.parent;
+                return item;
+            })
+            payload.data.rows = rows;
+        }
         return payload;
     }
     if(!payload.data.rows){
@@ -13964,6 +13974,8 @@ async function lookupToAmisPicker(field, readonly, ctx){
             _.each(children, (item)=>{
                 if(item.children){
                     item.children = getChildren(records, item.children)
+                }else{
+                    item.children = [];
                 }
             })
             return children;
@@ -14018,7 +14030,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
         const isAllowCreate = refObjectConfig.permissions.allowCreate;
         const isCreate = _$1__namespace.isBoolean(field.create) ? field.create : true;
         // lookup字段配置过滤条件就强制不显示新建按钮
-        let isHasFilters = (field.filters || field._filtersFunction) ? true : false;
+        let isHasFilters = (field.filters || field.filtersFunction || field._filtersFunction) ? true : false;
         if (isAllowCreate && isCreate && !isHasFilters) {
             const new_button = await getSchema$5(refObjectConfig, { appId: ctx.appId, objectName: refObjectConfig.name, formFactor: ctx.formFactor });
             new_button.align = "right";
@@ -14436,11 +14448,13 @@ async function lookupToAmis(field, readonly, ctx){
     }
     let refLookupPage = refObject.pages && refObject.pages.lookup;
     if(refLookupPage){
-        if(typeof refLookupPage == 'string'){
-            refLookupPage = JSON.parse(refLookupPage);
+        if(refLookupPage.is_enable){
+            let pageAmisSchema = refLookupPage.amis_schema;
+            if(typeof pageAmisSchema == 'string'){
+                pageAmisSchema = JSON.parse(pageAmisSchema);
+            }
+            amisSchema = _$1__namespace.defaultsDeep({}, pageAmisSchema, amisSchema);
         }
-        // Object.assign(amisSchema, refLookupPage);
-        // amisSchema = _.defaultsDeep({}, refLookupPage, amisSchema);
     }
     return amisSchema;
 }
@@ -15191,7 +15205,8 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
                     },
                     pipeOut: (value, oldValue, data) => {
                         if(value){
-                            return value/100;
+                            const result = value/100;
+                            return Number(result.toFixed(field.scale+2));
                         }
                         return value;
                     },
@@ -15425,7 +15440,7 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
         if(field.is_wide || convertData.type === 'group'){
             convertData.className = 'col-span-2 m-0';
         }else {
-            convertData.className = 'm-0';
+            convertData.className = 'm-1';
         }
         if(readonly){
             convertData.className = `${convertData.className} border-b`;
@@ -15830,8 +15845,8 @@ async function getFormBody(permissionFields, formFields, ctx){
 /*
  * @Author: 殷亮辉 yinlianghui@hotoa.com
  * @Date: 2023-11-15 09:50:22
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-01-02 15:43:50
+ * @LastEditors: liaodaxue
+ * @LastEditTime: 2024-01-09 18:12:28
  */
 
 /**
@@ -15871,6 +15886,7 @@ function getInputTableCell(field, showAsInlineEditMode) {
             "config": Object.assign({}, field, {
                 label: false
             }),
+            inInputTable: true,
             "static": true,
             "readonly": true,
             label: field.label,
@@ -19762,6 +19778,7 @@ var AmisObjectButton = function (props) {
                 delete renderData.event;
             }
             schema.data = _$1.defaultsDeep({}, renderData, getDefaultRenderData(), schema.data);
+            delete schema.data.event;
         }
         return (React__default["default"].createElement(React__default["default"].Fragment, null, button && amisSchema ? (React__default["default"].createElement(React__default["default"].Fragment, null, render('body', schema, {
             // 这里的信息会作为 props 传递给子组件，一般情况下都不需要这个,
@@ -19781,7 +19798,7 @@ var getMenu = function (render, buttons, btnClassName, props) {
         if (btnClassName) {
             button.className = "".concat(button.className, " ").concat(btnClassName);
         }
-        if (button.visibleOn) {
+        if (button.visibleOnAlias) {
             button.visibleOn = button.visibleOnAlias;
         }
         delete button.className;
@@ -20149,7 +20166,6 @@ var AmisObjectListView = function (props) { return __awaiter(void 0, void 0, voi
                             },
                             {
                                 "actionType": "reload",
-                                "componentId": "listview_" + objectApiName,
                                 "expression": "${(event.data.recordId || event.data.__deletedRecord === true || event.data.displayAs === 'split') && event.data._isRelated != true}" //不是新建, 或分栏模式下新建主对象记录, 则刷新列表
                             }
                         ]
@@ -21774,14 +21790,14 @@ function getAmisStaticFieldType(type, data_type, options) {
     return type;
 }
 var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-    var steedosField, field, _a, readonly, _b, ctx, config, fStatic, env, defaultSource, source, tpl_1, res, valueOptions, schema, fieldSchema, fieldValue, hasImageOrFile_1, fieldHtml_1, schema, tableFields, _c, _d, subField, subFieldName, fieldAmis, schema, error_1;
+    var steedosField, field, _a, readonly, _b, ctx, config, fStatic, env, inInputTable, defaultSource, source, fieldBaseProps, tpl_1, res, valueOptions, fieldValue_1, reference_to_field_1, schema, fieldSchema, fieldValue, hasImageOrFile_1, fieldHtml_1, schema, tableFields, _c, _d, subField, subFieldName, fieldAmis, schema, error_1;
     var e_1, _e;
-    var _f, _g, _h, _j;
-    return __generator(this, function (_k) {
-        switch (_k.label) {
+    var _f, _g, _h, _j, _k;
+    return __generator(this, function (_l) {
+        switch (_l.label) {
             case 0:
                 steedosField = null;
-                field = props.field, _a = props.readonly, readonly = _a === void 0 ? false : _a, _b = props.ctx, ctx = _b === void 0 ? {} : _b, config = props.config, props.$schema, fStatic = props.static, env = props.env;
+                field = props.field, _a = props.readonly, readonly = _a === void 0 ? false : _a, _b = props.ctx, ctx = _b === void 0 ? {} : _b, config = props.config, props.$schema, fStatic = props.static, env = props.env, inInputTable = props.inInputTable;
                 // console.log(`AmisSteedosField`, props)
                 // if($schema.config && isString($schema.config)){
                 //     $schema.config = JSON.parse($schema.config)
@@ -21809,10 +21825,10 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                     // 字段配置为只读，强制走fStatic模式，加上_display判断是为了不影响历史代码，比如直接在ObjectForm中调用steedos-field组件
                     fStatic = true;
                 }
-                _k.label = 1;
+                _l.label = 1;
             case 1:
-                _k.trys.push([1, 19, , 20]);
-                if (!(fStatic && (steedosField.type === 'lookup' || steedosField.type === 'master_detail'))) return [3 /*break*/, 3];
+                _l.trys.push([1, 21, , 22]);
+                if (!(fStatic && (steedosField.type === 'lookup' || steedosField.type === 'master_detail'))) return [3 /*break*/, 5];
                 defaultSource = {
                     "method": "post",
                     "url": "${context.rootUrl}/graphql",
@@ -21834,36 +21850,49 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                     }
                 }
                 source = ((_f = steedosField.amis) === null || _f === void 0 ? void 0 : _f.source) || ((_g = steedosField.amis) === null || _g === void 0 ? void 0 : _g.autoComplete) || defaultSource;
+                fieldBaseProps = {
+                    multiple: steedosField.multiple,
+                    name: steedosField.name,
+                    label: steedosField.label,
+                    static: true,
+                    className: (_h = steedosField.amis) === null || _h === void 0 ? void 0 : _h.className
+                };
+                if (!inInputTable) return [3 /*break*/, 2];
+                fieldBaseProps = Object.assign({}, fieldBaseProps, { type: 'select', source: source });
+                return [3 /*break*/, 4];
+            case 2:
                 tpl_1 = '';
                 return [4 /*yield*/, env.fetcher(source, props.data)];
-            case 2:
-                res = _k.sent();
-                valueOptions = ((_h = res === null || res === void 0 ? void 0 : res.data) === null || _h === void 0 ? void 0 : _h.options) || [];
-                if (valueOptions && valueOptions.length) {
+            case 3:
+                res = _l.sent();
+                valueOptions = ((_j = res === null || res === void 0 ? void 0 : res.data) === null || _j === void 0 ? void 0 : _j.options) || [];
+                fieldValue_1 = (_k = props.data) === null || _k === void 0 ? void 0 : _k[steedosField.name];
+                if (fieldValue_1 && fieldValue_1.length && valueOptions && valueOptions.length) {
+                    reference_to_field_1 = steedosField.reference_to_field;
                     _$1.forEach(valueOptions, function (item, index) {
                         var label = item.label, value = item.value;
-                        var optionTpl = "<a href=\"/app/-/".concat(steedosField.reference_to, "/view/").concat(value, "\" >").concat(label, "</a>");
-                        tpl_1 += index ? '，' + optionTpl : optionTpl;
+                        if (fieldValue_1.indexOf(value) > -1) {
+                            // 因为lookup、master_detail字段配置了reference_to_field != _id的情况下，source中返回的值不能当作链接的后缀值，所以移除字段链接。
+                            var optionTpl = "<a href=\"/app/-/".concat(steedosField.reference_to, "/view/").concat(value, "\" >").concat(label, "</a>");
+                            if (reference_to_field_1 && reference_to_field_1 != '_id') {
+                                optionTpl = "".concat(label);
+                            }
+                            tpl_1 += tpl_1 ? '，' + optionTpl : optionTpl;
+                        }
                     });
                 }
-                schema = Object.assign({}, {
-                    type: 'static',
-                    tpl: tpl_1,
-                    multiple: steedosField.multiple,
-                    name: steedosField.name,
-                    label: steedosField.label,
-                    static: true,
-                    className: (_j = steedosField.amis) === null || _j === void 0 ? void 0 : _j.className,
-                    // source: source,
-                }, _$1.pick(steedosField.amis || {}, ['className', 'inline', 'label', 'labelAlign', 'name', 'labelRemark', 'description', 'placeholder', 'staticClassName', 'staticLabelClassName', 'staticInputClassName', 'staticSchema']));
+                fieldBaseProps = Object.assign({}, fieldBaseProps, { type: 'static', tpl: tpl_1 });
+                _l.label = 4;
+            case 4:
+                schema = Object.assign({}, fieldBaseProps, _$1.pick(steedosField.amis || {}, ['className', 'inline', 'label', 'labelAlign', 'name', 'labelRemark', 'description', 'placeholder', 'staticClassName', 'staticLabelClassName', 'staticInputClassName', 'staticSchema']));
                 schema.placeholder = "";
                 return [2 /*return*/, schema];
-            case 3:
-                if (!fStatic) return [3 /*break*/, 16];
-                if (!props.data.hasOwnProperty("_display")) return [3 /*break*/, 5];
+            case 5:
+                if (!fStatic) return [3 /*break*/, 18];
+                if (!props.data.hasOwnProperty("_display")) return [3 /*break*/, 7];
                 return [4 /*yield*/, index.convertSFieldToAmisField(steedosField, readonly, ctx)];
-            case 4:
-                fieldSchema = _k.sent();
+            case 6:
+                fieldSchema = _l.sent();
                 if (steedosField.type === 'file' && fieldSchema.disabled) {
                     fieldValue = fieldSchema.value;
                     if (fieldValue && fieldValue.length) {
@@ -21899,52 +21928,52 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                     }
                 }
                 return [2 /*return*/, fieldSchema];
-            case 5:
+            case 7:
                 schema = Object.assign({}, steedosField, {
                     type: getAmisStaticFieldType(steedosField.type, steedosField.data_type, steedosField),
                     static: true,
                     label: steedosField.label
                 });
-                if (!(steedosField.type === "time")) return [3 /*break*/, 6];
+                if (!(steedosField.type === "time")) return [3 /*break*/, 8];
                 Object.assign(schema, {
                     inputFormat: 'HH:mm',
                     timeFormat: 'HH:mm',
                     format: '1970-01-01THH:mm:00.000[Z]',
                 });
-                return [3 /*break*/, 15];
-            case 6:
-                if (!(steedosField.type === "percent")) return [3 /*break*/, 7];
+                return [3 /*break*/, 17];
+            case 8:
+                if (!(steedosField.type === "percent")) return [3 /*break*/, 9];
                 Object.assign(schema, {
                     "percent": steedosField.scale ? steedosField.scale : true
                 });
-                return [3 /*break*/, 15];
-            case 7:
-                if (!(steedosField.type === "password")) return [3 /*break*/, 8];
+                return [3 /*break*/, 17];
+            case 9:
+                if (!(steedosField.type === "password")) return [3 /*break*/, 10];
                 Object.assign(schema, {
                     "revealPassword": false //没生效，需要用样式隐藏
                 });
-                return [3 /*break*/, 15];
-            case 8:
-                if (!(steedosField.type === "select")) return [3 /*break*/, 9];
+                return [3 /*break*/, 17];
+            case 10:
+                if (!(steedosField.type === "select")) return [3 /*break*/, 11];
                 Object.assign(schema, {
                     "placeholder": ""
                 });
-                return [3 /*break*/, 15];
-            case 9:
-                if (!(steedosField.type === "color")) return [3 /*break*/, 10];
+                return [3 /*break*/, 17];
+            case 11:
+                if (!(steedosField.type === "color")) return [3 /*break*/, 12];
                 Object.assign(schema, {
                     "defaultColor": null
                 });
-                return [3 /*break*/, 15];
-            case 10:
-                if (!(steedosField.type === "number")) return [3 /*break*/, 11];
+                return [3 /*break*/, 17];
+            case 12:
+                if (!(steedosField.type === "number")) return [3 /*break*/, 13];
                 // amis input-number和number组件中的precision表示小数位数，并不是魔方平台的精度概念，要转换下，否则小数点后会显示很多的0
                 Object.assign(schema, {
                     "precision": steedosField.scale || 0
                 });
-                return [3 /*break*/, 15];
-            case 11:
-                if (!(steedosField.type === "table")) return [3 /*break*/, 12];
+                return [3 /*break*/, 17];
+            case 13:
+                if (!(steedosField.type === "table")) return [3 /*break*/, 14];
                 if (steedosField.subFields) {
                     tableFields = [];
                     try {
@@ -21977,9 +22006,9 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                         }
                     });
                 }
-                return [3 /*break*/, 15];
-            case 12:
-                if (!(steedosField.type === "image")) return [3 /*break*/, 13];
+                return [3 /*break*/, 17];
+            case 14:
+                if (!(steedosField.type === "image")) return [3 /*break*/, 15];
                 Object.assign(schema, {
                     enlargeAble: true,
                     showToolbar: true,
@@ -22010,18 +22039,18 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                         return value;
                     }
                 });
-                return [3 /*break*/, 15];
-            case 13:
-                if (!(steedosField.type === "file")) return [3 /*break*/, 15];
+                return [3 /*break*/, 17];
+            case 15:
+                if (!(steedosField.type === "file")) return [3 /*break*/, 17];
                 return [4 /*yield*/, index.convertSFieldToAmisField(steedosField, readonly, ctx)];
-            case 14: 
+            case 16: 
             // 附件static模式先保持原来的逻辑，依赖_display，审批王中相关功能在creator中
             // convertSFieldToAmisField中会合并steedosField.amis，所以也不需要再次合并steedosField.amis，直接return就好
-            return [2 /*return*/, _k.sent()];
-            case 15:
+            return [2 /*return*/, _l.sent()];
+            case 17:
                 Object.assign(schema, steedosField.amis || {});
                 return [2 /*return*/, schema];
-            case 16:
+            case 18:
                 fieldAmis = steedosField.amis || {};
                 if (!props.data.hasOwnProperty("_display")) {
                     // 有_display时保持原来的逻辑不变，不走以下新的逻辑，审批王中会特意传入_display以跳过后面新加的代码
@@ -22079,16 +22108,16 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                     }
                 }
                 return [4 /*yield*/, index.convertSFieldToAmisField(steedosField, readonly, ctx)];
-            case 17:
-                schema = _k.sent();
+            case 19:
+                schema = _l.sent();
                 // console.log(`AmisSteedosField return schema`, schema)
                 return [2 /*return*/, schema];
-            case 18: return [3 /*break*/, 20];
-            case 19:
-                error_1 = _k.sent();
+            case 20: return [3 /*break*/, 22];
+            case 21:
+                error_1 = _l.sent();
                 console.log("error", error_1);
-                return [3 /*break*/, 20];
-            case 20: return [2 /*return*/, null];
+                return [3 /*break*/, 22];
+            case 22: return [2 /*return*/, null];
         }
     });
 }); };