@hzab/flowlong-designer 0.2.4 → 1.0.0

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+# @hzab/flowlong-designer@1.0.0
+
+fix:审核人默认值为或签
+fix:人员添加头像
+
+# @hzab/flowlong-designer@0.2.5
+
+fix:控制面板背景图片显示
+
 # @hzab/flowlong-designer@0.2.4
 
 fix:选人组件优化

package/package.json

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

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

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

package/src/components/NodeWrap/Nodes/Approver/options.ts

@@ -40,6 +40,6 @@ export const termModeOptions = [
  */
 export const examineModeOptions = [
   // { label: "按顺序依次审批", value: 1 },
-  { label: "会签 (可同时审批，每个人必须审批通过)", value: 2 },
   { label: "或签 (有一人审批通过即可)", value: 3 },
+  { label: "会签 (可同时审批，每个人必须审批通过)", value: 2 },
 ];

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

@@ -64,6 +64,7 @@ const GroupUserSelectorModal = (props) => {
     searchQueryKey: "userName",
     labelKey: "name",
     valueKey: "userId",
+    imgKey: "avatar",
   };
   /**选择组件回显 */
   const groupUserSelectorValue = useMemo(() => {

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(" 和 ");
@@ -502,8 +504,6 @@ export const Branch = (props) => {
                                 }
                                 if (deptUserType?.includes(condition?.field)) {
                                   condition.value = e?.value;
-                                  console.log(e, "eee");
-
                                   condition.deptUserLabel = e?.deptUserLabel;
                                 }
                                 // 更新数据

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="" />