support custom icons

zhandouxiaojiji · Apr 17, 2024 · b81d944 · b81d944
1 parent 1c0ac11
commit b81d944
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 6 deletions.
diff --git a/electron/main/index.ts b/electron/main/index.ts
@@ -32,6 +32,9 @@ if (!app.requestSingleInstanceLock()) {
   process.exit(0);
 }
 
+app.commandLine.appendArgument("–-allow-file-access-from-files");
+app.commandLine.appendArgument("--disable-web-security");
+
 // Remove electron security warnings
 // This warning only shows in development mode
 // Read more on https://www.electronjs.org/docs/latest/tutorial/security
@@ -73,6 +76,7 @@ async function createWindow(projectPath?: string) {
       // Read more on https://www.electronjs.org/docs/latest/tutorial/context-isolation
       nodeIntegration: true,
       contextIsolation: false,
+      webSecurity: false,
     },
   });
 

diff --git a/public/locales/en.json b/public/locales/en.json
@@ -78,7 +78,7 @@
   "node.deleteRootNodeDenied": "Unable to delete the root node",
   "node.editSubtreeDenied": "Unable to edit the subtree node",
   "node.desc": "Node desc",
-  "node.fileRequired": "{{field}} field is required",
+  "node.fileRequired": "field '{{field}}' is required",
   "node.id": "Node id",
   "node.inputVariable": "Input variables",
   "node.name": "Node name",

diff --git a/public/locales/zh.json b/public/locales/zh.json
@@ -78,7 +78,7 @@
   "node.deleteRootNodeDenied": "不能删除根节点",
   "node.editSubtreeDenied": "不能编辑子树节点",
   "node.desc": "节点说明",
-  "node.fileRequired": "字段<b>{{field}}</b>必填",
+  "node.fileRequired": "字段“{{field}}”必填",
   "node.id": "节点标识",
   "node.inputVariable": "输入变量",
   "node.name": "节点名称",

diff --git a/sample/icons/cmp.svg b/sample/icons/cmp.svg
diff --git a/sample/node-config.b3-setting b/sample/node-config.b3-setting
@@ -22,6 +22,7 @@
   {
     "name": "Cmp",
     "type": "Condition",
+    "icon": "icons/cmp.svg",
     "doc": "+ 若值为空，返回失败\n+ 非整数类型可能会报错\n",
     "input": [
       "值(int)"

diff --git a/src/components/inspector.tsx b/src/components/inspector.tsx
@@ -68,13 +68,13 @@ export const Inspector: FC = () => {
       if (node) {
         node.input?.forEach((v, i) => {
           const desc = node.def.input?.[i] ?? "<unknown>";
-          if (v && !options.find((option) => option.value !== v)) {
+          if (v && !options.find((option) => option.value === v)) {
             options.push({ label: `${v}(${desc})`, value: v });
           }
         });
         node.output?.forEach((v, i) => {
           const desc = node.def.output?.[i] ?? "<unknown>";
-          if (v && !options.find((option) => option.value !== v)) {
+          if (v && !options.find((option) => option.value === v)) {
             options.push({ label: `${v}(${desc})`, value: v });
           }
         });

diff --git a/src/components/register-node.ts b/src/components/register-node.ts
@@ -174,7 +174,7 @@ G6.registerNode(
       });
 
       // icon
-      const img = `./icons/${classify}.svg`;
+      const img = nodeDef.icon ? workspace.workdir + "/" + nodeDef.icon : `./icons/${classify}.svg`;
       addShape("image", {
         attrs: {
           x: 5,

diff --git a/src/contexts/workspace-context.ts b/src/contexts/workspace-context.ts
@@ -381,7 +381,6 @@ export const useWorkspace = create<WorkspaceStore>((set, get) => ({
       const workspace = get();
       let hasEvent = false;
       fs.watch(workspace.workdir, { recursive: true }, (event, filename) => {
-        console.log("fileanme", event, filename);
         if (event === "rename") {
           if (!hasEvent) {
             setTimeout(() => {