@coding-flow/flow-pc-approval 0.0.34 → 0.0.37

package/dist/components/flow-approval/components/flow-time-node.d.ts

@@ -6,6 +6,7 @@ export declare const getStatusConfig: (status: "completed" | "current" | "pendin
     icon: import("react/jsx-runtime").JSX.Element;
 };
 export declare const getNodeStatus: (node: ProcessNode) => "completed" | "current" | "pending";
+export declare const getOperatorTitle: (node: ProcessNode) => string | undefined;
 interface FlowTimeNodeProps {
     node: ProcessNode;
 }

package/dist/components/flow-approval/components/flow-time-node.js

@@ -47,6 +47,12 @@ const getNodeStatus = (node)=>{
     if ('PROCESSING' === node.approveState) return 'current';
     return 'pending';
 };
+const getOperatorTitle = (node)=>{
+    const operatorStatregy = node.operatorStrategy;
+    if ('INITIATOR_SELECT' === operatorStatregy) return '发起人选择审批人';
+    if ('APPROVER_SELECT' === operatorStatregy) return '审批人选择审批人';
+    if ('NO_OPERATOR' === operatorStatregy) return node.nodeName;
+};
 const FlowOperatorItem = (props)=>{
     const operator = props.operator;
     const approveState = props.approveState;
@@ -105,7 +111,7 @@ const FlowTimeNode = (props)=>{
     const node = props.node;
     const operators = node.operators || [];
     const operatorStatregy = node.operatorStrategy;
-    if ('INITIATOR_SELECT' === operatorStatregy || 'APPROVER_SELECT' === operatorStatregy) return /*#__PURE__*/ jsxs("div", {
+    if ('INITIATOR_SELECT' === operatorStatregy || 'APPROVER_SELECT' === operatorStatregy || 'NO_OPERATOR' === operatorStatregy) return /*#__PURE__*/ jsxs("div", {
         style: {
             display: 'flex',
             flexDirection: 'column',
@@ -141,7 +147,7 @@ const FlowTimeNode = (props)=>{
                 style: {
                     fontSize: 12
                 },
-                children: 'INITIATOR_SELECT' === operatorStatregy ? '发起人选择审批人' : '审批人选择审批人'
+                children: getOperatorTitle(node)
             })
         ]
     });
@@ -183,4 +189,4 @@ const FlowTimeNode = (props)=>{
         ]
     });
 };
-export { FlowTimeNode, getNodeStatus, getStatusConfig };
+export { FlowTimeNode, getNodeStatus, getOperatorTitle, getStatusConfig };

package/dist/plugins/view/operator-select-view.js

@@ -22,6 +22,10 @@ const OperatorSelectView = (props)=>{
         props.onChange(result);
         setVisible(false);
     };
+    const initialValues = props.options.reduce((acc, option)=>{
+        if (option.operators && option.operators.length > 0) acc[option.id] = option.operators.map((o)=>o.userId).join(',');
+        return acc;
+    }, {});
     return /*#__PURE__*/ jsx(Modal, {
         title: "请选择操作人",
         width: "40%",
@@ -38,9 +42,13 @@ const OperatorSelectView = (props)=>{
             form: form,
             onFinish: handleFinish,
             layout: "vertical",
-            children: props.options.map((option)=>/*#__PURE__*/ jsx(Form.Item, {
+            initialValues: initialValues,
+            children: props.options.map((option)=>{
+                const rangeHint = option.operators && option.operators.length > 0 ? `可选：${option.operators.map((o)=>`${o.name}(${o.userId})`).join('、')}` : void 0;
+                return /*#__PURE__*/ jsx(Form.Item, {
                     name: option.id,
                     label: `${option.name} - 操作人`,
+                    extra: rangeHint,
                     rules: [
                         {
                             required: true,
@@ -50,7 +58,8 @@ const OperatorSelectView = (props)=>{
                     children: /*#__PURE__*/ jsx(Input, {
                         placeholder: "请输入操作人ID，多个用逗号分隔"
                     })
-                }, option.id))
+                }, option.id);
+            })
         })
     });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coding-flow/flow-pc-approval",
-  "version": "0.0.34",
+  "version": "0.0.37",
   "description": "flow-engine pc form approval components",
   "type": "module",
   "keywords": [
@@ -39,15 +39,19 @@
     "dayjs": "^1.11.19",
     "immer": "^11.1.3",
     "react-redux": "^9.2.0",
-    "@coding-flow/flow-core": "0.0.34",
-    "@coding-flow/flow-types": "0.0.34",
-    "@coding-flow/flow-icons": "0.0.34",
-    "@coding-flow/flow-approval-presenter": "0.0.34",
-    "@coding-flow/flow-pc-ui": "0.0.34",
-    "@coding-flow/flow-pc-form": "0.0.34"
+    "@coding-flow/flow-core": "0.0.37",
+    "@coding-flow/flow-icons": "0.0.37",
+    "@coding-flow/flow-approval-presenter": "0.0.37",
+    "@coding-flow/flow-types": "0.0.37",
+    "@coding-flow/flow-pc-ui": "0.0.37",
+    "@coding-flow/flow-pc-form": "0.0.37"
   },
   "devDependencies": {
-    "@coding-flow/flow-types": "0.0.34"
+    "@coding-flow/flow-types": "0.0.37",
+    "@coding-flow/flow-core": "0.0.37",
+    "@coding-flow/flow-approval-presenter": "0.0.37",
+    "@coding-flow/flow-pc-ui": "0.0.37",
+    "@coding-flow/flow-pc-form": "0.0.37"
   },
   "scripts": {
     "build": "rslib build",