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

package/dist/index.esm.js

@@ -13436,11 +13436,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修正后此函数及相关代码可以移除
@@ -13619,14 +13617,14 @@ function getTableFieldsWithoutFieldPrefix(fields, fieldPrefix) {
  * @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;
-    });
-}
+// 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 
@@ -13638,9 +13636,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",
@@ -13656,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 {
@@ -13720,12 +13720,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();
@@ -14023,10 +14017,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"){
@@ -14833,9 +14823,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;
@@ -14897,9 +14884,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属性选择最终移除这里补上的字段值
@@ -14922,9 +14906,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值