aldehyde 0.2.494 → 0.2.495

package/src/aldehyde/controls/icon-selector/icon/phonenode-menu-icon/iconfont.json

@@ -1,93 +1,93 @@
-{
-  "id": "5037136",
-  "name": "phonenode-menu-icon",
-  "font_family": "iconfont",
-  "css_prefix_text": "icon-",
-  "description": "",
-  "glyphs": [
-    {
-      "icon_id": "1079710",
-      "name": "停车位",
-      "font_class": "tingchewei",
-      "unicode": "e664",
-      "unicode_decimal": 58980
-    },
-    {
-      "icon_id": "1305474",
-      "name": "权限",
-      "font_class": "quanxian",
-      "unicode": "e63f",
-      "unicode_decimal": 58943
-    },
-    {
-      "icon_id": "1998826",
-      "name": "工位",
-      "font_class": "gongwei",
-      "unicode": "e641",
-      "unicode_decimal": 58945
-    },
-    {
-      "icon_id": "10487476",
-      "name": "维修",
-      "font_class": "weixiu",
-      "unicode": "e690",
-      "unicode_decimal": 59024
-    },
-    {
-      "icon_id": "12184880",
-      "name": "部门",
-      "font_class": "bumen",
-      "unicode": "e686",
-      "unicode_decimal": 59014
-    },
-    {
-      "icon_id": "20951818",
-      "name": "生产基地",
-      "font_class": "shengchanjidi",
-      "unicode": "e63b",
-      "unicode_decimal": 58939
-    },
-    {
-      "icon_id": "765849",
-      "name": "地址",
-      "font_class": "shouye",
-      "unicode": "e63c",
-      "unicode_decimal": 58940
-    },
-    {
-      "icon_id": "8629256",
-      "name": "人员",
-      "font_class": "renyuan",
-      "unicode": "e66c",
-      "unicode_decimal": 58988
-    },
-    {
-      "icon_id": "9921751",
-      "name": "apply",
-      "font_class": "apply",
-      "unicode": "e61c",
-      "unicode_decimal": 58908
-    },
-    {
-      "icon_id": "39260433",
-      "name": "厂区管理",
-      "font_class": "changquguanli",
-      "unicode": "e607",
-      "unicode_decimal": 58887
-    },
-    {
-      "icon_id": "8329706",
-      "name": "kuaidi",
-      "font_class": "kuaidi",
-      "unicode": "e6c0",
-      "unicode_decimal": 59072
-    },
-    {
-      "icon_id": "15838501",
-      "name": "menu",
-      "font_class": "menu",
-      "unicode": "e677",
-      "unicode_decimal": 58999
-    }
-  ]
-}
+{
+  "id": "5037136",
+  "name": "phonenode-menu-icon",
+  "font_family": "iconfont",
+  "css_prefix_text": "icon-",
+  "description": "",
+  "glyphs": [
+    {
+      "icon_id": "1079710",
+      "name": "停车位",
+      "font_class": "tingchewei",
+      "unicode": "e664",
+      "unicode_decimal": 58980
+    },
+    {
+      "icon_id": "1305474",
+      "name": "权限",
+      "font_class": "quanxian",
+      "unicode": "e63f",
+      "unicode_decimal": 58943
+    },
+    {
+      "icon_id": "1998826",
+      "name": "工位",
+      "font_class": "gongwei",
+      "unicode": "e641",
+      "unicode_decimal": 58945
+    },
+    {
+      "icon_id": "10487476",
+      "name": "维修",
+      "font_class": "weixiu",
+      "unicode": "e690",
+      "unicode_decimal": 59024
+    },
+    {
+      "icon_id": "12184880",
+      "name": "部门",
+      "font_class": "bumen",
+      "unicode": "e686",
+      "unicode_decimal": 59014
+    },
+    {
+      "icon_id": "20951818",
+      "name": "生产基地",
+      "font_class": "shengchanjidi",
+      "unicode": "e63b",
+      "unicode_decimal": 58939
+    },
+    {
+      "icon_id": "765849",
+      "name": "地址",
+      "font_class": "shouye",
+      "unicode": "e63c",
+      "unicode_decimal": 58940
+    },
+    {
+      "icon_id": "8629256",
+      "name": "人员",
+      "font_class": "renyuan",
+      "unicode": "e66c",
+      "unicode_decimal": 58988
+    },
+    {
+      "icon_id": "9921751",
+      "name": "apply",
+      "font_class": "apply",
+      "unicode": "e61c",
+      "unicode_decimal": 58908
+    },
+    {
+      "icon_id": "39260433",
+      "name": "厂区管理",
+      "font_class": "changquguanli",
+      "unicode": "e607",
+      "unicode_decimal": 58887
+    },
+    {
+      "icon_id": "8329706",
+      "name": "kuaidi",
+      "font_class": "kuaidi",
+      "unicode": "e6c0",
+      "unicode_decimal": 59072
+    },
+    {
+      "icon_id": "15838501",
+      "name": "menu",
+      "font_class": "menu",
+      "unicode": "e677",
+      "unicode_decimal": 58999
+    }
+  ]
+}

