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

package/dist/index.esm.js

@@ -13436,9 +13436,11 @@ 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-02-29 18:36:58
  */
 
+const fieldPrefixSplit = "__";
+
 /**
  * 子表组件字段值中每行数据补上字段值为空的的字段值，把值统一设置为空字符串，是为了解决amis amis 3.6/6.0 input-table组件bug:行中字段值为空时会显示为父作用域中的同名变量值，见：https://github.com/baidu/amis/issues/9520
  * amis #9520修正后此函数及相关代码可以移除
@@ -13553,7 +13555,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 +13581,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 +13611,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
@@ -13609,6 +13638,9 @@ 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",
@@ -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;
@@ -13688,6 +13720,12 @@ async function getInputTableColumns(props) {
     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();
@@ -13711,7 +13749,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 +13775,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 +13800,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;
         }) || [];
     }
@@ -13978,6 +14023,10 @@ 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"){
@@ -14784,6 +14833,9 @@ 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;
@@ -14835,7 +14887,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,
@@ -14845,6 +14897,9 @@ 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属性选择最终移除这里补上的字段值
@@ -14867,6 +14922,9 @@ 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值