@steedos-widgets/amis-lib 6.10.34-beta.4 → 6.10.34-beta.6

package/dist/index.esm.js

@@ -1214,8 +1214,8 @@ async function getPage({type, pageId = '', appId, objectName = '', recordId = ''
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-10-28 14:15:09
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2025-02-13 09:31:02
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2025-12-12 16:47:28
  * @Description: 
  */
 
@@ -1363,7 +1363,7 @@ const  getAmisFileReadonlySchema = async (steedosField,ctx = {})=>{
             //             <a href='<%= item.url %>' target='_self' class='block'><%= item.name %></a> 
             //     <% });} %>`
             "type": "control",
-            "name": "",//control若存在name，内部each组件的source则会获取不到内容
+            // "name": "",//control若存在name，内部each组件的source则会获取不到内容 //加上这个空nmae字段会造成列表页面报错 TypeError: Unexpected token } in 1:3，移除后原issue #6977 经测试并没有问题
             "body": {
                 type: 'each',
                 placeholder: "",
@@ -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(".$")){
@@ -17131,8 +17137,7 @@ const getNextStepInput = async (instance, nextStepChangeEvents) => {
             required: true,
             // selectFirst: true,
             autoFill: {
-              "new_next_step": "${step}",
-              "next_users": null
+              "new_next_step": "${step}"
             },
             "source": {
               "url": "/api/workflow/v2/nextStep?judge=${new_judge}",
@@ -18538,7 +18543,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 = {
@@ -18641,16 +18645,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'){
@@ -19150,6 +19161,24 @@ const getScrollToBottomAutoOpenApproveDrawerScript = () => {
   `;
 };
 
+const checkInstanceFlowVersion = async (instance) => {
+  const flow = await fetchAPI$1(`/api/v1/flows/${instance.flow._id}?fields=["name","current._id"]`, {
+    method: "get"
+  });
+  if (flow.data.current._id !== instance.flowVersion._id) {
+    console.log("checkInstanceFlowVersion: flow version changed");
+    return false;
+  }
+  const form = await fetchAPI$1(`/api/v1/forms/${instance.form._id}?fields=["name","current._id"]`, {
+    method: "get"
+  });
+  if (form.data.current._id !== instance.formVersion._id) {
+    console.log("checkInstanceFlowVersion: form version changed");
+    return false;
+  }
+  return true;
+};
+
 const getFlowFormSchema = async (instance, box) => {
   const formStyle = instance.formVersion.style || "table";
   let formContentSchema;
@@ -19177,7 +19206,28 @@ const getFlowFormSchema = async (instance, box) => {
     nextStepChangeEvents = onEvent?.nextStepChange?.actions || [];
     nextStepUserChangeEvents = onEvent?.nextStepUserChange?.actions || [];
   }
-  // if (box == 'inbox' || box == 'draft') {
+  if (box == 'draft' && instance.state === 'draft') {
+    // 草稿调用流程版本接口确认是否有新版本，有则调用一次暂存接口，它会提示升级并自动刷新浏览器
+    let isFlowVersionChecked = await checkInstanceFlowVersion(instance);
+    if (!isFlowVersionChecked) {
+      initedEvents.push({
+        "actionType": "ajax",
+        "api": {
+          "url": "/api/workflow/v2/instance/save",
+          "method": "post",
+          "sendOn": "",
+          "requestAdaptor": "var _SteedosUI$getRef$get, _approveValues$next_s;\nconst formValues = context._scoped.getComponentById(\"instance_form\").getValues(); const _formValues = JSON.parse(JSON.stringify(formValues)); if(_formValues){delete _formValues.__applicant} \nconst approveValues = (_SteedosUI$getRef$get = context._scoped.getComponentById(\"instance_approval\")) === null || _SteedosUI$getRef$get === void 0 ? void 0 : _SteedosUI$getRef$get.getValues();\nlet nextUsers = approveValues === null || approveValues === void 0 ? void 0 : approveValues.next_users;\nif (_.isString(nextUsers)) {\n  nextUsers = [approveValues.next_users];\n}\nconst instance = context.record;\nconst body = {\n  instance: {\n    _id: instance._id,\n    applicant: context.__applicant,\n    submitter: formValues.submitter,\n    traces: [{\n      _id: instance.trace._id,\n      step: instance.step._id,\n      approves: [{\n        _id: instance.approve._id,\n        next_steps: [{\n          step: approveValues === null || approveValues === void 0 || (_approveValues$next_s = approveValues.next_step) === null || _approveValues$next_s === void 0 ? void 0 : _approveValues$next_s._id,\n          users: nextUsers\n        }],\n        description: approveValues === null || approveValues === void 0 ? void 0 : approveValues.suggestion,\n        values: _formValues\n      }]\n    }]\n  }\n};\napi.data = body;\nreturn api;",
+          "adaptor": "if (payload.instance == \"upgraded\") { window.setTimeout(function(){ window.location.reload(); }, 2000); return {...payload, status: 1, msg: t('instance_action_instance_save_msg_upgraded')}; } \n return payload.instance === true ? {...payload, status: 0, msg: ''} : {...payload, status: 1, msg: t('instance_action_instance_save_msg_failed')};",
+          "headers": {
+            "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+          },
+          "data": {
+            "&": "$$"
+          }
+        }
+      });
+    }
+  }
   if ((box == 'inbox' || box == 'draft') && !!!window.disableAutoOpenApproveDrawer) {
     // 滚动条滚动到底部弹出底部签批drawer窗口
     initedEvents.push({