customize first id

.vscode/settings.json

@@ -3,11 +3,13 @@
   "typescript.tsc.autoDetect": "off",
   "json.schemas": [
     {
-      "fileMatch": [
-        "/*electron-builder.json5",
-        "/*electron-builder.json"
-      ],
+      "fileMatch": ["/*electron-builder.json5", "/*electron-builder.json"],
       "url": "https://json.schemastore.org/electron-builder"
     }
-  ]
+  ],
+  "editor.formatOnSave": true,
+  "editor.codeActionsOnSave": {
+    "source.organizeImports": "explicit"
+  },
+  "editor.defaultFormatter": "esbenp.prettier-vscode"
 }

behavior3editor.code-workspace

@@ -1,14 +0,0 @@
-{
-  "folders": [
-    {
-      "path": "."
-    }
-  ],
-  "settings": {
-    "editor.formatOnSave": true,
-    "editor.codeActionsOnSave": {
-      "source.organizeImports": "explicit"
-    },
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  }
-}

pre-commit.ts

@@ -20,5 +20,5 @@ else
   exit 1
 fi
 `;
-fs.writeFileSync(".git/hooks/pre-commit", hooks);
+fs.writeFileSync(".git/hooks/pre-commit", hooks.replace(/^[\n\r]+/, ""));
 fs.chmodSync(".git/hooks/pre-commit", 0o755);

public/locales/en.json

@@ -76,6 +76,7 @@
   "tree.name": "Tree name",
   "tree.desc": "Tree desc",
   "tree.export": "Export",
+  "tree.firstid": "First id",
 
   "regnode.input": "Input: ",
   "regnode.output": "Output: ",

public/locales/zh.json

@@ -76,6 +76,7 @@
   "tree.name": "行为树",
   "tree.desc": "说明",
   "tree.export": "导出",
+  "tree.firstid": "起始标识",
 
   "regnode.input": "输入：",
   "regnode.output": "输出：",

src/components/editor.tsx

@@ -192,7 +192,7 @@ export const Editor: FC<EditorProps> = ({ onUpdate: updateState, data: editor, .
 
   const onSearchChange = (option: FilterOption) => {
     option.results.length = 0;
-    filterNodes(option, findDataById("1"));
+    filterNodes(option, editor.data);
     setFilterOption({
       ...option,
     });
@@ -210,7 +210,7 @@ export const Editor: FC<EditorProps> = ({ onUpdate: updateState, data: editor, .
   const updateSearchState = () => {
     const option = { ...filterOption };
     option.results.length = 0;
-    filterNodes(option, findDataById("1"));
+    filterNodes(option, editor.data);
     setFilterOption({
       ...option,
     });
@@ -268,7 +268,20 @@ export const Editor: FC<EditorProps> = ({ onUpdate: updateState, data: editor, .
   };
 
   const findDataById = (id: string) => {
-    return editor.graph.findDataById(id) as TreeGraphData;
+    const traverse = (node: TreeGraphData): TreeGraphData | undefined => {
+      if (node.id === id) {
+        return node;
+      }
+      if (node.children) {
+        for (const child of node.children) {
+          const result = traverse(child);
+          if (result) {
+            return result;
+          }
+        }
+      }
+    };
+    return traverse(editor.data) as TreeGraphData;
   };
 
   const includeString = (content: string | undefined, option: FilterOption) => {
@@ -363,11 +376,10 @@ export const Editor: FC<EditorProps> = ({ onUpdate: updateState, data: editor, .
   };
 
   const refresh = () => {
-    const rootData = findDataById("1");
-    const rootNode = b3util.createNode(rootData);
+    const rootNode = b3util.createNode(editor.data);
     editor.modifiedTime = fs.statSync(editor.path).mtimeMs;
     editor.data = createTreeData(rootNode);
-    editor.autoId = b3util.refreshTreeDataId(editor.data);
+    editor.autoId = b3util.refreshTreeDataId(editor.data, editor.firstid);
     editor.graph.changeData(editor.data);
     editor.graph.layout();
     restoreViewport();
@@ -376,7 +388,7 @@ export const Editor: FC<EditorProps> = ({ onUpdate: updateState, data: editor, .
   const reload = () => {
     const file = readJson(editor.path) as TreeModel;
     editor.data = createTreeData(file.root);
-    editor.autoId = b3util.refreshTreeDataId(editor.data);
+    editor.autoId = b3util.refreshTreeDataId(editor.data, editor.firstid);
     editor.unsave = false;
     updateState();
     if (editor.graph) {
@@ -388,8 +400,7 @@ export const Editor: FC<EditorProps> = ({ onUpdate: updateState, data: editor, .
 
   const checkSubtree = () => {
     if (editor.graph) {
-      const data = findDataById("1");
-      if (isSubtreeUpdated(data)) {
+      if (isSubtreeUpdated(editor.data)) {
         refresh();
         pushHistory();
         onChange();
@@ -430,6 +441,7 @@ export const Editor: FC<EditorProps> = ({ onUpdate: updateState, data: editor, .
       return;
     }
     b3util.copyFromNode(data, newNode);
+    data.def = b3util.getNodeDefs().get(data.name)!;
     data.size = calcTreeDataSize(data);
     if (oldNode.path !== newNode.path) {
       refresh();
@@ -447,6 +459,10 @@ export const Editor: FC<EditorProps> = ({ onUpdate: updateState, data: editor, .
     if (editor.desc !== editTree.data.desc || editor.export !== editTree.data.export) {
       editor.desc = editTree.data.desc || "";
       editor.export = editTree.data.export !== false;
+      if (editor.data.firstid !== editTree.data.firstid) {
+        editor.firstid = editTree.data.firstid ?? 1;
+        refresh();
+      }
       onChange();
     }
   };
@@ -480,7 +496,7 @@ export const Editor: FC<EditorProps> = ({ onUpdate: updateState, data: editor, .
 
   const pushHistory = () => {
     editor.historyStack.length = ++editor.historyIndex;
-    editor.historyStack.push(b3util.createNode(findDataById("1")));
+    editor.historyStack.push(b3util.createNode(editor.data));
   };
 
   const copyNode = () => {
@@ -552,7 +568,7 @@ export const Editor: FC<EditorProps> = ({ onUpdate: updateState, data: editor, .
         updateGrahp();
       } else {
         editor.data = createTreeData(JSON.parse(str), editor.selectedId);
-        editor.autoId = b3util.refreshTreeDataId(editor.data);
+        editor.autoId = b3util.refreshTreeDataId(editor.data, editor.firstid);
         editor.graph.changeData(editor.data);
         editor.graph.render();
         editor.graph.layout();
@@ -626,7 +642,7 @@ export const Editor: FC<EditorProps> = ({ onUpdate: updateState, data: editor, .
 
   const useStackData = (data: NodeModel) => {
     editor.data = createTreeData(data);
-    editor.autoId = b3util.refreshTreeDataId(editor.data);
+    editor.autoId = b3util.refreshTreeDataId(editor.data, editor.firstid);
     editor.graph.changeData(editor.data);
     editor.graph.layout();
     restoreViewport();
@@ -663,12 +679,12 @@ export const Editor: FC<EditorProps> = ({ onUpdate: updateState, data: editor, .
   const save = () => {
     if (editor.unsave || !fs.existsSync(editor.path)) {
       const path = editor.path;
-      const data = findDataById("1");
-      editor.autoId = b3util.refreshTreeDataId(data);
-      const root = b3util.createFileData(data);
+      editor.autoId = b3util.refreshTreeDataId(editor.data, editor.firstid);
+      const root = b3util.createFileData(editor.data);
       const treeModel = {
         name: Path.basenameWithoutExt(path),
         root,
+        firstid: editor.firstid ?? 1,
         export: editor.export,
         desc: editor.desc,
       } as TreeModel;
@@ -676,8 +692,6 @@ export const Editor: FC<EditorProps> = ({ onUpdate: updateState, data: editor, .
       fs.writeFileSync(path, JSON.stringify(treeModel, null, 2));
       workspace.updateFileMeta(editor);
       editor.unsave = false;
-      editor.data = createTreeData(root);
-      editor.autoId = b3util.refreshTreeDataId(editor.data);
       editor.graph.changeData(editor.data);
       editor.graph.layout();
       restoreViewport();
@@ -823,7 +837,7 @@ export const Editor: FC<EditorProps> = ({ onUpdate: updateState, data: editor, .
         const data = findDataById(e.item.getID());
         data.output?.forEach((v) => v && highlight.push(v));
       }
-      const changed = findHightlight(findDataById("1"), highlight);
+      const changed = findHightlight(editor.data, highlight);
       changed.forEach((v) => {
         const item = editor.graph.findById(v.id);
         item.draw();

src/components/inspector.tsx

@@ -58,6 +58,7 @@ const TreeInspector: FC = () => {
     form.setFieldValue("name", data.name);
     form.setFieldValue("desc", data.desc);
     form.setFieldValue("export", data.export !== false);
+    form.setFieldValue("firstid", data.firstid);
   }, [workspace.editingTree]);
 
   const finish = (values: any) => {
@@ -66,6 +67,7 @@ const TreeInspector: FC = () => {
         name: values.name,
         desc: values.desc || undefined,
         export: values.export,
+        firstid: Number(values.firstid),
       },
     } as EditTree);
   };
@@ -86,6 +88,9 @@ const TreeInspector: FC = () => {
           <Form.Item name="desc" label={t("tree.desc")}>
             <TextArea autoSize onBlur={form.submit} />
           </Form.Item>
+          <Form.Item name="firstid" label={t("tree.firstid")}>
+            <InputNumber min={1} onBlur={form.submit} />
+          </Form.Item>
           <Form.Item name="export" label={t("tree.export")} valuePropName="checked">
             <Switch onChange={() => form.submit()} />
           </Form.Item>

src/contexts/workspace-context.ts

@@ -47,6 +47,7 @@ export class EditorStore {
   desc: string;
   export: boolean;
   name: string;
+  firstid: number;
 
   autoId: number = 1;
   dragSrcId?: string;
@@ -76,7 +77,8 @@ export class EditorStore {
     this.desc = file.desc ?? "";
     this.export = file.export !== false;
     this.name = file.name || path.slice(0, -5);
-    this.autoId = b3util.refreshTreeDataId(this.data);
+    this.firstid = file.firstid ?? 1;
+    this.autoId = b3util.refreshTreeDataId(this.data, this.firstid);
     this.historyStack.push(b3util.createNode(this.data));
     this.historyIndex = 0;
   }
@@ -492,6 +494,7 @@ export const useWorkspace = create<WorkspaceStore>((set, get) => ({
           data: {
             name: editting.name,
             desc: editting.desc,
+            firstid: editting.firstid,
             root: null!,
           },
         },
@@ -646,6 +649,7 @@ export const useWorkspace = create<WorkspaceStore>((set, get) => ({
           name: editor.name,
           desc: editor.desc,
           export: editor.export,
+          firstid: editor.firstid,
           root: null!,
         },
       },

src/misc/b3type.ts

@@ -29,6 +29,7 @@ export interface TreeModel {
   name: string;
   desc?: string;
   export?: boolean;
+  firstid?: number;
   root: NodeModel;
 }
 

src/misc/b3util.ts

@@ -626,9 +626,10 @@ export const createTreeData = (
 export const createBuildData = (path: string) => {
   try {
     const str = fs.readFileSync(path, "utf8");
-    const treeModel = JSON.parse(str);
+    const treeModel: TreeModel = JSON.parse(str);
     const data = createTreeData(treeModel.root);
-    refreshTreeDataId(data);
+    refreshTreeDataId(data, treeModel.firstid ?? 1);
+    treeModel.name = Path.basenameWithoutExt(path);
     treeModel.root = createFileData(data, true);
     return treeModel as TreeModel;
   } catch (e) {