降级nanoid 为4.0.2

codebdy · Sep 26, 2023 · 2c06cfb · 2c06cfb
1 parent e3c49b3
commit 2c06cfb
Show file tree

Hide file tree

Showing 13 changed files with 106 additions and 51 deletions.
diff --git a/examples/app-designer-example/package.json b/examples/app-designer-example/package.json
@@ -43,6 +43,7 @@
     "@rxdrag/react-fieldy": "workspace:*",
     "@rxdrag/react-antd-shell": "workspace:*",
     "@rxdrag/react-locales": "workspace:*",
+    "@rxdrag/core": "workspace:*",
     "@rxdrag/react-core": "workspace:*",
     "@rxdrag/react-antd-materials": "workspace:*",
     "@rxdrag/locales": "workspace:*",

diff --git a/...es/app-designer-example/src/FrontendDesigner/BottomConsole/FlowDesigner/ComponentTree.tsx b/...es/app-designer-example/src/FrontendDesigner/BottomConsole/FlowDesigner/ComponentTree.tsx
@@ -1,46 +1,77 @@
 import { Tree } from "antd";
-import { DataNode, DirectoryTreeProps } from "antd/es/tree";
-import { memo } from "react"
+import { DataNode } from "antd/es/tree";
+import { memo, useCallback, useMemo } from "react"
 import { TreeContainer } from "../common/TreeContainer";
+import { useModule } from "../../hooks/useModule";
+import { useDesignerEngine, useGetNode } from "@rxdrag/react-core";
+import { ITreeNode } from "@rxdrag/core"
+import { IControllerMeta } from "@rxdrag/minions-runtime-react";
 
 const { DirectoryTree } = Tree;
 
