@steedos-widgets/amis-lib 6.10.31 → 6.10.33

package/dist/index.esm.js

@@ -10530,7 +10530,7 @@ function formatUISchemaCache(objectName, uiSchema){
     });
 }
 
-async function getUISchema(objectName, force, retry = true) {
+async function getUISchema(objectName, force = false, retry = true) {
     if (!objectName) {
         return;
     }
@@ -17743,7 +17743,7 @@ const getApprovalDrawerSchema = async (instance, events) => {
       },
     ]
   };
-  console.log(`getApprovalDrawerSchema: `, schema);
+  // console.log(`getApprovalDrawerSchema: `, schema)
   return schema;
 };
 
@@ -17980,14 +17980,122 @@ const getInstanceApprovalHistory = async ()=>{
       }
 };
 
-/*
- * @Author: baozhoutao@steedos.com
- * @Date: 2022-09-07 16:20:45
- * @LastEditors: yinlianghui yinlianghui@hotoa.com
- * @LastEditTime: 2025-12-09 16:06:24
- * @Description:
- */
-
+const getStepsSchema = (instance) => {
+    if(instance.box === 'draft' && instance.state === 'draft' && instance.flow.allow_select_step){
+        const schema = {
+            "type": "service",
+            "id": "u:set_steps_users",
+            "api": {
+                "url": "/api/workflow/v2/nextSteps",
+                "method": "post",
+                "requestAdaptor": `
+                    const ctx = api.data.context;
+                    const formValues = context._scoped.getComponentById("instance_form").getValues();
+                    api.data = {
+                    flowVersionId: ctx.flowVersion._id,
+                    instanceId: ctx._id,
+                    flowId: ctx.flow._id,
+                    step: ctx.step,
+                    values: formValues
+                    };
+                    return api;
+                `,
+                "adaptor": `
+                    payload.stepIds = _.map(payload.nextSteps, '_id');
+                    return payload;
+                `
+            }
+            ,
+            "body": [
+                {
+                    "type": "table2",
+                    "source": "$nextSteps",
+                    "className": "set-next-steps-users my-4",
+                    "label": false,
+                    "needConfirm": false,
+                    "bordered": true,
+                    "title": "审批步骤",
+                    "quickSaveItemApi": {
+                        "url": "/api/workflow/v2/set_instance_steps",
+                        "method": "post",
+                        "requestAdaptor": `
+                            if(event && false){
+                                api.data = {
+                                    instanceId: 'none'
+                                }
+                            }else{
+                                const ctx = api.data.context;
+                                api.data = {
+                                    instanceId: ctx._id,
+                                    stepId: context._id,
+                                    selected: context.selected,
+                                    handler: context.stepHandler
+                                };
+                            }
+                            
+                            return api;
+                        `,
+                        "adaptor": `
+                            payload.stepIds = _.map(payload.nextSteps, '_id');
+                            return payload;
+                        `
+                    },
+                    // "rowSelection": {
+                    //     "type": "checkbox",
+                    //     "keyField": "id",
+                    //     "checked": true,
+                    //     "selected": true,
+                    //     // "disableOn": "${allow_skip != true}",
+                    //     "selectedRowKeysExpr": "${ARRAYINCLUDES(stepIds, id)}"
+                    // },
+                    "columns": [
+                        {
+                            "label": "选择",
+                            "name": "selected",
+                            "width": 50,
+                            "quickEdit": {
+                                "type": "checkbox",
+                                "mode": "inline",
+                                "id": "selected",
+                                "name": "selected",
+                                "saveImmediately": true,
+                                "value": true,
+                                "disabledOn": "${allow_skip != true}",
+                            }
+                        },
+                        {
+                            "label": "步骤名称",
+                            "name": "name",
+                            "quickEdit": false
+                        },
+                        {
+                            "label": "处理人",
+                            "name": "stepHandler",
+                            "quickEdit": {
+                                "type": "steedos-instance-handler",
+                                "mode": "inline",
+                                "id": "stepHandler",
+                                "name": "stepHandler",
+                                "saveImmediately": true
+                            }
+                        },
+                        // {
+                        //     "label": "操作",
+                        //     "name": "actions"
+                        // }
+                    ]
+                }
+            ]
+        };
+        return schema;
+    }else {
+        return {
+            type: 'tpl',
+            id: "u:set_steps_users",
+            tpl: ''
+        }
+    }
+};
 
 const getSelectOptions = (field) => {
   const options = [];
@@ -18933,7 +19041,7 @@ const getApproveButton = async (instance, events)=>{
               var instancePageContent = document.querySelector(".steedos-amis-instance-view .antd-Page-content");
               var approvalDrawerContent = document.querySelector(".approval-drawer .antd-Drawer-content");
               if (instancePageContent && approvalDrawerContent) {
-                $(instancePageContent).css("paddingBottom", `${approvalDrawerContent.clientHeight + 10}px`);
+                $(instancePageContent).css("paddingBottom", `${approvalDrawerContent.clientHeight + 2}px`);
               }
             }
           }
