@steedos-widgets/amis-lib 3.6.4-beta.6 → 3.6.4-beta.8

package/dist/index.esm.js

@@ -13436,7 +13436,7 @@ function uuidv4() {
  * @Author: 殷亮辉 yinlianghui@hotoa.com
  * @Date: 2023-11-15 09:50:22
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2024-01-26 17:47:16
+ * @LastEditTime: 2024-03-02 16:07:17
  */
 
 /**
@@ -13553,7 +13553,12 @@ function getTableValueWithoutFieldPrefix(value, fieldPrefix) {
         var newItemValue = {};
         for (let n in itemValue) {
             if (itemValue.hasOwnProperty(n)) {
-                newItemValue[n.replace(new RegExp(`^${fieldPrefix}`), "")] = itemValue[n];
+                if(n === "children"){
+                    newItemValue.children = getTableValueWithoutFieldPrefix(itemValue.children, fieldPrefix);
+                }
+                else {
+                    newItemValue[n.replace(new RegExp(`^${fieldPrefix}`), "")] = itemValue[n];
+                }
             }
         }
         convertedValue.push(newItemValue);
@@ -13574,7 +13579,12 @@ function getTableValuePrependFieldPrefix(value, fieldPrefix, primaryKey) {
         var newItemValue = {};
         for (let n in itemValue) {
             if (itemValue.hasOwnProperty(n) && typeof itemValue[n] !== undefined && n !== primaryKey) {
-                newItemValue[`${fieldPrefix}${n}`] = itemValue[n];
+                if(n === "children"){
+                    newItemValue.children = getTableValuePrependFieldPrefix(itemValue.children, fieldPrefix, primaryKey);
+                }
+                else {
+                    newItemValue[`${fieldPrefix}${n}`] = itemValue[n];
+                }
             }
         }
         if (primaryKey && itemValue[primaryKey]) {
@@ -13599,6 +13609,23 @@ function getTableFieldsWithoutFieldPrefix(fields, fieldPrefix) {
     });
 }
 
+/**
+ * 子表组件字段集合属性中每个字段name补上指定前缀
+ * 因amis存在bug：input-table内的字段在行编辑模式时会受到外层相同name的字段的影响 https://github.com/baidu/amis/issues/9653
+ * 在渲染input table组件时统一调用此函数加上前缀来避开同名字段问题
+ * @param {*} fields 子表组件字段集合，数组
+ * @param {*} fieldPrefix 字段前缀
+ * @returns 转换后的子表组件字段值
+ */
+// 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 
  * @param {*} mode edit/new/readonly
@@ -13624,16 +13651,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 {
@@ -13677,7 +13709,7 @@ function getComponentId(name, tag) {
  * @param {*} props 
  * @param {*} mode edit/new/readonly
  */
-async function getInputTableColumns(props) {
+async function getInputTableColumns(props, buttonsForColumnOperations) {
     let columns = props.columns || [];
     let inlineEditMode = props.inlineEditMode;
     let showAsInlineEditMode = inlineEditMode && props.editable;
@@ -13711,7 +13743,7 @@ async function getInputTableColumns(props) {
     }
     
     if (columns && columns.length) {
-        return columns.map(function (column) {
+        return columns.map(function (column, index) {
             let field, extendColumnProps = {};
             if (typeof column === "string") {
                 // 如果字符串，则取出要显示的列配置
@@ -13737,9 +13769,13 @@ async function getInputTableColumns(props) {
                 let className = "";
                 //判断是否换行，目前规则默认换行
                 if(extendColumnProps.wrap != true){
-                    className += " whitespace-nowrap ";
+                    className += " whitespace-nowrap";
                 }else {
-                    className += " break-words ";
+                    className += " break-words";
+                }
+                
+                if(buttonsForColumnOperations.length == 0 && !props.showIndex && index == 0) {
+                    className += " antd-Table-primayCell";
                 }
                 //合并classname
                 if (typeof extendColumnProps.className == "object") {
@@ -13758,9 +13794,12 @@ async function getInputTableColumns(props) {
         });
     }
     else {
-        return fields.map(function (field) {
+        return fields.map(function (field, index) {
             let tableCell = getInputTableCell(field, showAsInlineEditMode); 
             tableCell.className = " whitespace-nowrap ";
+            if(buttonsForColumnOperations.length == 0 && !props.showIndex && index == 0) {
+                tableCell.className += " antd-Table-primayCell";
+            }
             return tableCell;
         }) || [];
     }
@@ -14835,7 +14874,7 @@ const getAmisInputTableSchema = async (props) => {
         "showIndex": props.showIndex,
         "perPage": props.perPage,
         "id": props.id,
-        "columns": await getInputTableColumns(props),
+        "columns": await getInputTableColumns(props, buttonsForColumnOperations),
         // "needConfirm": false, //不可以配置为false，否则，单元格都是可编辑状态，且很多static类型无法正常显示，比如static-mapping
         "strictMode": props.strictMode,
         "showTableAddBtn": false,