aldehyde 0.2.484 → 0.2.486

package/src/aldehyde/draw-canvas-edit/components/setting-form/index.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useEffect, useMemo, useState, useRef } from 'react';
 import { Form as AntdForm, Collapse, Row, Col } from "antd";
 import _ from "lodash";
 import FormItemGroup from "../../../form/form-Item-group";
@@ -124,6 +124,7 @@ const Index = (props: Props) => {
     const [form] = AntdForm.useForm();
     const [formConfigs, setFormConfigs] = useState<{ [key: string]: any }>([]);
     const { translate } = useLocale();
+    const isValChangeRef = useRef<boolean>(false);
 
     // 自定义表单项
     const customFormItem = (items: { [key: string]: any }[], layout?: "vertical" | "horizontal") => {
@@ -234,6 +235,7 @@ const Index = (props: Props) => {
 
     // 更新数据
     const onValuesChange = (val: { [key: string]: any }) => {
+        isValChangeRef.current = true;
         const temVal = val;
         Object.keys(val).forEach((key) => {  // 使用公共表单组件，转换指定类型值
             const extControlType = formConfigs.find((item: any) => item.id === key)?.extControlType;
@@ -261,7 +263,6 @@ const Index = (props: Props) => {
             background = null;
             backgroundImg = null;
         }
-        form.setFieldsValue({ background, backgroundImg, ...temVal });
         // 默认画布配置
         onPageSettingsChange({ ...pageSettings, background, backgroundImg, ...temVal });
     }
@@ -284,9 +285,10 @@ const Index = (props: Props) => {
 
     // 表单数据实时回显更新
     useEffect(() => {
-        if (formConfigs?.length && formData) {
+        if (formConfigs?.length && formData && !isValChangeRef.current) {
             formSetFieldsValue();
         }
+        isValChangeRef.current = false;
     }, [formData, formConfigs]);
 
     return <AntdForm

package/src/aldehyde/draw-canvas-edit/index.tsx

@@ -81,7 +81,7 @@ const Index = (props: Props) => {
         render.on('selection-change', (nodes: Konva.Node[]) => { // 监听选中组件
             assetCurrentRef.current = nodes.length === 1 ? nodes[0] : undefined;
             setAssetCurrent(assetCurrentRef.current);
-            setAssetSettings(nodes.length === 1 ? render.getAssetSettings(nodes[0]) : undefined);
+            setAssetSettings(assetCurrentRef.current ? render.getAssetSettings(assetCurrentRef.current) : undefined);
         });
         render.on('link-selection-change', (link?: Konva.Line) => { // 监听选中连线
             setLinkCurrent(link);
@@ -101,6 +101,13 @@ const Index = (props: Props) => {
                 setAssetSettings(s => s ? { ...s, rotation: +rotation.toFixed(1) } : undefined);
             }
         });
+        render.on('asset-size-change', (nodes: Konva.Node[]) => { // 监听组件宽高变化
+            const node = nodes.find(n => n.id() === assetCurrentRef.current?.id());
+            if (node) {
+                const settings = render.getAssetSettings(node);
+                setAssetSettings(s => s ? { ...s, width: settings.width, height: settings.height } : undefined);
+            }
+        });
         render.on('texting-change', setTexting); // 监听插入文本状态
         render.on('graph-type-change', setGraphType); // 监听插入基础图形类型
     }, []);
@@ -135,8 +142,10 @@ const Index = (props: Props) => {
         if (!(assetCurrent && renderRef.current)) {
             return;
         }
-        setAssetSettings({ ...assetSettings, ...val });
-        renderRef.current.setAssetSettings(assetCurrent, { ...assetSettings, ...val }, true);
+        setAssetSettings(oldVal => {
+            renderRef.current.setAssetSettings(assetCurrent, { ...oldVal, ...val }, true);
+            return { ...oldVal, ...val };
+        });
     }
 
     // 更新连线配置

package/src/aldehyde/table/act-table.tsx

@@ -160,6 +160,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
   static contextType = LocaleContext;
   context: React.ContextType<typeof LocaleContext>;
   formRef = React.createRef<FormInstance>(); // 可编辑表格的form Ref
+  isJumpRef = React.createRef<boolean>(); // 是否是action跳转
 
   static defaultProps = {
     criteriaData: {},
@@ -608,6 +609,12 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
   }
 
   isSameSourceQuery = (sourceId, criteriaData) => {
+    // action跳转，路由变化时，变化后路由不存在sourceId||menuId，则不触发查询
+    if (this.isJumpRef.current && !criteriaData['sourceId'] && !criteriaData['menuId']) {
+      this.isJumpRef.current = false;
+      return false;
+    }
+
     if (sourceId && criteriaData && (criteriaData['sourceId'] && criteriaData['sourceId'] != sourceId)
       || (criteriaData['menuId'] && criteriaData['menuId'] != sourceId)) {
       return false;
@@ -818,6 +825,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       url = url + searchs.join("&");
     }
     if (jump.linkTarget == '_self') {
+      this.isJumpRef.current = true;
       window.location.hash = url.substring(url.indexOf("#") + 1);
     } else {
       debugger