@steedos-widgets/amis-lib 6.10.1-beta.38 → 6.10.1-beta.39

package/dist/index.cjs.js

@@ -16946,6 +16946,13 @@ const getNextStepInput = async (instance) => {
                 return api;
               `,
               "adaptor": `
+                if(payload.error){
+                  SteedosUI.notification.error({message: payload.error});
+                  return {
+                    status: 0,
+                    data: {}
+                  }
+                }
                 payload.data = {
                   value: payload.nextSteps.length === 1 ? payload.nextSteps[0]._id : null, 
                   options: _.map(payload.nextSteps, (item)=>{
@@ -17023,53 +17030,95 @@ const getNextStepUsersInput = async (instance) => {
       },
       {
         body: [
-          // TODO 处理下一步处理人默认值
-          Object.assign({}, 
-          {
-            "type": "steedos-select-user"
-          },
           {
+            type: "steedos-select-user",
+            label: "",
             name: "next_users", 
             hiddenOn: "this.new_next_step.deal_type != 'pickupAtRuntime'",
             required: true
-          }),
+          },
           {
-            type: "steedos-select-user",
+            type: "list-select",
             label: "",
             name: "next_users",
             id: "u:next_users",
             required: true,
             hiddenOn: "this.new_next_step.deal_type === 'pickupAtRuntime'",
-            amis: {
-              multiple: "this.new_next_step.deal_type === 'counterSign'",
-              "source": {
-                "url": "${context.rootUrl}/api/workflow/v2/nextStepUsers",
-                "method": "post",
-                "sendOn": "!!this.new_next_step && this.new_next_step.step_type != 'end'",
-                "headers": {
-                  "Authorization": "Bearer ${context.tenantId},${context.authToken}"
-                },
-                "messages": {
-                },
-                "requestAdaptor": "\nconst { context, next_step, $scopeId } = api.data;\nconst formValues = SteedosUI.getRef($scopeId).getComponentById(\"instance_form\").getValues();\n\napi.data = {\n  instanceId: context._id,\n nextStepId: next_step._id,\n  values: formValues\n}\n\n\n return api;",
-                "adaptor": "\npayload.data = {value: payload.nextStepUsers.length === 1 ? payload.nextStepUsers[0].id : null, options: payload.nextStepUsers};\nreturn payload;",
-                "data": {
-                  "&": "$$",
-                  "$scopeId": "$scopeId",
-                  "context": "${context}",
-                  "next_step": "${new_next_step}",
-                }
+            multiple: "this.new_next_step.deal_type === 'counterSign'",
+            "source": {
+              "url": "${context.rootUrl}/api/workflow/v2/nextStepUsers?next_step=${next_step}",
+              "method": "post",
+              "sendOn": "!!this.new_next_step && this.new_next_step.step_type != 'end'",
+              "headers": {
+                "Authorization": "Bearer ${context.tenantId},${context.authToken}"
               },
-              "labelField": "name",
-              "valueField": "id",
-            }
-          }
+              "messages": {
+              },
+              "requestAdaptor": "\nconst { next_step, $scopeId } = api.data;\nconst formValues = context._scoped.getComponentById(\"instance_form\").getValues();\n\napi.data = {\n  instanceId: api.data.context._id,\n nextStepId: next_step._id,\n  values: formValues\n}\n\n\n return api;",
+              "adaptor": `
+                if(payload.error){
+                  SteedosUI.notification.error({message: payload.error});
+                  return {
+                    status: 0,
+                    data: {}
+                  }
+                }
+                payload.data = {
+                  value: payload.nextStepUsers.length === 1 ? payload.nextStepUsers[0].id : null, 
+                  options: payload.nextStepUsers
+                }; 
+                return payload;`,
+              "data": {
+                "&": "$$",
+                "$scopeId": "$scopeId",
+                "context": "${context}",
+                "next_step": "${new_next_step}",
+              }
+            },
+            "labelField": "name",
+            "valueField": "id",
+            value: '${new_next_step.approver_users}',
+            "joinValues": false,
+            "extractValue": true,
+          },
+          // {
+          //   type: "steedos-select-user",
+          //   label: "",
+          //   name: "next_users",
+          //   id: "u:next_users",
+          //   required: true,
+          //   hiddenOn: "this.new_next_step.deal_type === 'pickupAtRuntime'",
+          //   amis: {
+          //     multiple: "this.new_next_step.deal_type === 'counterSign'",
+          //     "source": {
+          //       "url": "${context.rootUrl}/api/workflow/v2/nextStepUsers",
+          //       "method": "post",
+          //       "sendOn": "!!this.new_next_step && this.new_next_step.step_type != 'end'",
+          //       "headers": {
+          //         "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+          //       },
+          //       "messages": {
+          //       },
+          //       "requestAdaptor": "\nconst { next_step, $scopeId } = api.data;\nconst formValues = context._scoped.getComponentById(\"instance_form\").getValues();\n\napi.data = {\n  instanceId: api.data.context._id,\n nextStepId: next_step._id,\n  values: formValues\n}\n\n\n return api;",
+          //       "adaptor": "\npayload.data = {value: payload.nextStepUsers.length === 1 ? payload.nextStepUsers[0].id : null, options: payload.nextStepUsers};\nreturn payload;",
+          //       "data": {
+          //         "&": "$$",
+          //         "$scopeId": "$scopeId",
+          //         "context": "${context}",
+          //         "next_step": "${new_next_step}",
+          //       }
+          //     },
+          //     "labelField": "name",
+          //     "valueField": "id",
+          //     value: '${new_next_step.approver_users}',
+          //   }
+          // }
         ],
         id: "u:81a4913c61cc",
       },
     ],
     id: "u:ffff15b76c89",
-    className: "b-a b-1x p-xs m-b-none m-l-none m-r-none m-t-sm",
+    className: "b-a b-1x p-xs m-b-none m-l-none m-r-none m-t-sm ${record.step.step_type == 'counterSign' ? 'hidden' : ''}",
     subFormMode: "",
     hiddenOn: "!!!this.new_next_step || (this.new_next_step && this.new_next_step.step_type === 'end')"
   };
@@ -17109,14 +17158,13 @@ const getPostSubmitRequestAdaptor = async (instance) => {
                         _id: "${instance.approve._id}",
                         next_steps: [{
                             step: approveValues.next_step,
-                            users: nextUsers,
+                            users: nextUsers || [],
                         }],
                         description: approveValues.suggestion,
                         values: formValues
                     }]
                 }]
             }]};
