@steedos-widgets/amis-object 3.6.4-beta.7 → 3.6.4

package/dist/amis-object.cjs.css

@@ -2666,8 +2666,10 @@ body.sidebar #sidebar {
 }
 .steedos-input-table .antd-Table-table td > div.antd-Form-item {
   display: inline-block;
+  width: 100%;
 }
-.steedos-input-table.steedos-show-index tbody tr td:nth-child(1) {
+.steedos-input-table.steedos-show-index tbody tr td:nth-child(1),
+.steedos-input-table.steedos-show-index thead tr th:nth-child(1) {
   text-align: center;
 }
 .steedos-input-table .antd-OperationField {

package/dist/amis-object.cjs.js

@@ -15149,6 +15149,7 @@ async function lookupToAmis(field, readonly, ctx){
     const autoFill = await getAutoFill(field);
     if(autoFill){
         amisSchema.autoFill = autoFill;
+        amisSchema.initAutoFill = false;
     }
     return amisSchema;
 }
@@ -16617,11 +16618,9 @@ function uuidv4() {
  * @Author: 殷亮辉 yinlianghui@hotoa.com
  * @Date: 2023-11-15 09:50:22
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2024-02-29 18:36:58
+ * @LastEditTime: 2024-03-02 16:07:17
  */
 
-const fieldPrefixSplit = "__";
-
 /**
  * 子表组件字段值中每行数据补上字段值为空的的字段值，把值统一设置为空字符串，是为了解决amis amis 3.6/6.0 input-table组件bug:行中字段值为空时会显示为父作用域中的同名变量值，见：https://github.com/baidu/amis/issues/9520
  * amis #9520修正后此函数及相关代码可以移除
@@ -16800,14 +16799,14 @@ function getTableFieldsWithoutFieldPrefix(fields, fieldPrefix) {
  * @param {*} fieldPrefix 字段前缀
  * @returns 转换后的子表组件字段值
  */
-function getTableFieldsPrependFieldPrefix(fields, fieldPrefix) {
-    return (fields || []).map((item) => {
-        const newItem = _$1.clone(item);
-        newItem.name = `${fieldPrefix}${item.name}`;
-        newItem.__originalName = item.name;
-        return newItem;
-    });
-}
+// function getTableFieldsPrependFieldPrefix(fields, fieldPrefix) {
+//     return (fields || []).map((item) => {
+//         const newItem = clone(item);
+//         newItem.name = `${fieldPrefix}${item.name}`;
+//         newItem.__originalName = item.name;
+//         return newItem;
+//     });
+// }
 
 /**
  * @param {*} props 
@@ -16819,9 +16818,6 @@ function getFormFields(props, mode = "edit") {
     if (fieldPrefix) {
         fields = getTableFieldsWithoutFieldPrefix(fields, fieldPrefix);
     }
-    else {
-        fields = getTableFieldsPrependFieldPrefix(fields, props.name + fieldPrefixSplit);
-    }
     return (fields || []).map(function (item) {
         let formItem = {
             "type": "steedos-field",
@@ -16837,16 +16833,21 @@ function getFormFields(props, mode = "edit") {
 
 function getInputTableCell(field, showAsInlineEditMode) {
     if (showAsInlineEditMode) {
+        // 这里不可以用quickEdit，因为amis存在bug：input-table内的字段在行编辑模式时会受到外层相同name的字段的影响 https://github.com/baidu/amis/issues/9653
         return {
+            "type": "steedos-field",
+            "config": Object.assign({}, field, {
+                label: false
+            }),
+            // quickEdit: {
+            //     "type": "steedos-field",
+            //     "mode": "inline",
+            //     "config": Object.assign({}, field, {
+            //         label: false
+            //     })
+            // },
             label: field.label,
-            name: field.name,
-            quickEdit: {
-                "type": "steedos-field",
-                "mode": "inline",
-                "config": Object.assign({}, field, {
-                    label: false
-                })
-            }
+            name: field.name
         }
     }
     else {
@@ -16901,12 +16902,6 @@ async function getInputTableColumns(props, buttonsForColumnOperations) {
     if (fieldPrefix) {
         fields = getTableFieldsWithoutFieldPrefix(fields, fieldPrefix);
     }
-    else {
-        fields = getTableFieldsPrependFieldPrefix(fields, props.name + fieldPrefixSplit);
-        columns = getTableFieldsPrependFieldPrefix(columns.map(function (item) {
-            return typeof item == "string" ? { name: item } : item;
-        }), props.name + fieldPrefixSplit);
-    }
     if (inlineEditMode == true) {
         let popOverContainerSelector = "";
         let popOverContainer = props.popOverContainer && props.popOverContainer();
@@ -17204,10 +17199,6 @@ function getFormPaginationWrapper(props, form, mode) {
             let getTableValueWithoutFieldPrefix = new Function('v', 'f', "return (" + ${getTableValueWithoutFieldPrefix.toString()} + ")(v, f)");
             lastestFieldValue = getTableValueWithoutFieldPrefix(lastestFieldValue, fieldPrefix);
         }
-        else{
-            let getTableValuePrependFieldPrefix = new Function('v', 'f', "return (" + ${getTableValuePrependFieldPrefix.toString()} + ")(v, f)");
-            lastestFieldValue = getTableValuePrependFieldPrefix(lastestFieldValue, "${props.name + fieldPrefixSplit}", "${primaryKey}");
-        }
         //不可以直接像event.data.__tableItems = lastestFieldValue; 这样整个赋值，否则作用域会断
         let mode = "${mode || ''}";
         if(mode === "new"){
@@ -18014,9 +18005,6 @@ const getAmisInputTableSchema = async (props) => {
     if (fieldPrefix) {
         fields = getTableFieldsWithoutFieldPrefix(fields, fieldPrefix);
     }
-    else {
-        fields = getTableFieldsPrependFieldPrefix(fields, props.name + fieldPrefixSplit);
-    }
     let serviceId = getComponentId("table_service", props.id);
     let buttonsForColumnOperations = [];
     let inlineEditMode = props.inlineEditMode;
@@ -18078,9 +18066,6 @@ const getAmisInputTableSchema = async (props) => {
             if (fieldPrefix) {
                 value = getTableValueWithoutFieldPrefix(value, fieldPrefix);
             }
-            else {
-                value = getTableValuePrependFieldPrefix(value, props.name + fieldPrefixSplit, primaryKey);
-            }
             value = getTableValueWithEmptyValue(value, fields);
             if (primaryKey) {
                 // 这里临时给每行数据补上primaryKey字段值，如果库里不需要保存这里补上的字段值，pipeOut中会识别autoGeneratePrimaryKeyValue属性选择最终移除这里补上的字段值
@@ -18103,9 +18088,6 @@ const getAmisInputTableSchema = async (props) => {
             if (fieldPrefix) {
                 value = getTableValuePrependFieldPrefix(value, fieldPrefix, primaryKey);
             }
-            else {
-                value = getTableValueWithoutFieldPrefix(value, props.name + fieldPrefixSplit);
-            }
             value = getTableValueWithoutEmptyValue(value, fields);
             if (props.autoGeneratePrimaryKeyValue === true) {
                 // 如果需要把自动生成的primaryKey值输出保存的库中，则补全所有行中的primaryKey值
@@ -23659,7 +23641,7 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                     static: true,
                     label: steedosField.label
                 });
-                if (!(steedosField.type === "time")) return [3 /*break*/, 10];
+                if (!(steedosField.type === "time" || steedosField.type === "input-time-range")) return [3 /*break*/, 10];
                 Object.assign(schema, {
                     inputFormat: 'HH:mm',
                     timeFormat: 'HH:mm',
@@ -23696,7 +23678,8 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                 if (!(steedosField.type === "number" || steedosField.type === 'currency')) return [3 /*break*/, 15];
                 // amis input-number和number组件中的precision表示小数位数，并不是魔方平台的精度概念，要转换下，否则小数点后会显示很多的0
                 Object.assign(schema, {
-                    "precision": steedosField.scale || 0
+                    "precision": steedosField.scale || 0,
+                    "kilobitSeparator": steedosField.enable_thousands //识别enable_thousands，控制千分位分隔符
                 });
                 return [3 /*break*/, 20];
             case 15:
@@ -23816,6 +23799,24 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                         }
                     });
                 }
