@steedos-widgets/amis-lib 6.10.34-beta.3 → 6.10.34-beta.5

package/dist/index.esm.js

@@ -14049,6 +14049,12 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
                         columnsTogglable: false
                     }
                 };
+                if (readonly && !_$1.isEmpty(field.amis)){
+                    Object.assign(field.amis, {
+                        disabled: true,
+                        disabledOn: true
+                    });
+                }
                 // console.log(`convertData ======>`, field, convertData)
                 for (const subField of field.subFields) {
                     if(!subField.name.endsWith(".$")){
@@ -14556,8 +14562,8 @@ function uuidv4() {
 /*
  * @Author: 殷亮辉 yinlianghui@hotoa.com
  * @Date: 2023-11-15 09:50:22
- * @LastEditors: yinlianghui yinlianghui@hotoa.com
- * @LastEditTime: 2025-12-10 17:04:58
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2025-12-11 11:47:53
  */
 
 /**
@@ -15175,6 +15181,17 @@ function getFormPaginationWrapper(props, form, mode) {
                     "value": lastestFieldValue
                 }
             });
+
+            // 延时再保存一次当前页数据到子表组件中，解决新增/复制新增行后关闭弹出窗口时数据丢失造成翻页页码错误问题
+            setTimeout(function(){
+                doAction({
+                    "componentId": "${props.id}",
+                    "actionType": "setValue",
+                    "args": {
+                        "value": lastestFieldValue
+                    }
+                });
+            }, 1000);
         }
         event.data.__tableItems.forEach(function(n,i){
             event.data.__tableItems[i] = lastestFieldValue[i];
@@ -15255,7 +15272,7 @@ async function getForm(props, mode = "edit", formId) {
         "type": "form",
         "id": formId,
         "title": "表单",
-        "debug": false,
+        "debug": window.amis_form_debug || false,
         "mode": "normal",
         "body": body,
         "wrapWithPanel": false,
@@ -15496,6 +15513,17 @@ async function getButtonActions(props, mode) {
             }
             // 触发翻页按钮事件，实现保存当前页数据并跳转到最后一行
             scope.getComponentById(buttonNextId).props.dispatchEvent("click", event.data);
+            
+            // 延时再保存一次当前页数据到子表组件中，解决新增/复制新增行后关闭弹出窗口时数据丢失造成翻页页码错误问题
+            setTimeout(function(){
+                doAction({
+                    "componentId": "${props.id}",
+                    "actionType": "setValue",
+                    "args": {
+                        "value": fieldValue
+                    }
+                });
+            }, 1000);
         `;
         let onSaveAndCopyItemScript = `
             let scope = event.context.scoped;
@@ -15568,6 +15596,17 @@ async function getButtonActions(props, mode) {
             }
             // 触发翻页按钮事件，实现保存当前页数据并跳转到最后一行
             scope.getComponentById(buttonNextId).props.dispatchEvent("click", event.data);
+            
+            // 延时再保存一次当前页数据到子表组件中，解决新增/复制新增行后关闭弹出窗口时数据丢失造成翻页页码错误问题
+            setTimeout(function(){
+                doAction({
+                    "componentId": "${props.id}",
+                    "actionType": "setValue",
+                    "args": {
+                        "value": fieldValue
+                    }
+                });
+            }, 1000);
         `;
         let dialogButtons = [
             {
@@ -18505,7 +18544,6 @@ const getFieldEditTpl = async (field, label)=>{
         tpl.type = "steedos-input-table";
         tpl.addable = field.permission === "editable";
         tpl.editable = tpl.addable;
-        tpl.copyable = tpl.addable;
         tpl.removable = tpl.addable;
         if(tpl.addable){
           tpl.actionData = {
@@ -18608,16 +18646,23 @@ const getFieldReadonlyTpl = async (field, label)=>{
     // tpl.format = 'YYYY-MM-DD HH:mm'
     tpl.tpl = `\${${field.code}.name}`;
   }else if(field.type === 'table'){
-    tpl.type = "input-table"; //TODO
-    tpl.addable = field.permission === "editable";
-    tpl.editable = tpl.addable;
-    tpl.removable = tpl.addable;
-    tpl.copyable = tpl.addable;
-    tpl.columns = [];
+    tpl.type = "steedos-input-table";
+    tpl.disabled = true;
+    tpl.autoGeneratePrimaryKeyValue = true;
+    tpl.fields = [];
     for (const sField of field.fields) {
       if (sField.type != "hidden") {
+        sField.permission = "readonly";
         const column = await getTdInputTpl(sField, true);
-        tpl.columns.push(column);
+        // console.log('table column', column, sField);
+        if(column.type === 'steedos-field'){
+          if(sField.visibleOn){
+            column.config.visibleOn = sField.visibleOn;
+          }
+          tpl.fields.push(column.config);
+        }else {
+          tpl.fields.push(column);
+        }
       }
     }
   }else if(field.type === 'html'){