Merge pull request #205 from codebdy/add-yup-validation

Add yup validation

Author: codebdy

apps/example-antd5/package.json

@@ -28,8 +28,14 @@
     "@rxdrag/shared": "workspace:*",
     "@rxdrag/minions-runtime-react": "workspace:*",
     "@rxdrag/controller-editor-antd5": "workspace:*",
+    "@rxdrag/react-antd-shell-inline": "workspace:*",
+    "example-common": "workspace:*",
+    "controller-editor-example": "workspace:*",
+    "logicflow-editor-example": "workspace:*",
+    "inline-editor-example": "workspace:*",
     "antd": "^5.6.2",
     "axios": "^1.4.0",
+    "styled-components": "^5.3.9",
     "classnames": "^2.3.2",
     "mockjs": "^1.1.0",
     "react": "^18.2.0",
@@ -45,8 +51,9 @@
     "@types/react-dom": "^18.0.11",
     "@vitejs/plugin-react": "^3.1.0",
     "@types/lodash": "^4.14.191",
+    "@types/styled-components": "^5.1.26",
     "typescript": "^4.9.3",
     "vite": "^4.2.0",
     "vite-plugin-require-transform": "^1.0.9"
   }
-}
+}

apps/example-antd5/src/App.tsx

@@ -2,11 +2,15 @@ import { Routes, Route } from 'react-router-dom';
 import './App.css';
 import { IFrameCanvasRender } from '@rxdrag/react-core';
 import { IFramePreviewRender } from "@rxdrag/react-antd-shell"
-import { usePredefinedComponents } from './hooks/usePredefinedComponents';
-import { Antd5Example } from './Antd5Example';
+import { Antd5Example } from './normal/Antd5Example';
 import { useMemo } from 'react';
-import { controllerDefines } from 'controller/defines';
 import { ControllerFactories } from '@rxdrag/react-runner';
+import { controllerDefines } from 'normal/controller/defines';
+import { usePredefinedComponents } from 'normal/hooks/usePredefinedComponents';
+import { routes } from 'example-common';
+import { InlineEditorExample } from "inline-editor-example";
+import { LogicflowEditorExample } from "logicflow-editor-example";
+import { ControllerEditorExample } from "controller-editor-example";
 
 function App() {
   const { designers, components } = usePredefinedComponents()
@@ -22,15 +26,21 @@ function App() {
 
   return (
     <Routes>
-      <Route path={'/'} element={<Antd5Example />}>
+      <Route path={routes.index} element={<Antd5Example />}>
+      </Route>
+      <Route path={routes.inline} element={<InlineEditorExample />}>
+      </Route>
+      <Route path={routes.controller} element={<ControllerEditorExample />}>
+      </Route>
+      <Route path={routes.logicflow} element={<LogicflowEditorExample />}>
       </Route>
       <Route path={'/canvas-render'} element={<IFrameCanvasRender designers={designers} />}>
       </Route>
       <Route path={'/preview-render'} element={<IFramePreviewRender components={components} controllerFactories={controllerFactories} />}>
       </Route>
     </Routes>
 
-  );
+  );//
 }
 
 export default App;

apps/example-antd5/src/Antd5Example.tsx renamed to apps/example-antd5/src/normal/Antd5Example.tsx

@@ -13,14 +13,15 @@ import {
   historyIcon,
   outlineIcon,
 } from "@rxdrag/react-antd-shell"
-import { toolsLocales } from "./locales"
+import { toolsLocales } from "../locales"
 import { ResourceWidget } from "./ResourceWidget"
 import { SaveButton } from "./widgets/SaveButton"
 import { PagesWidget } from "./PagesWidget"
 import { pages } from "./data"