+                else if (steedosField.type === 'input-date-range' || steedosField.type === 'date') {
+                    Object.assign(schema, {
+                        inputFormat: "YYYY-MM-DD",
+                        format: 'YYYY-MM-DDT00:00:00.000[Z]'
+                    });
+                }
+                else if (steedosField.type === 'input-datetime-range' || steedosField.type === 'datetime') {
+                    Object.assign(schema, {
+                        inputFormat: "YYYY-MM-DD HH:mm",
+                        format: 'YYYY-MM-DDTHH:mm:ss.SSSZ'
+                    });
+                }
+                else if (steedosField.type === 'toggle') {
+                    Object.assign(schema, {
+                        static: false,
+                        disabled: true
+                    });
+                }
                 _o.label = 20;
             case 20:
                 Object.assign(schema, steedosField.amis || {});
@@ -24143,6 +24144,11 @@ var AmisInputTable = function (props) { return __awaiter(void 0, void 0, void 0,
                 if (props.enableDialog === false) {
                     extendProps["inlineEditMode"] = true;
                 }
+                //showIndex默认为true
+                extendProps["showIndex"] = true;
+                if (props.showIndex == false || props.enableTree == true) {
+                    extendProps["showIndex"] = false;
+                }
                 return [4 /*yield*/, getAmisInputTableSchema(Object.assign({}, props, extendProps))];
             case 1:
                 amisSchema = _a.sent();