@steedos-widgets/amis-lib 6.10.32 → 6.10.34-beta.1

package/dist/index.cjs.js

@@ -10557,7 +10557,7 @@ function formatUISchemaCache(objectName, uiSchema){
     });
 }
 
-async function getUISchema(objectName, force, retry = true) {
+async function getUISchema(objectName, force = false, retry = true) {
     if (!objectName) {
         return;
     }
@@ -14583,8 +14583,8 @@ function uuidv4() {
 /*
  * @Author: 殷亮辉 yinlianghui@hotoa.com
  * @Date: 2023-11-15 09:50:22
- * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2025-12-04 22:52:15
+ * @LastEditors: yinlianghui yinlianghui@hotoa.com
+ * @LastEditTime: 2025-12-10 17:04:58
  */
 
 /**
@@ -15313,8 +15313,8 @@ async function getForm(props, mode = "edit", formId) {
             var currentFormValues = JSON.parse(JSON.stringify(event.data));
             var parent = event.data.__super.__super.parent;
             var __parentIndex = event.data.__super.__super.__parentIndex;
-            let uuidv4 = new Function("return (" + ${uuidv4.toString()} + ")()");
-            var primaryKey = "${primaryKey}";
+            // let uuidv4 = new Function("return (" + ${uuidv4.toString()} + ")()");
+            // var primaryKey = "${primaryKey}";
             if(parent){
                 fieldValue[__parentIndex].children[currentIndex] = currentFormValues;
                 // 重写父节点，并且改变其某个属性以让子节点修改的内容回显到界面上
@@ -15562,8 +15562,11 @@ async function getButtonActions(props, mode) {
             }
             if(newItem[primaryKey]){
                 // 如果newItem已经有主键字段值，则重新生成新的主键值，否则会重复。
-                let uuidv4 = new Function("return (" + ${uuidv4.toString()} + ")()");
-                newItem[primaryKey] = uuidv4();
+                // let uuidv4 = new Function("return (" + ${uuidv4.toString()} + ")()");
+                // newItem[primaryKey] = uuidv4();
+                // 删除primaryKey会自动加primaryKey，这里不删除primaryKey审批王会有bug,像上面重新给新的uuid值也一样，见：[子表-通过复制出来的记录，再点击编辑，没有值](https://github.com/steedos/steedos-plugins/issues/83)
+                // 只能删除primaryKey键值，改后不影响autoGeneratePrimaryKeyValue功能最终效果
+                delete newItem[primaryKey];
             }
             if(parent){
                 fieldValue[__parentIndex].children.push(newItem);
@@ -17770,7 +17773,7 @@ const getApprovalDrawerSchema = async (instance, events) => {
       },
     ]
   };
-  console.log(`getApprovalDrawerSchema: `, schema);
+  // console.log(`getApprovalDrawerSchema: `, schema)
   return schema;
 };
 
@@ -18007,14 +18010,122 @@ const getInstanceApprovalHistory = async ()=>{
       }
 };
 
-/*
- * @Author: baozhoutao@steedos.com
- * @Date: 2022-09-07 16:20:45
- * @LastEditors: yinlianghui yinlianghui@hotoa.com
- * @LastEditTime: 2025-12-09 17:13:13
- * @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 = [];
@@ -19179,11 +19290,17 @@ const getFlowFormSchema = async (instance, box) => {
                   "componentId": "u:next_step",
                   "args": {}
                 },
+                {
+                  "actionType": "reload",
+                  "componentId": "u:set_steps_users",
+                  "args": {}
+                },
                 ...changeEvents
               ]
             }
           }
         },
+        await getStepsSchema(instance),
         await getInstanceApprovalHistory(),
         await getApproveButton(instance, { submitEvents , nextStepInitedEvents, nextStepChangeEvents, nextStepUserChangeEvents})
       ],
@@ -19452,7 +19569,8 @@ const getInstanceInfo = async (props) => {
         flow:flow__expand{
           _id,
           name,
-          perms
+          perms,
+          allow_select_step
         }
       }
     }