@hzab/flowlong-designer 0.2.3 → 0.2.5

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+# @hzab/flowlong-designer@0.2.5
+
+fix:控制面板背景图片显示
+
+# @hzab/flowlong-designer@0.2.4
+
+fix:选人组件优化
+
 # @hzab/flowlong-designer@0.2.3
 
 fix:条件节点去除下拉数据不包含

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/flowlong-designer",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "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

@@ -141,9 +141,11 @@ export const Branch = (props) => {
           conditionGroup.map((item) => {
             const el = operatorOptions?.find((el) => el?.value === item?.operator);
             if (["dept", "assignee"].includes(item?.field)) {
-              return `${item.label}${el?.label}${item?.deptUserLabel}`;
+              return `${item.label ? item.label : ""}${el?.label ? el?.label : ""}${
+                item?.deptUserLabel ? item?.deptUserLabel : ""
+              }`;
             }
-            return `${item.label}${el?.label}${item.value}`;
+            return `${item.label ? item.label : ""}${el?.label ? el?.label : ""}${item.value ? item.value : ""}`;
           }),
         )
         .join(" 和 ");

package/src/index.less

@@ -13,7 +13,7 @@
     // border: 1px solid #999;
     width: 132px;
     height: 48px;
-    background: url("./assets/img/control-bg.png") no-repeat;
+    // background: url("./assets/img/control-bg.png") no-repeat;
     background-size: 100% 100%;
     display: flex;
     justify-content: center;

package/src/index.tsx

@@ -11,6 +11,7 @@ import addImg from "./assets/img/add.png";
 import subImg from "./assets/img/sub.png";
 import reloadImg from "./assets/img/reload.png";
 import checkJsonImg from "./assets/img/check-json.png";
+import controlBgImg from "./assets/img/control-bg.png";
 
 /**
  * 复制指定字符串
@@ -121,7 +122,12 @@ function FlowlongDesigner(props, ref) {
           },
         }}
       >
-        <div className={isShowJson ? "designer-affix-isShowJson" : "designer-affix"}>
+        <div
+          className={isShowJson ? "designer-affix-isShowJson" : "designer-affix"}
+          style={{
+            backgroundImage: `url(${controlBgImg})`,
+          }}
+        >
           {isShowJson && (
             <Tooltip title={"查看 JSON"}>
               <img className="action-img" src={checkJsonImg} onClick={() => setDrawer(true)} alt="" />