@hzab/flowlong-designer 1.0.7-beta2 → 1.0.7

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @hzab/flowlong-designer@1.0.7
 
-feat:审核人、抄送人添加直接主管配置
+feat:审核人、抄送人添加直接主管配置；二次确认配置是否展示
 
 # @hzab/flowlong-designer@1.0.6
 

package/package.json

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

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

@@ -11,7 +11,7 @@ import "./index.less";
 import SignatureConfiguration from "../../components/SignatureConfiguration";
 
 export const Approver = (props) => {
-  const { modelValue = {}, onChange, disable, readOnly } = props;
+  const { modelValue = {}, onChange, disable, readOnly, showSignature } = props;
   const [form, setForm] = useState({
     nodeName: "",
     setType: undefined,
@@ -37,7 +37,7 @@ export const Approver = (props) => {
 
   const selectorCtx = useContext(SelectContext);
 
-  const formRef = useRef();
+  const formRef = useRef<any>();
   const nodeTitleRef = useRef();
   const signatureConfigurationRef = useRef<any>();
 
@@ -329,7 +329,15 @@ export const Approver = (props) => {
                         className={`${readOnly ? "readonly-select" : ""}`}
                         onChange={(e) =>
                           setForm((f) => {
-                            f.extendConfig = { ...f.extendConfig, isChecked: e.target.checked };
+                            f.extendConfig = {
+                              ...f.extendConfig,
+                              isChecked: e.target.checked,
+                              directorUsers: [],
+                              approvalEnd: undefined,
+                            };
+                            if (formRef?.current) {
+                              formRef?.current?.setFieldsValue({ extendConfig: f.extendConfig });
+                            }
                             return { ...f };
                           })
                         }
@@ -341,7 +349,7 @@ export const Approver = (props) => {
                   name={["extendConfig", "approvalEnd"]}
                 >
                   <Select
-                    disabled={readOnly}
+                    disabled={readOnly || !form.extendConfig?.isChecked}
                     className={`${readOnly ? "readonly-select" : ""}`}
                     onSelect={(val) => {
                       setForm((f) => {
@@ -581,11 +589,13 @@ export const Approver = (props) => {
               </Form.Item>
             ) : null}
           </Form>
-          <SignatureConfiguration
-            ref={signatureConfigurationRef}
-            formData={form}
-            type="approver"
-          ></SignatureConfiguration>
+          {showSignature && (
+            <SignatureConfiguration
+              ref={signatureConfigurationRef}
+              formData={form}
+              type="approver"
+            ></SignatureConfiguration>
+          )}
         </Drawer>
       </div>
     </div>

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

@@ -10,7 +10,7 @@ import SignatureConfiguration from "../../components/SignatureConfiguration";
 
 export const Promoter = (props) => {
   const selectorCtx = useContext(SelectContext);
-  const { modelValue: nodeConfig = {}, onChange, disable, readOnly } = props;
+  const { modelValue: nodeConfig = {}, onChange, disable, readOnly, showSignature } = props;
 
   const [drawer, setDrawer] = useState(false);
   const [isEditTitle, setIsEditTitle] = useState(false);
@@ -194,7 +194,9 @@ export const Promoter = (props) => {
           {!form.nodeAssigneeList || form.nodeAssigneeList?.length <= 0 ? (
             <Alert message="不指定则默认所有人都可发起此审批" type="info" />
           ) : null}
-          <SignatureConfiguration ref={signatureConfigurationRef} formData={form}></SignatureConfiguration>
+          {showSignature && (
+            <SignatureConfiguration ref={signatureConfigurationRef} formData={form}></SignatureConfiguration>
+          )}
         </Drawer>
       </div>
     </div>

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

@@ -36,7 +36,7 @@ export const Approver = (props) => {
 
   const selectorCtx = useContext(SelectContext);
 
-  const formRef = useRef();
+  const formRef = useRef<any>();
   const nodeTitleRef = useRef();
 
   function onShow() {
@@ -320,7 +320,15 @@ export const Approver = (props) => {
                         disabled={readOnly}
                         onChange={(e) =>
                           setForm((f) => {
-                            f.extendConfig = { ...f.extendConfig, isChecked: e.target.checked };
+                            f.extendConfig = {
+                              ...f.extendConfig,
+                              isChecked: e.target.checked,
+                              directorUsers: [],
+                              approvalEnd: undefined,
+                            };
+                            if (formRef?.current) {
+                              formRef?.current?.setFieldsValue({ extendConfig: f.extendConfig });
+                            }
                             return { ...f };
                           })
                         }

package/src/index.tsx

@@ -49,7 +49,17 @@ function copy(str) {
 }
 
 function FlowlongDesigner(props, ref) {
-  const { value, flowName, roleListConfig, listConfig, initiatorListConfig, isShowJson, disable, readOnly } = props;
+  const {
+    value,
+    flowName,
+    roleListConfig,
+    listConfig,
+    initiatorListConfig,
+    isShowJson,
+    disable,
+    readOnly,
+    showSignature,
+  } = props;
   const [drawer, setDrawer] = useState(false);
   const [zoom, setZoom] = useState(1);
   const [data, setData] = useState(Object.keys(value || {}).length > 0 ? value : getInitNodeData({ name: flowName }));
@@ -131,6 +141,7 @@ function FlowlongDesigner(props, ref) {
                 modelValue={data.nodeConfig}
                 disable={disable}
                 readOnly={readOnly}
+                showSignature={showSignature}
                 onChange={(val) => {
                   setData((d) => {
                     d.nodeConfig = val;