@hzab/flowlong-designer 0.2.4 → 0.2.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.
package/CHANGELOG.md
CHANGED
package/package.json
CHANGED
|
@@ -141,9 +141,11 @@ export const Branch = (props) => {
|
|
|
141
141
|
conditionGroup.map((item) => {
|
|
142
142
|
const el = operatorOptions?.find((el) => el?.value === item?.operator);
|
|
143
143
|
if (["dept", "assignee"].includes(item?.field)) {
|
|
144
|
-
return `${item.label}${el?.label}${
|
|
144
|
+
return `${item.label ? item.label : ""}${el?.label ? el?.label : ""}${
|
|
145
|
+
item?.deptUserLabel ? item?.deptUserLabel : ""
|
|
146
|
+
}`;
|
|
145
147
|
}
|
|
146
|
-
return `${item.label}${el?.label}${item.value}`;
|
|
148
|
+
return `${item.label ? item.label : ""}${el?.label ? el?.label : ""}${item.value ? item.value : ""}`;
|
|
147
149
|
}),
|
|
148
150
|
)
|
|
149
151
|
.join(" 和 ");
|
|
@@ -502,8 +504,6 @@ export const Branch = (props) => {
|
|
|
502
504
|
}
|
|
503
505
|
if (deptUserType?.includes(condition?.field)) {
|
|
504
506
|
condition.value = e?.value;
|
|
505
|
-
console.log(e, "eee");
|
|
506
|
-
|
|
507
507
|
condition.deptUserLabel = e?.deptUserLabel;
|
|
508
508
|
}
|
|
509
509
|
// 更新数据
|
package/src/index.less
CHANGED
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
// border: 1px solid #999;
|
|
14
14
|
width: 132px;
|
|
15
15
|
height: 48px;
|
|
16
|
-
background: url("./assets/img/control-bg.png") no-repeat;
|
|
16
|
+
// background: url("./assets/img/control-bg.png") no-repeat;
|
|
17
17
|
background-size: 100% 100%;
|
|
18
18
|
display: flex;
|
|
19
19
|
justify-content: center;
|
package/src/index.tsx
CHANGED
|
@@ -11,6 +11,7 @@ import addImg from "./assets/img/add.png";
|
|
|
11
11
|
import subImg from "./assets/img/sub.png";
|
|
12
12
|
import reloadImg from "./assets/img/reload.png";
|
|
13
13
|
import checkJsonImg from "./assets/img/check-json.png";
|
|
14
|
+
import controlBgImg from "./assets/img/control-bg.png";
|
|
14
15
|
|
|
15
16
|
/**
|
|
16
17
|
* 复制指定字符串
|
|
@@ -121,7 +122,12 @@ function FlowlongDesigner(props, ref) {
|
|
|
121
122
|
},
|
|
122
123
|
}}
|
|
123
124
|
>
|
|
124
|
-
<div
|
|
125
|
+
<div
|
|
126
|
+
className={isShowJson ? "designer-affix-isShowJson" : "designer-affix"}
|
|
127
|
+
style={{
|
|
128
|
+
backgroundImage: `url(${controlBgImg})`,
|
|
129
|
+
}}
|
|
130
|
+
>
|
|
125
131
|
{isShowJson && (
|
|
126
132
|
<Tooltip title={"查看 JSON"}>
|
|
127
133
|
<img className="action-img" src={checkJsonImg} onClick={() => setDrawer(true)} alt="" />
|