@hzab/flowlong-designer 0.2.2 → 0.2.4

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+# @hzab/flowlong-designer@0.2.4
+
+fix:选人组件优化
+
+# @hzab/flowlong-designer@0.2.3
+
+fix:条件节点去除下拉数据不包含
+
 # @hzab/flowlong-designer@0.2.2
 
 fix:其他条件文案修改

package/package.json

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

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

@@ -42,22 +42,20 @@ const GroupUserSelectorModal = (props) => {
   }, [type]);
 
   const onOk = () => {
-    let onOkValue = {
-      value: null,
-      deptUserLabel: null,
-    };
-    if (type === "dept") {
+    let onOkValue = null;
+    if (type === "dept" && groupUserSelectorRef.current?.selectedList?.length > 0) {
       onOkValue = {
         value: groupUserSelectorRef.current?.selectedList?.map((item) => item?.value)?.join(","),
         deptUserLabel: groupUserSelectorRef.current?.selectedList?.map((item) => item?.label)?.join(","),
       };
     }
-    if (type === "assignee") {
+    if (type === "assignee" && groupUserSelectorRef.current?.selectedList?.length > 0) {
       onOkValue = {
         value: groupUserSelectorRef.current?.selectedList?.map((item) => item?.userId)?.join(","),
         deptUserLabel: groupUserSelectorRef.current?.selectedList?.map((item) => item?.name)?.join(","),
       };
     }
+
     onChange(onOkValue);
     setOpen(false);
   };
@@ -65,7 +63,7 @@ const GroupUserSelectorModal = (props) => {
   const userListConfig = {
     searchQueryKey: "userName",
     labelKey: "name",
-    valueKey: "id",
+    valueKey: "userId",
   };
   /**选择组件回显 */
   const groupUserSelectorValue = useMemo(() => {
@@ -78,16 +76,16 @@ const GroupUserSelectorModal = (props) => {
     if (!value) {
       return [];
     }
-    if (type === "assignee") {
+    if (type === "assignee" && valueArr?.length > 0) {
       return deptUserLabelArr?.map((item, index) => ({
         name: item,
-        id: valueArr?.length && valueArr[index],
+        userId: valueArr?.length > 0 && valueArr[index],
         isUser: true,
       }));
     }
     return deptUserLabelArr?.map((item, index) => ({
       label: item,
-      value: valueArr?.length && valueArr[index],
+      value: valueArr?.length > 0 && valueArr[index],
     }));
   }, [value, type]);
   return (

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

@@ -18,7 +18,7 @@ export const operatorOptions = [
   { label: "小于", value: "<" },
   { label: "小于等于", value: "<=" },
   { label: "包含", value: "include" },
-  { label: "不包含", value: "notinclude" },
+  // { label: "不包含", value: "notinclude" },
 ];
 
 /**描述下拉字段 */
@@ -235,7 +235,7 @@ export const Branch = (props) => {
       { label: "小于", value: "<" },
       { label: "小于等于", value: "<=" },
       { label: "包含", value: "include" },
-      { label: "不包含", value: "notinclude" },
+      // { label: "不包含", value: "notinclude" },
     ];
 
     if (timeType.includes(condition?.field)) {
@@ -254,7 +254,7 @@ export const Branch = (props) => {
       operatorOptions = [
         { label: "等于", value: "==" },
         { label: "包含", value: "include" },
-        { label: "不包含", value: "notinclude" },
+        // { label: "不包含", value: "notinclude" },
       ];
     }
     if (condition?.label === "发起人") {
@@ -502,6 +502,8 @@ export const Branch = (props) => {
                                 }
                                 if (deptUserType?.includes(condition?.field)) {
                                   condition.value = e?.value;
+                                  console.log(e, "eee");
+
                                   condition.deptUserLabel = e?.deptUserLabel;
                                 }
                                 // 更新数据