package/src/aldehyde/draw-canvas-edit/components/asset-bar/index.less

@@ -1,36 +1,36 @@
-.asset-bar {
-  background-color: #f5f5f5;
-  width: 200px;
-  min-height: 100%;
-
-  .asset-list {
-    display: flex;
-    flex-wrap: wrap;
-    padding: 4px;
-    margin: 0;
-    list-style: none;
-
-    &>li {
-      width: 20%;
-      padding-top: 20%;
-      flex-shrink: 0;
-      cursor: pointer;
-      position: relative;
-      border-radius: 4px;
-
-      &:hover {
-        background-color: #ddd;
-      }
-
-      &>img {
-        position: absolute;
-        top: 6px;
-        left: 6px;
-        object-fit: contain;
-        width: calc(~"100% - 12px");
-        height: calc(~"100% - 12px");
-        pointer-events: none;
-      }
-    }
-  }
+.asset-bar {
+  background-color: #f5f5f5;
+  width: 200px;
+  min-height: 100%;
+
+  .asset-list {
+    display: flex;
+    flex-wrap: wrap;
+    padding: 4px;
+    margin: 0;
+    list-style: none;
+
+    &>li {
+      width: 20%;
+      padding-top: 20%;
+      flex-shrink: 0;
+      cursor: pointer;
+      position: relative;
+      border-radius: 4px;
+
+      &:hover {
+        background-color: #ddd;
+      }
+
+      &>img {
+        position: absolute;
+        top: 6px;
+        left: 6px;
+        object-fit: contain;
+        width: calc(~"100% - 12px");
+        height: calc(~"100% - 12px");
+        pointer-events: none;
+      }
+    }
+  }
 }

package/src/aldehyde/draw-canvas-edit/components/asset-bar/index.tsx

@@ -1,110 +1,110 @@
-import React, { DragEvent, useEffect, useMemo, useState } from 'react';
-import { Collapse, Tooltip } from "antd";
-import { ProgramConfig } from "../../../index";
-import './index.less';
-
-// 组件分组配置
-const assetGroups = [
-  { key: 'SVG', label: '矢量图' },
-  { key: 'picture', label: '图片' },
-  { key: 'gif', label: 'GIF' },
-  // { key: 'composite', label: '图形组合 (JSON)' },
-  { key: 'other', label: '其他' }
-];
-
-export const handleImgUrl = (val: string) => {
-  let src = val;
-  if (!src || src.startsWith("http")) {
-    return src;
-  }
-  if (src.includes("@R@")) {
-    const text = src.split("@R@")[1];
-    if (text.startsWith("http")) {
-      return text;
-    }
-    src = text;
-  }
-  const url = encodeURI(ProgramConfig.joinPath(
-    ProgramConfig.joinPath(ProgramConfig.api(), "/v3/files"),
-    src
-  )) +
-    `?@token=${ProgramConfig.hydrocarbonToken()}&@programToken=${ProgramConfig.programCode()}&@applicationToken=${ProgramConfig.applicationCode()}`;
-  return url;
-}
-
-// 不显示连接线的组件类型
-const noLinkToolType = ["workstation"];
-
-interface AssetItem {
-  body: {
-    path: string;
-    suffix: string;
-  };
-  type: string; // 组件类型
-  config?: string; // 组件配置
-}
-
-const AssetList = () => {
-  const [activeKey, setActiveKey] = useState<string[]>(["SVG"]);
-  const [component2D, setComponent2D] = useState<any>({});
-
-  // 拖拽
-  const handleDragStart = (e: DragEvent, item: AssetItem) => {
-    if (!item?.body) {
-      return;
-    }
-    let defValues = {};
-    try {
-      const config = JSON.parse(item.config || "[]");
-      config.forEach(item => {
-        item.groups.forEach(r => r.fields?.forEach(i => {
-          if (i.defaultValue || i.defaultValue === 0) {
-            defValues[i.id] = i.defaultValue;
-          }
-        }));
-      });
-    } catch { defValues = {} }
-    e.dataTransfer.setData('defaultValues', JSON.stringify(defValues)); // 默认值配置
-    e.dataTransfer.setData('componentItem', JSON.stringify(item)); // 整体配置信息
-    e.dataTransfer.setData('src', item.body.path); // 组件地址
-    e.dataTransfer.setData('type', item.body.suffix);
-    e.dataTransfer.setData('componentType', item.type || ''); // 组件类型
-    e.dataTransfer.setData('showPoints', noLinkToolType.includes(item.type) ? "false" : "true");
-  };
-
-  const get2DComponent = async () => {
-    if (!activeKey?.length) {
-      return;
-    }
-    const res = await ProgramConfig.get2DComponent(activeKey);
-    setComponent2D(res);
-  }
-
-  useEffect(() => {
-    get2DComponent();
-  }, [activeKey])
-
-  // 组件渲染
-  const assetNodes = useMemo(() => {
-    const temArr = assetGroups?.map(r => ({
-      ...r,
-      children: component2D[r.key]?.length ? <ul className="asset-list">
-        {component2D[r.key].map((item, idx) => {
-          const temDom = <li key={idx} draggable onDragStart={(e) => handleDragStart(e, item)}>
-            <img src={handleImgUrl(item?.body?.path)} alt="" />
-          </li>;
-          return item.title ? <Tooltip title={item.title}>{temDom}</Tooltip> : temDom;
-        })}
-      </ul> : null
-    }))?.filter(r => r.children);
-    return temArr || [];
-  }, [component2D]);
-
-  return (
-    <div className="asset-bar">
-      <Collapse styles={{ body: { padding: "4px 8px 8px" } }} size="small" onChange={setActiveKey} bordered={false} items={assetNodes} activeKey={activeKey} />
-    </div>
-  )
-};
-
-export default AssetList;
+import React, { DragEvent, useEffect, useMemo, useState } from 'react';
+import { Collapse, Tooltip } from "antd";
+import { ProgramConfig } from "../../../index";
+import './index.less';
+
+// 组件分组配置
+const assetGroups = [
+  { key: 'SVG', label: '矢量图' },
+  { key: 'picture', label: '图片' },
+  { key: 'gif', label: 'GIF' },
+  // { key: 'composite', label: '图形组合 (JSON)' },
+  { key: 'other', label: '其他' }
+];
+
+export const handleImgUrl = (val: string) => {
+  let src = val;
+  if (!src || src.startsWith("http")) {
+    return src;
+  }
+  if (src.includes("@R@")) {
+    const text = src.split("@R@")[1];
+    if (text.startsWith("http")) {
+      return text;
+    }
+    src = text;
+  }
+  const url = encodeURI(ProgramConfig.joinPath(
+    ProgramConfig.joinPath(ProgramConfig.api(), "/v3/files"),
+    src
+  )) +
+    `?@token=${ProgramConfig.hydrocarbonToken()}&@programToken=${ProgramConfig.programCode()}&@applicationToken=${ProgramConfig.applicationCode()}`;
+  return url;
+}
+
+// 不显示连接线的组件类型
+const noLinkToolType = ["workstation"];
+
+interface AssetItem {
+  body: {
+    path: string;
+    suffix: string;
+  };
+  type: string; // 组件类型
+  config?: string; // 组件配置
+}
+
+const AssetList = () => {
+  const [activeKey, setActiveKey] = useState<string[]>(["SVG"]);
+  const [component2D, setComponent2D] = useState<any>({});
+
+  // 拖拽
+  const handleDragStart = (e: DragEvent, item: AssetItem) => {
+    if (!item?.body) {
+      return;
+    }
+    let defValues = {};
+    try {
+      const config = JSON.parse(item.config || "[]");
+      config.forEach(item => {
+        item.groups.forEach(r => r.fields?.forEach(i => {
+          if (i.defaultValue || i.defaultValue === 0) {
+            defValues[i.id] = i.defaultValue;
+          }
+        }));
+      });
+    } catch { defValues = {} }
+    e.dataTransfer.setData('defaultValues', JSON.stringify(defValues)); // 默认值配置
+    e.dataTransfer.setData('componentItem', JSON.stringify(item)); // 整体配置信息
+    e.dataTransfer.setData('src', item.body.path); // 组件地址
+    e.dataTransfer.setData('type', item.body.suffix);
+    e.dataTransfer.setData('componentType', item.type || ''); // 组件类型
+    e.dataTransfer.setData('showPoints', noLinkToolType.includes(item.type) ? "false" : "true");
+  };
+
+  const get2DComponent = async () => {
+    if (!activeKey?.length) {
+      return;
+    }
+    const res = await ProgramConfig.get2DComponent(activeKey);
+    setComponent2D(res);
+  }
+
+  useEffect(() => {
+    get2DComponent();
+  }, [activeKey])
+
+  // 组件渲染
+  const assetNodes = useMemo(() => {
+    const temArr = assetGroups?.map(r => ({
+      ...r,
+      children: component2D[r.key]?.length ? <ul className="asset-list">
+        {component2D[r.key].map((item, idx) => {
+          const temDom = <li key={idx} draggable onDragStart={(e) => handleDragStart(e, item)}>
+            <img src={handleImgUrl(item?.body?.path)} alt="" />
+          </li>;
+          return item.title ? <Tooltip title={item.title}>{temDom}</Tooltip> : temDom;
+        })}
+      </ul> : null
+    }))?.filter(r => r.children);
+    return temArr || [];
+  }, [component2D]);
+
+  return (
+    <div className="asset-bar">
+      <Collapse styles={{ body: { padding: "4px 8px 8px" } }} size="small" onChange={setActiveKey} bordered={false} items={assetNodes} activeKey={activeKey} />
+    </div>
+  )
+};
+
+export default AssetList;

package/src/aldehyde/draw-canvas-edit/components/main-header/index.less

@@ -1,24 +1,24 @@
-.main-header {
-  min-height: 40px;
-  padding: 4px 8px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  background: var(--ant-layout-body-bg);
-  overflow-x: auto;
-  overflow-y: hidden;
-
-  button {
-    padding: 4px 8px;
-    font-size: 16px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-
-    &.active {
-      background-color: var(--ant-color-primary);
-      color: #fff;
-    }
-
-  }
+.main-header {
+  min-height: 40px;
+  padding: 4px 8px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  background: var(--ant-layout-body-bg);
+  overflow-x: auto;
+  overflow-y: hidden;
+
+  button {
+    padding: 4px 8px;
+    font-size: 16px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    &.active {
+      background-color: var(--ant-color-primary);
+      color: #fff;
+    }
+
+  }
 }