-import { minionsLocales } from "controller/locales"
-import { minionsMaterialCategories } from "controller/materials"
-import { controllerDefines } from "controller/defines"
+import { minionsLocales } from "normal/controller/locales"
+import { minionsMaterialCategories } from "normal/controller/materials"
+import { controllerDefines } from "normal/controller/defines"
+import { MenuButton } from "example-common"
 
 export enum LeftNavType {
   pages = "pages",
@@ -69,7 +70,9 @@ export const Antd5Example = memo(() => {
       }
       topBar={
         <>
-          <Logo />
+          <Space>
+            <Logo />
+          </Space>
           <Space>
             <ThemeButton />
             <LangButtons />
@@ -79,6 +82,7 @@ export const Antd5Example = memo(() => {
               icon={<GithubFilled />}
             > Github</Button>
             <SaveButton />
+            <MenuButton />
           </Space>
         </>
       }

apps/example-antd5/src/PagesWidget/index.tsx renamed to apps/example-antd5/src/normal/PagesWidget/index.tsx

@@ -1,6 +1,6 @@
 import { ComponentResourceWidget, PaneContainer, TemplateResourceWidget } from "@rxdrag/react-antd-shell"
 import { useSettersTranslate, useRegisterComponentMaterial } from "@rxdrag/react-core"
-import { materials, fields } from "materials"
+import { materials, fields } from "normal/materials"
 import { memo, useEffect } from "react"
 import { FieldMaterial } from "@rxdrag/react-antd-materials"
 import { ResourceCollapsePanel } from "./ResourceCollapsePanel"

apps/example-antd5/src/normal/README.md

@@ -1,6 +1,6 @@
 import { useSettersTranslate } from "@rxdrag/react-core"
 import { Form, Input, Select } from "antd"
-import { ActionType, IShortcutControllerMeta } from "controller/shortcuts/IShortcutControllerMeta"
+import { ActionType, IShortcutControllerMeta } from "normal/controller/shortcuts/IShortcutControllerMeta"
 import { memo, useCallback } from "react"
 
 export const ShortcutControllerSetter = memo((props: {

apps/example-antd5/src/ResourceWidget/ResourceCollapsePanel.tsx renamed to apps/example-antd5/src/normal/ResourceWidget/ResourceCollapsePanel.tsx

@@ -4,8 +4,8 @@ import { logicFlowLocales } from "./locales/logicflow";
 import { scriptLocales } from "./locales/script";
 import { ShortcutControllerSetter } from "./ShortcutControllerSetter";
 import { LogicFlowControllerSetter, ScriptControllerSetter } from "@rxdrag/react-antd-shell";
-import { ShortcutControllerFactory } from "controller/shortcuts";
 import { IControllerDefine } from "@rxdrag/react-antd-shell";
+import { ShortcutControllerFactory } from "../shortcuts";
 
 export const controllerDefines: IControllerDefine[] = [
   {

apps/example-antd5/src/ResourceWidget/ResourcesTitle.tsx renamed to apps/example-antd5/src/normal/ResourceWidget/ResourcesTitle.tsx

@@ -142,7 +142,15 @@
                       },
                       "x-field": {
                         "type": "normal",
-                        "name": "age"
+                        "name": "age",
+                        "validateRules": {
+                          "rules": {
+                            "required": {
+                              "value": true
+                            }
+                          },
+                          "required": true
+                        }
                       },
                       "slots": {},
                       "children": [
@@ -163,7 +171,18 @@
                       },
                       "x-field": {
                         "type": "normal",
-                        "name": "name"
+                        "name": "name",
+                        "validateRules": {
+                          "rules": {
+                            "required": {
+                              "value": true
+                            }
+                          },
+                          "type": {
+                            "value": "email"
+                          },
+                          "required": true
+                        }
                       },
                       "slots": {},
                       "children": [

apps/example-antd5/src/ResourceWidget/index.tsx renamed to apps/example-antd5/src/normal/ResourceWidget/index.tsx

@@ -1,5 +1,5 @@
 import { IComponentMaterial } from "@rxdrag/react-core";
-import { News } from "components/business/News";
+import { News } from "normal/components/business/News";
 import { newsIcon } from "./icon";
 import { newsLocales, newsResourceLocales } from "./locales";
 import { newsSchema } from "./schema";

apps/example-antd5/src/ResourceWidget/style.less renamed to apps/example-antd5/src/normal/ResourceWidget/style.less

@@ -1,8 +1,8 @@
 import { IComponentMaterial } from "@rxdrag/react-core";
-import { Notices } from "components/business/Notices";
 import { noticesIcon } from "./icon";
 import { noticesLocales, noticesResourceLocales } from "./locales";
 import { noticesSchema } from "./schema";
+import { Notices } from "normal/components/business/Notices";
 
 const name = "Notices"
 export const NoticesMaterial: IComponentMaterial = {

apps/example-antd5/src/components/business/News/index.tsx renamed to apps/example-antd5/src/normal/components/business/News/index.tsx

@@ -1,5 +1,5 @@
 import { IComponentMaterial } from "@rxdrag/react-core";
-import { RightAd } from "components/business/RightAd";
+import { RightAd } from "normal/components/business/RightAd";
 import { rightAdIcon } from "./icon";
 import { rightAdLocales, rightAdResourceLocales } from "./locales";
 import { rightAdSchema } from "./schema";

apps/example-antd5/src/components/business/News/style.less renamed to apps/example-antd5/src/normal/components/business/News/style.less

@@ -19,6 +19,6 @@
     //"target": "ES5",
     "experimentalDecorators": true
   },
-  "include": ["src"],
+  "include": ["src", "../../examples/example-common/src/index.ts"],
   "references": [{ "path": "./tsconfig.node.json" }]
 }

apps/example-antd5/src/components/business/Notices/index.tsx renamed to apps/example-antd5/src/normal/components/business/Notices/index.tsx

@@ -0,0 +1,4 @@
+{
+  "root": true,
+  "extends": ["@rxdrag/eslint-config-custom"]
+}

apps/example-antd5/src/components/business/RightAd/index.tsx renamed to apps/example-antd5/src/normal/components/business/RightAd/index.tsx

@@ -0,0 +1 @@
+export * from './src';

apps/example-antd5/src/controller/defines/ShortcutControllerSetter.tsx renamed to apps/example-antd5/src/normal/controller/defines/ShortcutControllerSetter.tsx

@@ -1,12 +1,37 @@
 {
   "name": "controller-editor-example",
+  "version": "0.3.0",
   "private": true,
-  "version": "0.2.3",
-  "type": "module",
+  "module": "index.ts",
+  "files": [
+    "dist"
+  ],
+  "publishConfig": {
+    "module": "dist/index.mjs",
+    "typings": "dist/index.d.ts",
+    "access": "public"
+  },
   "scripts": {
-    "dev": "vite",
-    "build": "tsc && vite build",
-    "preview": "vite preview"
+    "lint": "eslint . --ext .ts,tsx",
+    "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist",
+    "build": "vite build"
+  },
+  "devDependencies": {
+    "@types/react": "^18.0.28",
+    "@types/react-dom": "^18.0.11",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "eslint": "^7.32.0",
+    "@rxdrag/eslint-config-custom": "workspace:*",
+    "@rxdrag/tsconfig": "workspace:*",
+    "@types/styled-components": "^5.1.26",
+    "vite-tsconfig-paths": "^4.0.7",
+    "web-vitals": "^3.3.0"
+  },
+  "peerDependencies": {
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "react-router-dom": "^6.8.1"
   },
   "dependencies": {
     "@ant-design/icons": "^4.8.0",
@@ -18,22 +43,12 @@
     "@rxdrag/minions-react-materials": "workspace:*",
     "@rxdrag/minions-schema": "workspace:*",
     "@rxdrag/react-fieldy": "workspace:*",
+    "example-common": "workspace:*",
     "antd": "^5.6.2",
     "classnames": "^2.3.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-router-dom": "^6.9.0",
-    "styled-components": "^5.3.9",
-    "vite-tsconfig-paths": "^4.0.7",
-    "web-vitals": "^3.3.0"
-  },
-  "devDependencies": {
-    "@rxdrag/tsconfig": "workspace:*",
-    "@types/react": "^18.0.28",
-    "@types/react-dom": "^18.0.11",
-    "@vitejs/plugin-react": "^3.1.0",
-    "typescript": "^4.9.3",
-    "vite": "^4.2.0",
-    "vite-plugin-require-transform": "^1.0.9"
+    "styled-components": "^5.3.9"
   }
-}
+}