-const treeData: DataNode[] = [
-  {
-    title: '字段1',
-    key: '0-0',
-    children: [
-      {
-        title: '列表',
-        key: '0-1',
-        children: [
-          { title: 'leaf 1-0', key: '0-1-0', isLeaf: true },
-          { title: 'leaf 1-1', key: '0-1-1', isLeaf: true },
-        ],
-      },
-    ],
-  },
-  {
-    title: '字段2',
-    key: 'vars',
-  }
-
-];
-
+export type ReactionableNode = {
+  node: ITreeNode<unknown, IControllerMeta>,
+  children?: ReactionableNode[]
+}
 
 export const ComponentTree = memo(() => {
-  const onSelect: DirectoryTreeProps['onSelect'] = (keys, info) => {
-    console.log('Trigger Select', keys, info);
-  };
+  const module = useModule()
+  const engine = useDesignerEngine()
+  const docs = engine?.getAllDocuments()
+  const getNode = useGetNode()
+  console.log("===>ComponentTree", module, docs)
+
+  const getReactionableSchemas = useCallback((node: ITreeNode<unknown, IControllerMeta>) => {
+    const nodes: ReactionableNode[] = []
+    let activeNodes = nodes
+    if (node.meta["x-controller"]?.id) {
+      const rNode: ReactionableNode = {
+        node: node,
+        children: []
+      }
+      nodes.push(rNode)
+      activeNodes = rNode.children || []
+    }
+
+    for (const childId of node.children) {
+      const child = getNode(childId)
+      if (child) {
+        const children = getReactionableSchemas(child as ITreeNode<unknown, IControllerMeta>)
+        activeNodes.push(...children)
+      }
+    }
+    return nodes
+  }, [getNode])
+
+  const getSchemaTreeOfView = useCallback((id: string) => {
+    const doc = docs?.find(doc => doc.id === id)
+    const rootNode = doc?.getRootNode()
+    if (rootNode) {
+      return getReactionableSchemas(rootNode as ITreeNode<unknown, IControllerMeta>)
+    }
+
+  }, [docs, getReactionableSchemas])
+
+  const getOneNode = useCallback((rNode: ReactionableNode): DataNode => {
+    return {
+      key: rNode.node.id,
+      title: rNode.node.meta?.["x-controller"]?.name || rNode.node.title,
+      children: rNode.children?.map(child => getOneNode(child))
+    }
+  }, [])
+
+  const treeData: DataNode[] = useMemo(() => {
+    return module?.views?.map(view => ({
+      key: view.id,
+      title: view.title,
+      children: getSchemaTreeOfView(view.id)?.map(schema => getOneNode(schema)),
+    })) || []
+  }, [getOneNode, getSchemaTreeOfView, module?.views])
 
-  const onExpand: DirectoryTreeProps['onExpand'] = (keys, info) => {
-    console.log('Trigger Expand', keys, info);
-  };
   return (
     <TreeContainer>
       <DirectoryTree
-        onSelect={onSelect}
-        onExpand={onExpand}
+        selectable={false}
         treeData={treeData}
       />
     </TreeContainer>

diff --git a/...ples/app-designer-example/src/FrontendDesigner/ModuleUiDesigner/ModuleUiDesignerInner.tsx b/...ples/app-designer-example/src/FrontendDesigner/ModuleUiDesigner/ModuleUiDesignerInner.tsx
@@ -8,6 +8,7 @@ import { TabsProps } from "antd"
 import styled from "styled-components"
 import { FlowDesigner } from "../BottomConsole/FlowDesigner"
 import { ScriptDesigner } from "../BottomConsole/ScriptDesigner"
+import { ModuleContext } from "../contexts"
 
 const Label = styled.div`
   display: flex;
@@ -52,16 +53,20 @@ export const ModuleUiDesignerInner = memo(() => {
   }, [])
 
   return (
-    module
-      ? <ZoomableEditor
-        toolbox={
-          Toolbox && <Toolbox />
-        }
-        schemas={module?.views}
-        bottomConsole={{
-          items
-        }}
-      />
-      : <></>
+    <ModuleContext.Provider value={module}>
+      {
+        module
+          ? <ZoomableEditor
+            toolbox={
+              Toolbox && <Toolbox />
+            }
+            schemas={module?.views}
+            bottomConsole={{
+              items
+            }}
+          />
+          : <></>
+      }
+    </ModuleContext.Provider>
   )
 })
diff --git a/examples/app-designer-example/src/FrontendDesigner/contexts.ts b/examples/app-designer-example/src/FrontendDesigner/contexts.ts
@@ -0,0 +1,4 @@
+import { createContext } from "react";
+import { IModule } from "../interfaces/module";
+
+export const ModuleContext = createContext<IModule | undefined>(undefined)
diff --git a/examples/app-designer-example/src/FrontendDesigner/hooks/useModule.ts b/examples/app-designer-example/src/FrontendDesigner/hooks/useModule.ts
@@ -0,0 +1,6 @@
+import { useContext } from "react";
+import { ModuleContext } from "../contexts";
+
+export function useModule() {
+  return useContext(ModuleContext)
+}
diff --git a/examples/app-designer-example/src/data/mudules.ts b/examples/app-designer-example/src/data/mudules.ts
@@ -87,10 +87,12 @@ export const defaultModules: { [device: string]: IModule[] | undefined } = {
       title: "用户管理",
       views: [
         {
+          id: "user-index",
           title: "入口页",
           schema: userList,
         },
         {
+          id: "user-edit",
           title: "编辑对话框",
           schema: rootNodeSchema,
         }
@@ -111,10 +113,12 @@ export const defaultModules: { [device: string]: IModule[] | undefined } = {
       title: "用户管理(h5)",
       views: [
         {
+          id: "h5-user-index",
           title: "入口页(h5)",
           schema: rootNodeSchema,
         },
         {
+          id: "h5-user-eidit",
           title: "编辑对话框",
           schema: rootNodeSchema,
         }
@@ -135,10 +139,12 @@ export const defaultModules: { [device: string]: IModule[] | undefined } = {
       title: "用户管理(门户)",
       views: [
         {
+          id: "website-user-index",
           title: "入口页(门户)",
           schema: rootNodeSchema,
         },
         {
+          id: "weibsite-user-edit",
           title: "编辑对话框",
           schema: rootNodeSchema,
         }
@@ -159,10 +165,12 @@ export const defaultModules: { [device: string]: IModule[] | undefined } = {
       title: "用户管理(大屏)",
       views: [
         {
+          id: "lg-user-index",
           title: "入口页(大屏)",
           schema: rootNodeSchema,
         },
         {
+          id: "lg-user-edit",
           title: "编辑对话框",
           schema: rootNodeSchema,
         }

diff --git a/packages/minions/editor/controller-editor/package.json b/packages/minions/editor/controller-editor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rxdrag/minions-controller-editor",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "type": "module",
   "module": "index.ts",
   "files": [

diff --git a/packages/minions/editor/logicflow-editor/package.json b/packages/minions/editor/logicflow-editor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rxdrag/minions-logicflow-editor",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "module": "index.ts",
   "files": [
     "dist"

diff --git a/packages/minions/runtime/activities/package.json b/packages/minions/runtime/activities/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rxdrag/minions-activities",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "author": "Water.Li",
   "module": "index.ts",
   "files": [

diff --git a/packages/minions/runtime/runtime-core/package.json b/packages/minions/runtime/runtime-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rxdrag/minions-runtime",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "author": "Water.Li",
   "module": "index.ts",
   "files": [

diff --git a/packages/minions/runtime/runtime-react/package.json b/packages/minions/runtime/runtime-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rxdrag/minions-runtime-react",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "module": "index.ts",
   "files": [
     "dist"

diff --git a/packages/rxdrag/schema/src/index.ts b/packages/rxdrag/schema/src/index.ts
@@ -38,7 +38,7 @@ export enum ViewType {
 //一个document schema对应一个场景
 export interface IViewSchema<Field = unknown, NodeController = unknown> {
   schema: INodeSchema<Field, NodeController>,
-  id?: string,
+  id: string,
   title?: string,
   //视图类型，用于同一画布编辑多个document
   viewType?: ViewType,

diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rxdrag/shared",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "author": "Water.Li",
   "module": "index.ts",
   "files": [
@@ -24,6 +24,6 @@
   },
   "dependencies": {
     "lodash": "^4.17.21",
-    "nanoid": "^5.0.1"
+    "nanoid": "4.0.2"
   }
 }