aldehyde 0.2.486 → 0.2.487

package/src/aldehyde/draw-canvas-edit/components/render/draws/ref-line-draw.ts

@@ -1,70 +1,70 @@
-import Konva from 'konva';
-import { BaseDraw, Draw, Handler, Render } from '../types';
-
-// 参考线
-
-export interface RefLineDrawOption {
-  padding: number
-}
-
-export class RefLineDraw extends BaseDraw implements Draw, Handler {
-  option: RefLineDrawOption;
-
-  constructor(render: Render, layer: Konva.Layer, option: RefLineDrawOption) {
-    super(render, layer);
-    this.option = option;
-    this.group.listening(false);
-  }
-
-  override draw() {
-    this.clear();
-    const stageState = this.render.getStageState();
-    const group = new Konva.Group();
-    const pos = this.render.stage.getPointerPosition();
-    if (pos) {
-      if (pos.y >= this.option.padding) {
-        // 横
-        group.add(
-          new Konva.Line({
-            name: this.constructor.name,
-            points: [
-              [this.render.toStageValue(-stageState.x), this.render.toStageValue(pos.y - stageState.y)],
-              [this.render.toStageValue(stageState.width - stageState.x + this.render.rulerSize), this.render.toStageValue(pos.y - stageState.y)]
-            ].flat(),
-            stroke: 'rgba(255,0,0,0.2)',
-            strokeWidth: this.render.toStageValue(1),
-            listening: false
-          })
-        );
-      }
-      if (pos.x >= this.option.padding) {
-        // 竖
-        group.add(
-          new Konva.Line({
-            name: this.constructor.name,
-            points: [
-              [this.render.toStageValue(pos.x - stageState.x), this.render.toStageValue(-stageState.y)],
-              [this.render.toStageValue(pos.x - stageState.x), this.render.toStageValue(stageState.height - stageState.y + this.render.rulerSize)]
-            ].flat(),
-            stroke: 'rgba(255,0,0,0.2)',
-            strokeWidth: this.render.toStageValue(1),
-            listening: false
-          })
-        );
-      }
-    }
-    this.group.add(group);
-  }
-  handlers = {
-    dom: {
-      mousemove: () => {
-        // 更新参考线
-        this.draw();
-      },
-      mouseout: () => {
-        // 清除参考线
-        this.clear();
-      }
-    }
-  }
-}
+import Konva from 'konva';
+import { BaseDraw, Draw, Handler, Render } from '../types';
+
+// 参考线
+
+export interface RefLineDrawOption {
+  padding: number
+}
+
+export class RefLineDraw extends BaseDraw implements Draw, Handler {
+  option: RefLineDrawOption;
+
+  constructor(render: Render, layer: Konva.Layer, option: RefLineDrawOption) {
+    super(render, layer);
+    this.option = option;
+    this.group.listening(false);
+  }
+
+  override draw() {
+    this.clear();
+    const stageState = this.render.getStageState();
+    const group = new Konva.Group();
+    const pos = this.render.stage.getPointerPosition();
+    if (pos) {
+      if (pos.y >= this.option.padding) {
+        // 横
+        group.add(
+          new Konva.Line({
+            name: this.constructor.name,
+            points: [
+              [this.render.toStageValue(-stageState.x), this.render.toStageValue(pos.y - stageState.y)],
+              [this.render.toStageValue(stageState.width - stageState.x + this.render.rulerSize), this.render.toStageValue(pos.y - stageState.y)]
+            ].flat(),
+            stroke: 'rgba(255,0,0,0.2)',
+            strokeWidth: this.render.toStageValue(1),
+            listening: false
+          })
+        );
+      }
+      if (pos.x >= this.option.padding) {
+        // 竖
+        group.add(
+          new Konva.Line({
+            name: this.constructor.name,
+            points: [
+              [this.render.toStageValue(pos.x - stageState.x), this.render.toStageValue(-stageState.y)],
+              [this.render.toStageValue(pos.x - stageState.x), this.render.toStageValue(stageState.height - stageState.y + this.render.rulerSize)]
+            ].flat(),
+            stroke: 'rgba(255,0,0,0.2)',
+            strokeWidth: this.render.toStageValue(1),
+            listening: false
+          })
+        );
+      }
+    }
+    this.group.add(group);
+  }
+  handlers = {
+    dom: {
+      mousemove: () => {
+        // 更新参考线
+        this.draw();
+      },
+      mouseout: () => {
+        // 清除参考线
+        this.clear();
+      }
+    }
+  }
+}

