npm - @hzab/flowlong-designer - Versions diffs - 0.1.3 → 0.1.5 - Mend

@hzab/flowlong-designer 0.1.3 → 0.1.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/CHANGELOG.md CHANGED Viewed

@@ -1,3 +1,13 @@
+# @hzab/flowlong-designer@0.1.5
+fix:条件节点-部门或用户回显
+# @hzab/flowlong-designer@0.1.4
+fix:条件节点多个条件时删除正常渲染并正常排序
+fix:审批人、抄送人支持正常删除
+fix:领导审批显示多人审批时审批方式显示默认值
 # @hzab/flowlong-designer@0.1.3
 fix:条件节点正常删除

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/flowlong-designer",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "自定义审批流配置组件",
   "main": "src",
   "scripts": {

package/src/components/NodeWrap/Nodes/AddNode/index.tsx CHANGED Viewed

@@ -34,7 +34,7 @@ export const typeDataEnum = {
     termAuto: false, //审批期限超时自动审批
     term: 0, //审批期限
     termMode: 1, //审批期限超时后执行类型
-    examineMode: 1, //多人审批时审批方式
+    examineMode: 2, //多人审批时审批方式
     directorMode: 0, //连续主管审批方式
   },
   [NODE_TYPE.ccNode]: {

package/src/components/NodeWrap/Nodes/Approver/index.less CHANGED Viewed

@@ -9,6 +9,7 @@
     position: relative;
     z-index: 1;
   }
   .node-wrap-box {
     display: inline-flex;
     flex-direction: column;
@@ -21,6 +22,7 @@
     cursor: pointer;
     box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.1);
   }
   .node-wrap-box::before {
     content: "";
     position: absolute;
@@ -32,9 +34,11 @@
     border-width: 8px 6px 4px;
     border-color: rgb(202, 202, 202) transparent transparent;
   }
   .node-wrap-box.start-node:before {
     content: none;
   }
   .node-wrap-box .title {
     height: 24px;
     line-height: 24px;
@@ -46,9 +50,11 @@
     display: flex;
     align-items: center;
   }
   .node-wrap-box .title .icon {
     margin-right: 5px;
   }
   .node-wrap-box .title .node-close-btn {
     font-size: 15px;
     position: absolute;
@@ -57,16 +63,25 @@
     right: 10px;
     display: none;
   }
+  .node-wrap-box:hover {
+    .title .node-close-btn {
+      display: block;
+    }
+  }
   .node-wrap-box .content {
     position: relative;
     padding: 15px;
   }
   .node-wrap-box .content .placeholder {
     color: #999;
   }
 }
 .approver-drawer-footer {
-  .ant-btn + .ant-btn {
+  .ant-btn+.ant-btn {
     margin-left: 12px;
   }
-}
+}

package/src/components/NodeWrap/Nodes/Branch/components/Field/index.tsx CHANGED Viewed