@@ -19074,8 +19182,12 @@ const getFlowFormSchema = async (instance, box) => {
         "font-size": "14px",
         "font-weight": "500"
       },
-      ".steedos-amis-instance-view.steedos-instance-style-table .antd-Page-body": {
-        "width": "1024px"
+      ".steedos-amis-instance-view.steedos-instance-style-table .antd-Page-body .steedos-amis-instance-view-content": {
+        "max-width": "1024px"
+      },
+      ".steedos-amis-instance-view .approval-drawer.antd-Drawer .antd-Drawer-content": {
+        "box-shadow": "none",
+        "border-top": "1px solid rgb(209 213 219)"
       },
       ".antd-List-placeholder": {
         "display": "none"
@@ -19094,66 +19206,77 @@ const getFlowFormSchema = async (instance, box) => {
         "background": "transparent !important"
       }
     },
-    body: [
-      await getAttachments(instance),
-      await getRelatedInstances(),
-      await getRelatedRecords(instance),
-      {
-        type: "form",
-        debug: false,
-        wrapWithPanel: false,
-        resetAfterSubmit: true,
-        body: [
-          {
-            type: "tpl",
-            id: "u:f5bb0ad602a6",
-            tpl: `<div class="instance-name">${instance.title}</div>`,
-            inline: true,
-            wrapperComponent: "",
-            style: {
-              fontFamily: "",
-              fontSize: 12,
-              textAlign: "center",
-            },
-          },
-          formContentSchema,
-          await getApplicantTableView(instance),
-        ],
-        id: "instance_form",
-        onEvent: {
-          // validateError: {
-          //   weight: 0,
-          //   actions: [
-          //     {
-          //       "componentId": "",
-          //       "args": {
-          //         "msgType": "info",
-          //         "position": "top-right",
-          //         "closeButton": true,
-          //         "showIcon": true,
-          //         "title": i18next.t('frontend_workflow_submit_validate_error_title'),//"提交失败",
-          //         "msg": i18next.t('frontend_workflow_submit_validate_error_msg'),//"请填写必填字段"
-          //       },
-          //       "actionType": "toast"
-          //     }
-          //   ],
-          // },
-          change: {
-            weight: 0,
-            actions: [
-              {
-                "actionType": "reload",
-                "componentId": "u:next_step",
-                "args": {}
+    body: [{
+      "type": "wrapper",
+      "body": [
+        await getAttachments(instance),
+        await getRelatedInstances(),
+        await getRelatedRecords(instance),
+        {
+          type: "form",
+          debug: false,
+          wrapWithPanel: false,
+          resetAfterSubmit: true,
+          body: [
+            {
+              type: "tpl",
+              id: "u:f5bb0ad602a6",
+              tpl: `<div class="instance-name">${instance.title}</div>`,
+              inline: true,
+              wrapperComponent: "",
+              style: {
+                fontFamily: "",
+                fontSize: 12,
+                textAlign: "center",
               },
-              ...changeEvents
-            ]
+            },
+            formContentSchema,
+            await getApplicantTableView(instance),
+          ],
+          id: "instance_form",
+          onEvent: {
+            // validateError: {
+            //   weight: 0,
+            //   actions: [
+            //     {
+            //       "componentId": "",
+            //       "args": {
+            //         "msgType": "info",
+            //         "position": "top-right",
+            //         "closeButton": true,
+            //         "showIcon": true,
+            //         "title": i18next.t('frontend_workflow_submit_validate_error_title'),//"提交失败",
+            //         "msg": i18next.t('frontend_workflow_submit_validate_error_msg'),//"请填写必填字段"
+            //       },
+            //       "actionType": "toast"
+            //     }
+            //   ],
+            // },
+            change: {
+              weight: 0,
+              actions: [
+                {
+                  "actionType": "reload",
+                  "componentId": "u:next_step",
+                  "args": {}
+                },
+                {
+                  "actionType": "reload",
+                  "componentId": "u:set_steps_users",
+                  "args": {}
+                },
+                ...changeEvents
+              ]
+            }
           }
-        }
-      },
-      await getInstanceApprovalHistory(),
-      await getApproveButton(instance, { submitEvents , nextStepInitedEvents, nextStepChangeEvents, nextStepUserChangeEvents})
-    ],
+        },
+        await getStepsSchema(instance),
+        await getInstanceApprovalHistory(),
+        await getApproveButton(instance, { submitEvents , nextStepInitedEvents, nextStepChangeEvents, nextStepUserChangeEvents})
+      ],
+      "size": "none",
+      "className": "steedos-amis-instance-view-content"
+    }],
     id: "u:instancePage",
     messages: {},
     pullRefresh: {},
@@ -19416,7 +19539,8 @@ const getInstanceInfo = async (props) => {
         flow:flow__expand{
           _id,
           name,
-          perms
+          perms,
+          allow_select_step
         }
       }
     }