package/src/aldehyde/draw-canvas-edit/components/render/draws/ruler-draw.ts

@@ -1,165 +1,165 @@
-import Konva from 'konva';
-import { BaseDraw, Render, Draw } from '../types';
-
-// 画布比例尺
-
-export interface RulerDrawOption {
-  size: number
-}
-
-export class RulerDraw extends BaseDraw implements Draw {
-  option: RulerDrawOption;
-
-  constructor(render: Render, layer: Konva.Layer, option: RulerDrawOption) {
-    super(render, layer);
-    this.option = option;
-    this.group.listening(false);
-  }
-
-  override draw() {
-    this.clear();
-    const stageState = this.render.getStageState();
-    // 格子大小
-    const cellSize = 20;
-    const fontSizeMax = 12;
-    const lenX = Math.ceil(this.render.toStageValue(stageState.width) / cellSize); // 列数
-    const lenY = Math.ceil(this.render.toStageValue(stageState.height) / cellSize); // 行数
-    const startX = -Math.ceil(this.render.toStageValue(stageState.x - this.option.size) / cellSize);
-    const startY = -Math.ceil(this.render.toStageValue(stageState.y - this.option.size) / cellSize);
-    const group = new Konva.Group();
-    // 比例尺 - 上
-    const groupTop = new Konva.Group({
-      x: this.render.toStageValue(-stageState.x + this.option.size),
-      y: this.render.toStageValue(-stageState.y),
-      width: this.render.toStageValue(stageState.width - this.option.size + this.render.rulerSize),
-      height: this.render.toStageValue(this.option.size)
-    });
-    // 比例尺 - 左
-    const groupLeft = new Konva.Group({
-      x: this.render.toStageValue(-stageState.x),
-      y: this.render.toStageValue(-stageState.y + this.option.size),
-      width: this.render.toStageValue(this.option.size),
-      height: this.render.toStageValue(stageState.height - this.option.size + this.render.rulerSize)
-    });
-    {
-      groupTop.add(
-        // 上
-        new Konva.Rect({
-          name: this.constructor.name,
-          x: 0,
-          y: 0,
-          width: groupTop.width(),
-          height: groupTop.height(),
-          fill: '#ddd'
-        })
-      );
-      for (let x = lenX + startX - 1; x >= startX; x--) {
-        const nx = -groupTop.x() + cellSize * x;
-        const long = (this.render.toStageValue(this.option.size) / 5) * 4;
-        const short = (this.render.toStageValue(this.option.size) / 5) * 3;
-        if (nx >= 0) {
-          groupTop.add(
-            new Konva.Line({
-              name: this.constructor.name,
-              points: [
-                [nx, x % 5 ? long : short],
-                [nx, this.render.toStageValue(this.option.size)]
-              ].flat(),
-              stroke: '#999',
-              strokeWidth: this.render.toStageValue(1),
-              listening: false
-            })
-          );
-          if (x % 5 === 0) {
-            let fontSize = fontSizeMax;
-            const text = new Konva.Text({
-              name: this.constructor.name,
-              y: this.render.toStageValue(this.option.size / 2 - fontSize),
-              text: (x * cellSize).toString(),
-              fontSize: this.render.toStageValue(fontSize),
-              fill: '#999',
-              align: 'center',
-              verticalAlign: 'middle',
-              lineHeight: 1.6
-            });
-            while (this.render.toStageValue(text.width()) > this.render.toStageValue(cellSize) * 4.6) {
-              fontSize -= 1;
-              text.fontSize(this.render.toStageValue(fontSize));
-              text.y(this.render.toStageValue(this.option.size / 2 - fontSize));
-            }
-            text.x(nx - text.width() / 2);
-            groupTop.add(text);
-          }
-        }
-      }
-    }
-    {
-      groupLeft.add(
-        // 左
-        new Konva.Rect({
-          name: this.constructor.name,
-          x: 0,
-          y: 0,
-          width: groupLeft.width(),
-          height: groupLeft.height(),
-          fill: '#ddd'
-        })
-      );
-      for (let y = lenY + startY - 1; y >= startY; y--) {
-        const ny = -groupLeft.y() + cellSize * y;
-        const long = (this.render.toStageValue(this.option.size) / 5) * 4;
-        const short = (this.render.toStageValue(this.option.size) / 5) * 3;
-        if (ny >= 0) {
-          groupLeft.add(
-            new Konva.Line({
-              name: this.constructor.name,
-              points: [
-                [y % 5 ? long : short, ny],
-                [this.render.toStageValue(this.option.size), ny]
-              ].flat(),
-              stroke: '#999',
-              strokeWidth: this.render.toStageValue(1),
-              listening: false
-            })
-          );
-          if (y % 5 === 0) {
-            let fontSize = fontSizeMax;
-            const text = new Konva.Text({
-              name: this.constructor.name,
-              x: 0,
-              y: ny,
-              text: (y * cellSize).toString(),
-              fontSize: this.render.toStageValue(fontSize),
-              fill: '#999',
-              align: 'right',
-              verticalAlign: 'bottom',
-              lineHeight: 1.6,
-              wrap: 'none'
-            });
-            while (text.width() > short * 0.8) {
-              fontSize -= 1;
-              text.fontSize(this.render.toStageValue(fontSize));
-            }
-            text.y(ny - text.height() / 2);
-            text.width(short - this.render.toStageValue(1));
-            groupLeft.add(text);
-          }
-        }
-      }
-    }
-    group.add(
-      // 角
-      new Konva.Rect({
-        name: this.constructor.name,
-        x: this.render.toStageValue(-stageState.x),
-        y: this.render.toStageValue(-stageState.y),
-        width: this.render.toStageValue(this.option.size),
-        height: this.render.toStageValue(this.option.size),
-        fill: '#ddd'
-      })
-    );
-    group.add(groupTop);
-    group.add(groupLeft);
-    this.group.add(group);
-  }
-}
+import Konva from 'konva';
+import { BaseDraw, Render, Draw } from '../types';
+
+// 画布比例尺
+
+export interface RulerDrawOption {
+  size: number
+}
+
+export class RulerDraw extends BaseDraw implements Draw {
+  option: RulerDrawOption;
+
+  constructor(render: Render, layer: Konva.Layer, option: RulerDrawOption) {
+    super(render, layer);
+    this.option = option;
+    this.group.listening(false);
+  }
+
+  override draw() {
+    this.clear();
+    const stageState = this.render.getStageState();
+    // 格子大小
+    const cellSize = 20;
+    const fontSizeMax = 12;
+    const lenX = Math.ceil(this.render.toStageValue(stageState.width) / cellSize); // 列数
+    const lenY = Math.ceil(this.render.toStageValue(stageState.height) / cellSize); // 行数
+    const startX = -Math.ceil(this.render.toStageValue(stageState.x - this.option.size) / cellSize);
+    const startY = -Math.ceil(this.render.toStageValue(stageState.y - this.option.size) / cellSize);
+    const group = new Konva.Group();
+    // 比例尺 - 上
+    const groupTop = new Konva.Group({
+      x: this.render.toStageValue(-stageState.x + this.option.size),
+      y: this.render.toStageValue(-stageState.y),
+      width: this.render.toStageValue(stageState.width - this.option.size + this.render.rulerSize),
+      height: this.render.toStageValue(this.option.size)
+    });
+    // 比例尺 - 左
+    const groupLeft = new Konva.Group({
+      x: this.render.toStageValue(-stageState.x),
+      y: this.render.toStageValue(-stageState.y + this.option.size),
+      width: this.render.toStageValue(this.option.size),
+      height: this.render.toStageValue(stageState.height - this.option.size + this.render.rulerSize)
+    });
+    {
+      groupTop.add(
+        // 上
+        new Konva.Rect({
+          name: this.constructor.name,
+          x: 0,
+          y: 0,
+          width: groupTop.width(),
+          height: groupTop.height(),
+          fill: '#ddd'
+        })
+      );
+      for (let x = lenX + startX - 1; x >= startX; x--) {
+        const nx = -groupTop.x() + cellSize * x;
+        const long = (this.render.toStageValue(this.option.size) / 5) * 4;
+        const short = (this.render.toStageValue(this.option.size) / 5) * 3;
+        if (nx >= 0) {
+          groupTop.add(
+            new Konva.Line({
+              name: this.constructor.name,
+              points: [
+                [nx, x % 5 ? long : short],
+                [nx, this.render.toStageValue(this.option.size)]
+              ].flat(),
+              stroke: '#999',
+              strokeWidth: this.render.toStageValue(1),
+              listening: false
+            })
+          );
+          if (x % 5 === 0) {
+            let fontSize = fontSizeMax;
+            const text = new Konva.Text({
+              name: this.constructor.name,
+              y: this.render.toStageValue(this.option.size / 2 - fontSize),
+              text: (x * cellSize).toString(),
+              fontSize: this.render.toStageValue(fontSize),
+              fill: '#999',
+              align: 'center',
+              verticalAlign: 'middle',
+              lineHeight: 1.6
+            });
+            while (this.render.toStageValue(text.width()) > this.render.toStageValue(cellSize) * 4.6) {
+              fontSize -= 1;
+              text.fontSize(this.render.toStageValue(fontSize));
+              text.y(this.render.toStageValue(this.option.size / 2 - fontSize));
+            }
+            text.x(nx - text.width() / 2);
+            groupTop.add(text);
+          }
+        }
+      }
+    }
+    {
+      groupLeft.add(
+        // 左
+        new Konva.Rect({
+          name: this.constructor.name,
+          x: 0,
+          y: 0,
+          width: groupLeft.width(),
+          height: groupLeft.height(),
+          fill: '#ddd'
+        })
+      );
+      for (let y = lenY + startY - 1; y >= startY; y--) {
+        const ny = -groupLeft.y() + cellSize * y;
+        const long = (this.render.toStageValue(this.option.size) / 5) * 4;
+        const short = (this.render.toStageValue(this.option.size) / 5) * 3;
+        if (ny >= 0) {
+          groupLeft.add(
+            new Konva.Line({
+              name: this.constructor.name,
+              points: [
+                [y % 5 ? long : short, ny],
+                [this.render.toStageValue(this.option.size), ny]
+              ].flat(),
+              stroke: '#999',
+              strokeWidth: this.render.toStageValue(1),
+              listening: false
+            })
+          );
+          if (y % 5 === 0) {
+            let fontSize = fontSizeMax;
+            const text = new Konva.Text({
+              name: this.constructor.name,
+              x: 0,
+              y: ny,
+              text: (y * cellSize).toString(),
+              fontSize: this.render.toStageValue(fontSize),
+              fill: '#999',
+              align: 'right',
+              verticalAlign: 'bottom',
+              lineHeight: 1.6,
+              wrap: 'none'
+            });
+            while (text.width() > short * 0.8) {
+              fontSize -= 1;
+              text.fontSize(this.render.toStageValue(fontSize));
+            }
+            text.y(ny - text.height() / 2);
+            text.width(short - this.render.toStageValue(1));
+            groupLeft.add(text);
+          }
+        }
+      }
+    }
+    group.add(
+      // 角
+      new Konva.Rect({
+        name: this.constructor.name,
+        x: this.render.toStageValue(-stageState.x),
+        y: this.render.toStageValue(-stageState.y),
+        width: this.render.toStageValue(this.option.size),
+        height: this.render.toStageValue(this.option.size),
+        fill: '#ddd'
+      })
+    );
+    group.add(groupTop);
+    group.add(groupLeft);
+    this.group.add(group);
+  }
+}