@@ -8,7 +8,6 @@ interface FormMapProps {
 }
 const Field = (props: FormMapProps) => {
   const { type, onChange, value } = props;
   return (
     <>
       {["day", "hour"].includes(type) && (

package/src/components/NodeWrap/Nodes/Branch/components/GroupUserSelectorModal/index.tsx CHANGED Viewed

@@ -1,7 +1,7 @@
 import DataModel from "@hzab/data-model";
 import GroupUserSelector from "@hzab/group-user-selector";
 import { Input, Modal } from "antd";
-import { useMemo, useRef, useState } from "react";
+import { useEffect, useMemo, useRef, useState } from "react";
 import "./index.less";
 const fieldMap = {
   dept: "deptList",
@@ -40,28 +40,61 @@ const GroupUserSelectorModal = (props) => {
       return userModel;
     }
   }, [type]);
   const onOk = () => {
-    onChange(groupUserSelectorRef.current?.selectedList);
+    let onOkValue = {
+      value: null,
+      deptUserLabel: null,
+    };
+    if (type === "dept") {
+      onOkValue = {
+        value: groupUserSelectorRef.current?.selectedList?.map((item) => item?.value)?.join(","),
+        deptUserLabel: groupUserSelectorRef.current?.selectedList?.map((item) => item?.label)?.join(","),
+      };
+    }
+    if (type === "useId") {
+      onOkValue = {
+        value: groupUserSelectorRef.current?.selectedList?.map((item) => item?.userId)?.join(","),
+        deptUserLabel: groupUserSelectorRef.current?.selectedList?.map((item) => item?.name)?.join(","),
+      };
+    }
+    onChange(onOkValue);
     setOpen(false);
   };
-  const inputValue = useMemo(() => {
-    if (type === "dept" && value) {
-      return value?.map((item) => item?.label)?.join(",");
-    }
-    if (type === "useId" && value) {
-      return value?.map((item) => item?.name)?.join(",");
-    }
-  }, [value, type]);
   const userListConfig = {
     searchQueryKey: "userName",
     labelKey: "name",
     valueKey: "id",
   };
+  /**选择组件回显 */
+  const groupUserSelectorValue = useMemo(() => {
+    const deptUserLabelArr = value?.deptUserLabel?.split(",") || [];
+    let valueArr = value?.value?.split(",");
+    if (type === "useId") {
+      valueArr = value?.value?.split(",")?.map((el) => Number(el)) || [];
+    }
+    if (!value) {
+      return [];
+    }
+    if (type === "useId") {
+      return deptUserLabelArr?.map((item, index) => ({
+        name: item,
+        id: valueArr?.length && valueArr[index],
+        isUser: true,
+      }));
+    }
+    return deptUserLabelArr?.map((item, index) => ({
+      label: item,
+      value: valueArr?.length && valueArr[index],
+    }));
+  }, [value, type]);
   return (
     <div>
       <Input
-        value={inputValue}
+        value={value?.deptUserLabel || null}
         readOnly
         onClick={() => {
           setOpen(true);
@@ -84,7 +117,7 @@ const GroupUserSelectorModal = (props) => {
       >
         <div className="groupUserSelectorModal">
           <GroupUserSelector
-            value={value || []}
+            value={groupUserSelectorValue || []}
             ref={groupUserSelectorRef}
             model={model}
             {...(type === "useId" ? userListConfig : {})}

package/src/components/NodeWrap/Nodes/Branch/index.tsx CHANGED Viewed

@@ -27,7 +27,10 @@ const conditionOption = [
   { label: "部门", value: "dept" },
   { label: "用户id", value: "useId" },
 ];
+/** 时间类型 */
+const timeType = ["day", "hour"];
+/** 部门或用户 */
+const deptUserType = ["dept", "useId"];
 export const Branch = (props) => {
   const { modelValue: nodeConfig, onChange, ItemSlot } = props;
   const [form, setForm] = useState({
@@ -91,6 +94,9 @@ export const Branch = (props) => {
   function onTermDel(idx) {
     nodeConfig.conditionNodes?.splice(idx, 1);
+    nodeConfig.conditionNodes?.forEach((item, index) => {
+      item.priorityLevel = index + 1;
+    });
     if (nodeConfig.conditionNodes?.length == 1) {
       if (nodeConfig.childNode) {
         if (nodeConfig.conditionNodes[0].childNode) {
@@ -100,6 +106,8 @@ export const Branch = (props) => {
         }
       }
       onChange && onChange(nodeConfig.conditionNodes[0].childNode);
+    } else {
+      onChange({ ...nodeConfig });
     }
   }
   function toText(nodeConfig, idx) {
@@ -108,11 +116,8 @@ export const Branch = (props) => {
       const text = conditionList
         .map((conditionGroup) =>
           conditionGroup.map((item) => {
-            if (item?.field === "dept") {
-              return `${item.label}${item.operator}${item.values?.map((el) => el?.label)}`;
-            }
-            if (item?.field === "useId") {
-              return `${item.label}${item.operator}${item.values?.map((el) => el?.userName)}`;
+            if (["dept", "useId"].includes(item?.field)) {
+              return `${item.label}${item.operator}${item?.deptUserLabel}`;
             }
             return `${item.label}${item.operator}${item.value}`;
           }),
@@ -345,6 +350,17 @@ export const Branch = (props) => {
                     <div>值</div>
                   </div>
                   {conditionGroup?.map((condition, idx) => {
+                    /**值 */
+                    let fieldValue = null;
+                    if (timeType.includes(condition?.field)) {
+                      fieldValue = condition?.value;
+                    }
+                    if (deptUserType.includes(condition?.field)) {
+                      fieldValue = {
+                        value: condition?.value,
+                        deptUserLabel: condition?.deptUserLabel,
+                      };
+                    }
                     return (
                       <div className="condition-content" key={idx}>
                         <div className="condition-relation">
@@ -371,6 +387,9 @@ export const Branch = (props) => {
                               onChange={(e) => {
                                 condition.field = e;
                                 condition.value = null;
+                                if (deptUserType.includes(condition?.field)) {
+                                  condition.deptUserLabel = null;
+                                }
                                 // 更新数据
                                 setForm((f) => ({ ...f }));
                               }}
@@ -389,11 +408,16 @@ export const Branch = (props) => {
                               className="condition-content-box-item"
                             ></Select>
                             <Field
-                              value={condition?.values || []}
+                              value={fieldValue}
                               type={condition.field}
                               onChange={(e) => {
-                                condition.value = e?.map((item) => item?.value)?.join(",");
-                                condition.values = e;
+                                if (timeType.includes(condition?.field)) {
+                                  condition.value = e;
+                                }
+                                if (deptUserType?.includes(condition?.field)) {
+                                  condition.value = e?.value;
+                                  condition.deptUserLabel = e?.deptUserLabel;
+                                }
                                 // 更新数据
                                 setForm((f) => ({ ...f }));
                               }}