-            console.log('submit api', api);
             api.data = body;
             return api;
             `;
@@ -17137,7 +17185,7 @@ const getPostEngineRequestAdaptor = async (instance) => {
               _id: "${instance.approve._id}",
               next_steps: [{
                   step: approveValues.next_step,
-                  users: nextUsers,
+                  users: nextUsers || [],
               }],
               description: approveValues.suggestion,
               values: formValues
@@ -17155,7 +17203,6 @@ const getPostEngineRequestAdaptor = async (instance) => {
  * @returns
  */
 const getSubmitActions = async (instance) => {
-  console.log(`getSubmitActions instance====`, instance);
   let api = "";
   let requestAdaptor = "";
   if(instance.approve?.type == "cc"){
@@ -17172,9 +17219,6 @@ const getSubmitActions = async (instance) => {
       return null; //TODO 考虑异常情况?
     }
   }
-  console.log(`getSubmitActions api====`, api);
-  console.log(`getSubmitActions requestAdaptor====`, requestAdaptor);
-  console.log('getObjectListViewPath========>', amisLib.Router.getObjectListViewPath({appId: "${appId}", objectName: "${objectName}", listViewName: "${side_listview_id}"}));
   return [
     // 校验表单
     {
@@ -17182,7 +17226,6 @@ const getSubmitActions = async (instance) => {
       "args": {},
       "actionType": "custom",
       "script": `
-        console.log("======getSubmitActions");
         const form = event.context.scoped.getComponentById("instance_form");
         return form.validate().then((instanceFormValidate)=>{
           event.setData({...event.data, instanceFormValidate})
@@ -17242,7 +17285,6 @@ const getSubmitActions = async (instance) => {
 };
 
 const getApprovalDrawerSchema = async (instance) => {
-  console.log("=============getApprovalDrawerSchema=============", instance);
   return {
     type: "drawer",
     overlay: false,
@@ -17960,12 +18002,15 @@ const getFieldEditTpl = async (field, label)=>{
       //   }
       //   break;
       case "table":
-        tpl.type = "steedos-input-table"; //TODO
+        tpl.type = "steedos-input-table";
         tpl.addable = field.permission === "editable";
         tpl.editable = tpl.addable;
         tpl.copyable = tpl.addable;
         tpl.removable = tpl.addable;
         tpl.fields = [];
+        if(tpl.editable){
+          tpl.className = `${tpl.className || ''} steedos-input-table-editable`;
+        }
         for (const sField of field.fields) {
           if (sField.type != "hidden") {
             sField.permission = field.permission;
@@ -17992,7 +18037,6 @@ const getFieldEditTpl = async (field, label)=>{
 };
 
 const getFieldReadonlyTpl = async (field, label)=>{
-  // console.log(`getFieldReadonlyTpl`, label, field)
   const tpl = {
     label: label === true ? field.name : false,
     name: field.code,
@@ -18059,6 +18103,11 @@ const getFieldReadonlyTpl = async (field, label)=>{
     }
   }else if(field.type === 'html'){
     tpl.type = 'tpl';
+  }else if(field.type.startsWith("sfield-") || field.type === 'steedos-field'){
+    tpl.type = 'steedos-field';
+    tpl.config = field.steedos_field || field.config;
+    tpl.static = true;
+    tpl.inInputTable = true;
   }
   else {
     tpl.type = 'static';
@@ -18073,6 +18122,9 @@ const getFieldReadonlyTpl = async (field, label)=>{
  * @returns 
  */
 const getTdInputTpl = async (field, label) => {
+  if(field.config?.amis?.name){
+    delete field.config.amis.name;
+  }
   const edit = field.permission === "editable";
   if(edit){
     return await getFieldEditTpl(field, label)
@@ -18190,7 +18242,6 @@ const getFormTableView = async (instance) => {
     trs: await getFormTrs(instance),
     id: "u:047f3669468b",
   };
-  console.log('getFormTableView===>', instance, formSchema);
   return formSchema;
 };
 
@@ -18721,7 +18772,6 @@ const isCurrentStepOpinionField = (field, currentStep)=>{
 
 
 const getInstanceInfo = async (props) => {
-  console.log(`getInstanceInfo props`, props);
   const { instanceId, box } = props;
   const userId = amisLib.getSteedosAuth().userId;
   const query = `{
@@ -18805,7 +18855,6 @@ const getInstanceInfo = async (props) => {
   });
 
   const moment = getMoment();
-  console.log('getInstanceInfo====>', step, formVersion.fields);
   return {
     box: box,
     _id: instanceId,