package/src/aldehyde/draw-canvas-edit/components/render/handlers/drag-outside-handlers.ts

@@ -21,6 +21,7 @@ export class DragOutsideHandlers implements Handler {
       },
       drop: async (e: GlobalEventHandlersEventMap['drop']) => {
         const componentItem = JSON.parse(e.dataTransfer?.getData('componentItem') || '{}');
+        const defaultValues = JSON.parse(e.dataTransfer?.getData('defaultValues') || '{}');
         const src = e.dataTransfer?.getData('src');
         const componentType = e.dataTransfer?.getData('componentType'); // 组件类型
         const showPoints = e.dataTransfer?.getData('showPoints'); // 是否显示连接点
@@ -56,6 +57,9 @@ export class DragOutsideHandlers implements Handler {
           group.setAttrs({ x, y });
           // 更新坐标记录
           this.render.setAssetSettings(group, this.render.getAssetSettings(group), false);
+          if (Object.keys(defaultValues).length > 0) { // 设置默认值
+            this.render.setAssetSettings(group, { ...this.render.getAssetSettings(group), ...defaultValues }, false);
+          }
           // 设置连接点
           this.render.componentFactory.createComponentLinkPoints({ group, points, showPoints });
           // 组件鼠标移入移出事件

package/src/aldehyde/draw-canvas-edit/components/render/index.ts

@@ -551,7 +551,6 @@ export class Render {
       fontSize: base.fontSize || this.getPageSettings().fontSize,
       textFill: base.textFill || this.getPageSettings().textFill,
       // 绘制图形，默认不填充
-      fill: base.fill || "transparent",
       x: parseFloat((asset?.position().x ?? 0).toFixed(1)),
       y: parseFloat((asset?.position().y ?? 0).toFixed(1)),
       rotation: parseFloat((asset?.rotation() ?? 0).toFixed(1)),

package/src/aldehyde/module/dtmpl-edit-card.tsx

@@ -12,6 +12,7 @@ import HcserviceV3 from "../tmpl/hcservice-v3";
 import Action from "../controls/action";
 import { LocaleContext } from "../locale/LocaleProvider";
 import TmplConfigAnalysis from "../tmpl/tmpl-config-analysis";
+import { relValueFieldExtControlType } from "../controls/entry-control";
 
 interface DtmplEditCardProps extends DtmplBaseProps {
     onOk?: (code: string) => void;
@@ -73,6 +74,7 @@ export default class DtmplEditCard extends React.PureComponent<
             if (prevProps.sourceId != this.props.sourceId || dtmplConfig == null || (!this.props.code && prevProps.code)) {
                 await this.loadConfigData();
             } else if (prevProps.sourceId != this.props.sourceId || queryingCode != code || !dtmplData) {
+                await this.handleBuildInFuncFields(dtmplConfig);
                 //防止反复请求 code
                 if (code) {
                     await this.loadCodeData(dtmplConfig, code);
@@ -108,6 +110,7 @@ export default class DtmplEditCard extends React.PureComponent<
                 addTmplId
             );
         }
+        await this.handleBuildInFuncFields(dtmplConfig);
         this.handleRelValueField(dtmplConfig);
         if (dtmplConfig.entity) {
             let dtmplData = dtmplConfig.entity;
@@ -224,7 +227,14 @@ export default class DtmplEditCard extends React.PureComponent<
     // 表单关联项secondCriterion处理start
     getSubDtmplData = async (valueField, code) => {
         const { serverKey } = this.props;
-        const dtmplData = await HcserviceV3.requestDtmplData(serverKey, valueField.id, code.split("@R@")[0], null);
+        let dtmplData = null;
+        if (valueField.extRefPageId) { // 存在extRefPageId(扩展关联页面)，则优先使用extRefPageId(例如：枚举值无指向页面，使用扩展关联页面)
+            const { entities } = await HcserviceV3.requestLtmplQueryTop(null, valueField.extRefPageId, { top: 1, secondCriterion: code.split("@R@")[0] }) || {};
+            dtmplData = entities?.[0];
+        } else { // 查询字段指向页面的数据
+            dtmplData = await HcserviceV3.requestDtmplData(serverKey, valueField.id, code.split("@R@")[0], null);
+        }
+        if (!dtmplData) return null;
         const subField = valueField.subRelValueField;
         const subData = dtmplData.fieldMap[subField.id];
         if (subField.subRelValueField && subData) { // 存在下级关联项
@@ -235,17 +245,21 @@ export default class DtmplEditCard extends React.PureComponent<
 
     getSecondCriteria = async (field) => {
         const { parentFormInstance } = this.props;
-        const { relValueField, relValueField3, baseCriteria = {} } = field;
+        const { relValueField, relValueField3, baseCriteria = {}, relMinValueField, relMaxValueField } = field;
         const temForm = parentFormInstance || this.formRef.current;
-        if (relValueField && temForm) {
+        if (relValueField && temForm) { // 设置默认值或查询次条件
             let relValueData = temForm.getFieldValue(relValueField.id);
             if (relValueField.subRelValueField && relValueData) {
                 relValueData = await this.getSubDtmplData(relValueField, relValueData);
             }
-            field.baseCriteria = { ...(baseCriteria || {}), "secondCriterion": relValueData };
+            if (!relValueFieldExtControlType.includes(field.extControlType)) {
+                field.defaultValue = relValueData;  // 非关系型字段填充默认值
+            } else {
+                field.baseCriteria = { ...(baseCriteria || {}), "secondCriterion": relValueData };
+            }
             field.configChanged = true;
         }
-        if (relValueField3 && temForm) {
+        if (relValueField3 && temForm) { // 设置查询三条件
             let relValueData = temForm.getFieldValue(relValueField3.id);
             if (relValueField3.subRelValueField && relValueData) {
                 relValueData = await this.getSubDtmplData(relValueField3, relValueData);
@@ -253,6 +267,22 @@ export default class DtmplEditCard extends React.PureComponent<
             field.baseCriteria = { ...(field.baseCriteria || {}), "thirdCriterion": relValueData };
             field.configChanged = true;
         }
+        if (relMinValueField && temForm) { // 设置最小值
+            let relValueData = temForm.getFieldValue(relMinValueField.id);
+            if (relMinValueField.subRelValueField && relValueData) {
+                relValueData = await this.getSubDtmplData(relMinValueField, relValueData);
+            }
+            field.min = relValueData;
+            field.configChanged = true;
+        }
+        if (relMaxValueField && temForm) { // 设置最大值
+            let relValueData = temForm.getFieldValue(relMaxValueField.id);
+            if (relMaxValueField.subRelValueField && relValueData) {
+                relValueData = await this.getSubDtmplData(relMaxValueField, relValueData);
+            }
+            field.max = relValueData;
+            field.configChanged = true;
+        }
         return field;
     }
     // 表单关联项secondCriterion处理end
@@ -292,8 +322,8 @@ export default class DtmplEditCard extends React.PureComponent<
     };
 
     //关联取值:根据 parentFormInstance / this.formRef 完善 dtmplConfig
-    handleBuildInFuncFields = async () => {
-        const { dtmplConfig } = this.state;
+    handleBuildInFuncFields = async (tDtmplConfig?: DtmplConfig) => {
+        const dtmplConfig = tDtmplConfig || this.state.dtmplConfig;
         if (dtmplConfig) {
             if (!dtmplConfig.buildInFuncFields) {
                 dtmplConfig.buildInFuncFields = TmplConfigAnalysis.buildInFuncFields(dtmplConfig);