From 3469d2d1b365c9459dc3eb3240456d716a485e09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=87=AA=E5=B8=A6=E5=A4=A7=E4=BD=AC=E6=B0=94=E5=9C=BA?= <188633308@qq.com> Date: Tue, 13 Jul 2021 15:37:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?update=20=E5=BC=80=E5=8F=91=E6=96=87?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web-react/package.json | 1 - web-react/public/doc-code/auth/index.js | 43 ----- web-react/public/doc-code/auth/index.txt | 51 ++++++ web-react/public/doc-code/util/dic/index.js | 10 ++ web-react/public/doc-code/util/query/index.js | 32 ++++ .../src/pages/system/doc/back-end/index.jsx | 76 ++++----- .../pages/system/doc/front-end/auth/index.jsx | 4 +- .../src/pages/system/doc/front-end/index.jsx | 144 +++++++++-------- .../pages/system/doc/front-end/seed/index.jsx | 70 +++++++++ .../pages/system/doc/front-end/util/dict.jsx | 22 +++ .../pages/system/doc/front-end/util/file.jsx | 90 +++++++++++ .../system/doc/front-end/util/format.jsx | 39 +++++ .../system/doc/front-end/util/global.jsx | 54 +++++++ .../pages/system/doc/front-end/util/index.jsx | 21 +++ .../pages/system/doc/front-end/util/query.jsx | 119 ++++++++++++++ .../src/pages/system/doc/highlighter.jsx | 26 +++- web-react/src/pages/system/doc/index.jsx | 6 +- web-react/src/util/global/index.js | 2 +- web-react/yarn.lock | 147 +----------------- 19 files changed, 648 insertions(+), 309 deletions(-) delete mode 100644 web-react/public/doc-code/auth/index.js create mode 100644 web-react/public/doc-code/auth/index.txt create mode 100644 web-react/public/doc-code/util/dic/index.js create mode 100644 web-react/public/doc-code/util/query/index.js create mode 100644 web-react/src/pages/system/doc/front-end/seed/index.jsx create mode 100644 web-react/src/pages/system/doc/front-end/util/dict.jsx create mode 100644 web-react/src/pages/system/doc/front-end/util/file.jsx create mode 100644 web-react/src/pages/system/doc/front-end/util/format.jsx create mode 100644 web-react/src/pages/system/doc/front-end/util/global.jsx create mode 100644 web-react/src/pages/system/doc/front-end/util/index.jsx create mode 100644 web-react/src/pages/system/doc/front-end/util/query.jsx diff --git a/web-react/package.json b/web-react/package.json index 73a3d85..e486365 100644 --- a/web-react/package.json +++ b/web-react/package.json @@ -29,7 +29,6 @@ "react-router": "^5.2.0", "react-router-dom": "^5.2.0", "react-scripts": "4.0.3", - "react-syntax-highlighter": "^15.4.3", "redux": "^4.1.0", "swiper": "^6.7.0", "web-vitals": "^1.0.1" diff --git a/web-react/public/doc-code/auth/index.js b/web-react/public/doc-code/auth/index.js deleted file mode 100644 index a418d08..0000000 --- a/web-react/public/doc-code/auth/index.js +++ /dev/null @@ -1,43 +0,0 @@ -import { Auth } from 'components' -import auth from 'components/authorized/handler' - -/** - * 简单的权限标识 - */ -function foo1() { - return - 连接 - -} - -/** - * 多个并且关系的权限标识 - */ -function foo2() { - return - 连接 - -} - -/** - * 多个或者关系的权限标识 - */ -function foo3() { - return - 连接 - -} - -/** - * 前缀简化 - */ -function foo4() { - return - 连接 - -} - -/** - * 纯js - */ -const flag = auth('permissions:name') // => Boolean \ No newline at end of file diff --git a/web-react/public/doc-code/auth/index.txt b/web-react/public/doc-code/auth/index.txt new file mode 100644 index 0000000..5e10e0b --- /dev/null +++ b/web-react/public/doc-code/auth/index.txt @@ -0,0 +1,51 @@ +import { Auth } from 'components' +import auth from 'components/authorized/handler' + +/** + * 简单的权限标识 + */ +function foo1() { + return ( + + 连接 + + ) +} + +/** + * 多个并且关系的权限标识 + */ +function foo2() { + return ( + + 连接 + + ) +} + +/** + * 多个或者关系的权限标识 + */ +function foo3() { + return ( + + 连接 + + ) +} + +/** + * 前缀简化 + */ +function foo4() { + return ( + + 连接 + + ) +} + +/** + * 纯js + */ +const flag = auth('permissions:name') // => Boolean diff --git a/web-react/public/doc-code/util/dic/index.js b/web-react/public/doc-code/util/dic/index.js new file mode 100644 index 0000000..da683c1 --- /dev/null +++ b/web-react/public/doc-code/util/dic/index.js @@ -0,0 +1,10 @@ +import getDictData from 'util/dic' + +async function foo() { + const code = await getDictData('dic_code_one', 'dic_code_two') + // => + // code = { + // dicCodeOne: [], + // dicCodeTwo: [], + // } +} \ No newline at end of file diff --git a/web-react/public/doc-code/util/query/index.js b/web-react/public/doc-code/util/query/index.js new file mode 100644 index 0000000..24bffbc --- /dev/null +++ b/web-react/public/doc-code/util/query/index.js @@ -0,0 +1,32 @@ +import { QueryType, getSearchDateRange, getSearchInfo } from 'util/query' + +getSearchInfo({ + query: { + value: '123', + text: '123', + code: 'abc', + check: ['1', '2', '3'], + range: [1, 10], + dateRange: getSearchDateRange(['2021-01-01', '2021-01-10']) + }, + queryType: { + text: QueryType.Equal, + code: QueryType.Like, + check: QueryType.Equal, + range: [QueryType.GreaterThanOrEqual, QueryType.LessThan], + dateRange: [QueryType.GreaterThanOrEqual, QueryType.LessThan] + } +}) + +// => + +[ + { field: 'value', value: ['123'] }, + { field: 'text', value: ['123'], type: '=' }, + { field: 'code', value: ['abc'], type: 'like' }, + { field: 'check', value: ['1', '2', '3'], type: '=' }, + { field: 'range', value: [1], type: '>=' }, + { field: 'range', value: [10], type: '<' }, + { field: 'dateRange', value: ['2021-01-01'], type: '>=' }, + { field: 'dateRange', value: ['2021-01-11'], type: '<' } +] \ No newline at end of file diff --git a/web-react/src/pages/system/doc/back-end/index.jsx b/web-react/src/pages/system/doc/back-end/index.jsx index f8a493e..a6ba47f 100644 --- a/web-react/src/pages/system/doc/back-end/index.jsx +++ b/web-react/src/pages/system/doc/back-end/index.jsx @@ -4,6 +4,8 @@ import { Container } from 'components' import Database from './database' import DatabaseMigrations from './database/migrations' +const { Title, Link } = Typography + const docs = [ { title: '数据库', @@ -34,64 +36,63 @@ export default class index extends Component { - + - + - + - +
- {docs.map((item, i) => ( - - -
- - {item.title} - + + {docs.map((item, i) => ( + +
+ {item.title} {item.component && ( )} - {item.children && - item.children.map((citem, ci) => ( - -
- - {citem.title} - - {citem.component && ( - - )} -
-
- - ))} + {item.children && ( + <> +
+
+ {item.children.map((citem, ci) => ( + +
+ + {citem.title} + + {citem.component && ( + + )} +
+
+ + ))} + + )}
- -
- - ))} +
+ + ))} + + {this.props.supportInfo} diff --git a/web-react/src/pages/system/doc/front-end/auth/index.jsx b/web-react/src/pages/system/doc/front-end/auth/index.jsx index 55cd071..977f6e5 100644 --- a/web-react/src/pages/system/doc/front-end/auth/index.jsx +++ b/web-react/src/pages/system/doc/front-end/auth/index.jsx @@ -12,7 +12,7 @@ export default class index extends Component { 在不少业务组件中，时常需要做到权限控制一些按钮的显示隐藏。如果只使用样式来隐藏按钮，是不安全的。 所以在本框架中，推荐将按钮用全局的权限组件包裹来控制是否渲染。 - + 权限标识会读取全局用户信息中的 @@ -20,7 +20,7 @@ export default class index extends Component { 进行比对。 - 权限组件插槽内的可以是任何元素，只要不符合条件，将不会渲染。 + 权限组件内可以是任何元素，只要不符合条件，将不会渲染。 ) } diff --git a/web-react/src/pages/system/doc/front-end/index.jsx b/web-react/src/pages/system/doc/front-end/index.jsx index 52c373e..3a73e9c 100644 --- a/web-react/src/pages/system/doc/front-end/index.jsx +++ b/web-react/src/pages/system/doc/front-end/index.jsx @@ -11,47 +11,55 @@ import Api from './api' import ApiSetting from './api/setting' import ApiUsage from './api/usage' -import Auth from './auth/index.jsx' +import Auth from './auth' + +import Seed from './seed' + +import Util from './util' +import UtilDict from './util/dict' +import UtilGlobal from './util/global' +import UtilFormat from './util/format' +import UtilFile from './util/file' +import UtilQuery from './util/query' + +const { Title, Link } = Typography const docs = [ { title: '窗口', component: Window, children: [ - { - title: '打开窗口', - component: WindowOpen, - }, - { - title: '关闭窗口', - component: WindowClose, - }, - { - title: '重新加载窗口', - component: WindowReload, - }, + { title: '打开窗口', component: WindowOpen }, + { title: '关闭窗口', component: WindowClose }, + { title: '重新加载窗口', component: WindowReload }, ], }, { title: '接口', component: Api, children: [ - { - title: '配置', - component: ApiSetting, - }, - { - title: '调用', - component: ApiUsage, - }, + { title: '配置', component: ApiSetting }, + { title: '调用', component: ApiUsage }, ], }, { title: '权限渲染', component: Auth, }, + { + title: '种子模版', + component: Seed, + }, { title: '工具', + component: Util, + children: [ + { title: '读取字典', component: UtilDict }, + { title: '全局常量', component: UtilGlobal }, + { title: '字符串格式转化', component: UtilFormat }, + { title: '文件', component: UtilFile }, + { title: '查询相关', component: UtilQuery }, + ], }, ] @@ -66,22 +74,19 @@ export default class index extends Component { return (
- + - + - + - @@ -90,10 +95,10 @@ export default class index extends Component { width="128" alt="" /> - + - @@ -102,75 +107,75 @@ export default class index extends Component { width="128" alt="" /> - + - + - + - + - + - + - +
- {docs.map((item, i) => ( - - -
- - {item.title} - + + {docs.map((item, i) => ( + +
+ {item.title} {item.component && ( )} - {item.children && - item.children.map((citem, ci) => ( - -
- - {citem.title} - - {citem.component && ( - - )} -
-
- - ))} + {item.children && ( + <> +
+
+ {item.children.map((citem, ci) => ( + +
+ + {citem.title} + + {citem.component && ( + + )} +
+
+ + ))} + + )}
- -
- - ))} +
+ + ))} + + {this.props.supportInfo}
diff --git a/web-react/src/pages/system/doc/front-end/seed/index.jsx b/web-react/src/pages/system/doc/front-end/seed/index.jsx new file mode 100644 index 0000000..376d87b --- /dev/null +++ b/web-react/src/pages/system/doc/front-end/seed/index.jsx @@ -0,0 +1,70 @@ +import React, { Component } from 'react' +import { Space, Tag, Typography } from 'antd' + +const { Title, Text } = Typography + +export default class index extends Component { + render() { + return ( + + + 种子模版已经提供了业务组件通用的架构，可以在{' '} + + /seed + + 中获取架构代码。 + + 模版解释 +
    +
  • + /seed/query-table/index.jsx + 通用查询表格模版。 +
    • +
  • + /seed/query-table-form/form.jsx + 简单的编辑弹出框内表单，配合外部使用 + + modal-form + + 。 +
    • +
  • + /seed/form +
      +
    • + /index.jsx + 大型表单主页。可在此调用数据详情接口并分配给各个分片表单，统合分片表单。 +
      • +
    • + /part.jsx + 大型表单分片。主要考虑到一个文件中维护的表单字段过多，所以在此拆分。 +
      • +
    +
    • +
  • + /seed/form-tabe +
      +
    • + /index.jsx + 大型标签页-表单主页。可在此调用数据详情接口并分配给各个标签页及以下分片表单。 +
      • +
    • + /tab +
        +
      • + /index.jsx + 单个标签页内主页，在此统合分片表单并传递数据。 +
        • +
      • + /part.jsx + 大型表单分片。同上。 +
        • +
      +
      • +
    +
    • +
+ + ) + } +} diff --git a/web-react/src/pages/system/doc/front-end/util/dict.jsx b/web-react/src/pages/system/doc/front-end/util/dict.jsx new file mode 100644 index 0000000..be5892d --- /dev/null +++ b/web-react/src/pages/system/doc/front-end/util/dict.jsx @@ -0,0 +1,22 @@ +import React, { Component } from 'react' +import { Space, Tag, Typography } from 'antd' +import Highlighter from 'pages/system/doc/highlighter' + +const { Text } = Typography + +export default class dict extends Component { + render() { + return ( + + + /dic + getDictData + + + 通过传入字典编码快速查找并返回字典数据。默认从Redux中读取，如果Redux中不存在，则会调用接口从数据库获取。需要注意的是，获取字典所需的是下划线形式的编码，而返回的字典JSON中键名称必定为驼峰形式。 + + + + ) + } +} diff --git a/web-react/src/pages/system/doc/front-end/util/file.jsx b/web-react/src/pages/system/doc/front-end/util/file.jsx new file mode 100644 index 0000000..ef74d07 --- /dev/null +++ b/web-react/src/pages/system/doc/front-end/util/file.jsx @@ -0,0 +1,90 @@ +import React, { Component } from 'react' +import { Space, Tag, Typography } from 'antd' + +const { Text } = Typography + +export default class file extends Component { + render() { + return ( + + + /file + +
    +
  • +

    + ArrayBufferToBase64 + (arrayBuffer: ArrayBuffer) => String + ArrayBuffer转成Base64。 +

    +
    • +
  • +

    + ArrayBufferToBlob + (arrayBuffer: ArrayBuffer) => Blob + ArrayBuffer转成Blob。 +

    +
    • +
  • +

    + Base64ToBlob + (base64: String) => Blob + Base64转成Blob。 +

    +
    • +
  • +

    + BlobToBase64 + (blob: Blob) => String + Blob转成Base64。 +

    +
    • +
  • +

    + BlobToFile + + (blob: Blob, fileName: String, fileType: String) => File + + Blob转成File对象。 +

    +
    • +
  • +

    + Base64ToFile + (base64: String, fileName: String) => File + Base64转成File对象。 +

    +
    • +
  • +

    + PreviewFileResponse + (id: String) => Response + 根据文件ID从接口获取文件信息。 +

    +
    • +
  • +

    + PreviewFileArrayBuffer + (id: String) => ArrayBuffer + 根据文件ID从接口获取文件ArrayBuffer。 +

    +
    • +
  • +

    + PreviewFileBase64 + (id: String) => String + 根据文件ID从接口获取文件Base64。 +

    +
    • +
  • +

    + PreviewFile + (id: String) => File + 根据文件ID从接口获取文件对象。 +

    +
    • +
+ + ) + } +} diff --git a/web-react/src/pages/system/doc/front-end/util/format.jsx b/web-react/src/pages/system/doc/front-end/util/format.jsx new file mode 100644 index 0000000..9aa3b2c --- /dev/null +++ b/web-react/src/pages/system/doc/front-end/util/format.jsx @@ -0,0 +1,39 @@ +import React, { Component } from 'react' +import { Space, Tag, Typography } from 'antd' + +const { Text } = Typography + +export default class format extends Component { + render() { + return ( + + + /format + +
    +
  • +

    + numberToChinese + (number: [Number, String]) => String + 将数字转换为中文数字。 +

    +
    • +
  • +

    + toCamelCase + (str: String) => String + 下划线转驼峰。 +

    +
    • +
  • +

    + toUnderScoreCase + (str: String) => String + 驼峰转下划线。 +

    +
    • +
+ + ) + } +} diff --git a/web-react/src/pages/system/doc/front-end/util/global.jsx b/web-react/src/pages/system/doc/front-end/util/global.jsx new file mode 100644 index 0000000..2dddacb --- /dev/null +++ b/web-react/src/pages/system/doc/front-end/util/global.jsx @@ -0,0 +1,54 @@ +import React, { Component } from 'react' +import { Space, Tag, Typography } from 'antd' + +const { Text } = Typography + +export default class global extends Component { + render() { + return ( + + + /global + +
    +
  • +

    + EMPTY_ID + 一个空GUID字符串，一般用于判断树节点的顶层。 +

    +
    • +
  • +

    + PERVIEW_URL + 文件预览地址，只在文件预览接口开放匿名后可以直接通过src引用。 +

    +
    • +
  • +

    + RSA_PUBLIC_KEY + 前后端非对称加密的公钥。 +

    +
    • +
  • +

    + AMAP_WEBAPI_KEY + 高德地图Webapi所使用的key。 +

    +
    • +
  • +

    + CITY + 城市名称，一般用于地图定位城市。 +

    +
    • +
  • +

    + SIDER_BREAK_POINT + 响应式小屏幕响应宽度。 +

    +
    • +
+ + ) + } +} diff --git a/web-react/src/pages/system/doc/front-end/util/index.jsx b/web-react/src/pages/system/doc/front-end/util/index.jsx new file mode 100644 index 0000000..47b336b --- /dev/null +++ b/web-react/src/pages/system/doc/front-end/util/index.jsx @@ -0,0 +1,21 @@ +import React, { Component } from 'react' +import { Space, Tag, Typography } from 'antd' +import Highlighter from 'pages/system/doc/highlighter' + +const { Title, Text } = Typography + +export default class index extends Component { + render() { + return ( + + + 在 + + /util + + 中，默认已提供了许多工具函数。也可以自行进行添加。 + + + ) + } +} diff --git a/web-react/src/pages/system/doc/front-end/util/query.jsx b/web-react/src/pages/system/doc/front-end/util/query.jsx new file mode 100644 index 0000000..7bdf762 --- /dev/null +++ b/web-react/src/pages/system/doc/front-end/util/query.jsx @@ -0,0 +1,119 @@ +import React, { Component } from 'react' +import { Space, Tag, Typography } from 'antd' +import Highlighter from 'pages/system/doc/highlighter' + +const { Text } = Typography + +export default class query extends Component { + render() { + return ( + + + /query + +
    +
  • + + + QueryType + 获取查询类型字符串，与后端对应。 + +
      +
    • +

      + GreaterThan：{' '} + > +

      +
      • +
    • +

      + GreaterThanOrEqual：{' '} + >= +

      +
      • +
    • +

      + LessThan：{' '} + < +

      +
      • +
    • +

      + LessThanOrEqual：{' '} + <= +

      +
      • +
    • +

      + Like： LIKE +

      +
      • +
    • +

      + Equal： = +

      +
      • +
    • +

      + StartWith：{' '} + STRAT +

      +
      • +
    • +

      + EndWith： END +

      +
      • +
    +     +
    • +
  • + + + getSearchDateRange + + (range: Array, format: String = 'YYYY-MM-DD', unit: String = + 'days') => Array + + + 获取查询用时间范围数组，在这里会自动将第二个时间增加1天。 + + 如果选择的日期范围为2021-01-01~2021-01-10，最终需要取得 + >=2021-01-01 and <2021-01-11 的结果 + + +
    • +
  • + + + getSearchInfo + + ({'{'}query: Object, queryType: Object{'}'}) => Array + + + 从键值对的query类型转换成数组类型。 + 键：自动作为field值 + 值：得到一个数组作为value的值 + + queryType：一个JSON类型，已query的键为键， + + QueryType + + 为值。 如果是一个 + + QueryType + + 的数组，则自动对应到value中的各个值。 + + 示例： + + +
    • +
+ + ) + } +} diff --git a/web-react/src/pages/system/doc/highlighter.jsx b/web-react/src/pages/system/doc/highlighter.jsx index 5c58387..cf86115 100644 --- a/web-react/src/pages/system/doc/highlighter.jsx +++ b/web-react/src/pages/system/doc/highlighter.jsx @@ -1,7 +1,6 @@ import React, { Component } from 'react' import { Button, message as Message, Space } from 'antd' -import SyntaxHighlighter from 'react-syntax-highlighter' -import { tomorrowNightEighties } from 'react-syntax-highlighter/dist/esm/styles/hljs' +import MonacoEditor from 'react-monaco-editor' const baseCopy = content => { try { @@ -48,15 +47,30 @@ const copyTemplate = code => { } export default class highlighter extends Component { + onEditorDidMount(editor) { + editor.setValue(this.props.code) + } + render() { const { code, copyTemplate } = this.props + const line = code.split('\r\n').length + const height = line > 20 ? 400 : line * 20 + return (
- - {code} - -
+ this.onEditorDidMount(editor)} + /> +
{copyTemplate && (
))}
diff --git a/web-react/src/util/global/index.js b/web-react/src/util/global/index.js index 2584c5e..bd5639a 100644 --- a/web-react/src/util/global/index.js +++ b/web-react/src/util/global/index.js @@ -10,7 +10,7 @@ export const EMPTY_ID = '00000000-0000-0000-0000-000000000000' /** * 文件预览地址 */ -export const PERVIEW_URL = process.env.VUE_APP_BASE_URL + urls.sysFileInfoPreview[0] +export const PERVIEW_URL = process.env.REACT_APP_BASE_URL + urls.sysFileInfoPreview[0] /** diff --git a/web-react/yarn.lock b/web-react/yarn.lock index 62a4ffc..a636c28 100644 --- a/web-react/yarn.lock +++ b/web-react/yarn.lock @@ -1191,7 +1191,7 @@ dependencies: regenerator-runtime "^0.13.4" -"@babel/runtime@^7.0.0", "@babel/runtime@^7.3.1": +"@babel/runtime@^7.0.0": version "7.14.6" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.6.tgz#535203bc0892efc7dec60bdc27b2ecf6e409062d" integrity sha512-/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg== @@ -1827,13 +1827,6 @@ dependencies: "@types/node" "*" -"@types/hast@^2.0.0": - version "2.3.2" - resolved "https://registry.nlark.com/@types/hast/download/@types/hast-2.3.2.tgz#236201acca9e2695e42f713d7dd4f151dc2982e4" - integrity sha1-I2IBrMqeJpXkL3E9fdTxUdwpguQ= - dependencies: - "@types/unist" "*" - "@types/html-minifier-terser@^5.0.0": version "5.1.1" resolved "https://registry.nlark.com/@types/html-minifier-terser/download/@types/html-minifier-terser-5.1.1.tgz?cache=0&sync_timestamp=1621241343144&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40types%2Fhtml-minifier-terser%2Fdownload%2F%40types%2Fhtml-minifier-terser-5.1.1.tgz#3c9ee980f1a10d6021ae6632ca3e79ca2ec4fb50" @@ -1942,11 +1935,6 @@ dependencies: source-map "^0.6.1" -"@types/unist@*": - version "2.0.5" - resolved "https://registry.nlark.com/@types/unist/download/@types/unist-2.0.5.tgz#fdd299f23205c3455af88ce618dd65c14cb73e22" - integrity sha1-/dKZ8jIFw0Va+IzmGN1lwUy3PiI= - "@types/webpack-sources@*": version "2.1.0" resolved "https://registry.nlark.com/@types/webpack-sources/download/@types/webpack-sources-2.1.0.tgz?cache=0&sync_timestamp=1621243863278&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40types%2Fwebpack-sources%2Fdownload%2F%40types%2Fwebpack-sources-2.1.0.tgz#8882b0bd62d1e0ce62f183d0d01b72e6e82e8c10" @@ -3357,21 +3345,6 @@ char-regex@^1.0.2: resolved "https://registry.nlark.com/char-regex/download/char-regex-1.0.2.tgz?cache=0&sync_timestamp=1622809103243&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchar-regex%2Fdownload%2Fchar-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf" integrity sha1-10Q1giYhf5ge1Y9Hmx1rzClUXc8= -character-entities-legacy@^1.0.0: - version "1.1.4" - resolved "https://registry.npm.taobao.org/character-entities-legacy/download/character-entities-legacy-1.1.4.tgz?cache=0&sync_timestamp=1615373299115&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcharacter-entities-legacy%2Fdownload%2Fcharacter-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1" - integrity sha1-lLwYRdznClu50uzHSHJWYSk9j8E= - -character-entities@^1.0.0: - version "1.2.4" - resolved "https://registry.nlark.com/character-entities/download/character-entities-1.2.4.tgz#e12c3939b7eaf4e5b15e7ad4c5e28e1d48c5b16b" - integrity sha1-4Sw5Obfq9OWxXnrUxeKOHUjFsWs= - -character-reference-invalid@^1.0.0: - version "1.1.4" - resolved "https://registry.npm.taobao.org/character-reference-invalid/download/character-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560" - integrity sha1-CDMpzaDq4nKrPbvzfpo4LBOvFWA= - check-types@^11.1.1: version "11.1.2" resolved "https://registry.npm.taobao.org/check-types/download/check-types-11.1.2.tgz#86a7c12bf5539f6324eb0e70ca8896c0e38f3e2f" @@ -3573,11 +3546,6 @@ combined-stream@^1.0.8: dependencies: delayed-stream "~1.0.0" -comma-separated-tokens@^1.0.0: - version "1.0.8" - resolved "https://registry.nlark.com/comma-separated-tokens/download/comma-separated-tokens-1.0.8.tgz#632b80b6117867a158f1080ad498b2fbe7e3f5ea" - integrity sha1-YyuAthF4Z6FY8QgK1Jiy++fj9eo= - commander@^2.20.0: version "2.20.3" resolved "https://registry.nlark.com/commander/download/commander-2.20.3.tgz?cache=0&sync_timestamp=1622954303803&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcommander%2Fdownload%2Fcommander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" @@ -5208,13 +5176,6 @@ fastq@^1.6.0: dependencies: reusify "^1.0.4" -fault@^1.0.0: - version "1.0.4" - resolved "https://registry.npm.taobao.org/fault/download/fault-1.0.4.tgz#eafcfc0a6d214fc94601e170df29954a4f842f13" - integrity sha1-6vz8Cm0hT8lGAeFw3ymVSk+ELxM= - dependencies: - format "^0.2.0" - faye-websocket@^0.11.3: version "0.11.4" resolved "https://registry.nlark.com/faye-websocket/download/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da" @@ -5433,11 +5394,6 @@ form-data@^3.0.0: combined-stream "^1.0.8" mime-types "^2.1.12" -format@^0.2.0: - version "0.2.2" - resolved "https://registry.npm.taobao.org/format/download/format-0.2.2.tgz#d6170107e9efdc4ed30c9dc39016df942b5cb58b" - integrity sha1-1hcBB+nv3E7TDJ3DkBbflCtctYs= - forwarded@0.2.0: version "0.2.0" resolved "https://registry.nlark.com/forwarded/download/forwarded-0.2.0.tgz?cache=0&sync_timestamp=1622503508967&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fforwarded%2Fdownload%2Fforwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" @@ -5777,22 +5733,6 @@ hash.js@^1.0.0, hash.js@^1.0.3: inherits "^2.0.3" minimalistic-assert "^1.0.1" -hast-util-parse-selector@^2.0.0: - version "2.2.5" - resolved "https://registry.nlark.com/hast-util-parse-selector/download/hast-util-parse-selector-2.2.5.tgz#d57c23f4da16ae3c63b3b6ca4616683313499c3a" - integrity sha1-1Xwj9NoWrjxjs7bKRhZoMxNJnDo= - -hastscript@^6.0.0: - version "6.0.0" - resolved "https://registry.nlark.com/hastscript/download/hastscript-6.0.0.tgz#e8768d7eac56c3fdeac8a92830d58e811e5bf640" - integrity sha1-6HaNfqxWw/3qyKkoMNWOgR5b9kA= - dependencies: - "@types/hast" "^2.0.0" - comma-separated-tokens "^1.0.0" - hast-util-parse-selector "^2.0.0" - property-information "^5.0.0" - space-separated-tokens "^1.0.0" - he@^1.2.0: version "1.2.0" resolved "https://registry.nlark.com/he/download/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" @@ -5803,11 +5743,6 @@ hex-color-regex@^1.1.0: resolved "https://registry.npm.taobao.org/hex-color-regex/download/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e" integrity sha1-TAb8y0YC/iYCs8k9+C1+fb8aio4= -highlight.js@^10.4.1, highlight.js@~10.7.0: - version "10.7.3" - resolved "https://registry.nlark.com/highlight.js/download/highlight.js-10.7.3.tgz#697272e3991356e40c3cac566a74eef681756531" - integrity sha1-aXJy45kTVuQMPKxWanTu9oF1ZTE= - history@^4.9.0: version "4.10.1" resolved "https://registry.nlark.com/history/download/history-4.10.1.tgz#33371a65e3a83b267434e2b3f3b1b4c58aad4cf3" @@ -6234,19 +6169,6 @@ is-accessor-descriptor@^1.0.0: dependencies: kind-of "^6.0.0" -is-alphabetical@^1.0.0: - version "1.0.4" - resolved "https://registry.npm.taobao.org/is-alphabetical/download/is-alphabetical-1.0.4.tgz?cache=0&sync_timestamp=1615453703061&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-alphabetical%2Fdownload%2Fis-alphabetical-1.0.4.tgz#9e7d6b94916be22153745d184c298cbf986a686d" - integrity sha1-nn1rlJFr4iFTdF0YTCmMv5hqaG0= - -is-alphanumerical@^1.0.0: - version "1.0.4" - resolved "https://registry.nlark.com/is-alphanumerical/download/is-alphanumerical-1.0.4.tgz#7eb9a2431f855f6b1ef1a78e326df515696c4dbf" - integrity sha1-frmiQx+FX2se8aeOMm31FWlsTb8= - dependencies: - is-alphabetical "^1.0.0" - is-decimal "^1.0.0" - is-arguments@^1.0.4: version "1.1.0" resolved "https://registry.npm.taobao.org/is-arguments/download/is-arguments-1.1.0.tgz#62353031dfbee07ceb34656a6bde59efecae8dd9" @@ -6345,11 +6267,6 @@ is-date-object@^1.0.1: resolved "https://registry.nlark.com/is-date-object/download/is-date-object-1.0.4.tgz#550cfcc03afada05eea3dd30981c7b09551f73e5" integrity sha1-VQz8wDr62gXuo90wmBx7CVUfc+U= -is-decimal@^1.0.0: - version "1.0.4" - resolved "https://registry.npm.taobao.org/is-decimal/download/is-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5" - integrity sha1-ZaOllYocW2OnBuGzM9fNn2MNP6U= - is-descriptor@^0.1.0: version "0.1.6" resolved "https://registry.nlark.com/is-descriptor/download/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" @@ -6424,11 +6341,6 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1: dependencies: is-extglob "^2.1.1" -is-hexadecimal@^1.0.0: - version "1.0.4" - resolved "https://registry.npm.taobao.org/is-hexadecimal/download/is-hexadecimal-1.0.4.tgz?cache=0&sync_timestamp=1615464641587&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-hexadecimal%2Fdownload%2Fis-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7" - integrity sha1-zDXJdYjaS9Saju3WvECC1E3LI6c= - is-module@^1.0.0: version "1.0.0" resolved "https://registry.npm.taobao.org/is-module/download/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591" @@ -7486,14 +7398,6 @@ lower-case@^2.0.2: dependencies: tslib "^2.0.3" -lowlight@^1.17.0: - version "1.20.0" - resolved "https://registry.nlark.com/lowlight/download/lowlight-1.20.0.tgz#ddb197d33462ad0d93bf19d17b6c301aa3941888" - integrity sha1-3bGX0zRirQ2TvxnRe2wwGqOUGIg= - dependencies: - fault "^1.0.0" - highlight.js "~10.7.0" - lru-cache@^5.1.1: version "5.1.1" resolved "https://registry.npm.taobao.org/lru-cache/download/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" @@ -8400,18 +8304,6 @@ parse-asn1@^5.0.0, parse-asn1@^5.1.5: pbkdf2 "^3.0.3" safe-buffer "^5.1.1" -parse-entities@^2.0.0: - version "2.0.0" - resolved "https://registry.npm.taobao.org/parse-entities/download/parse-entities-2.0.0.tgz#53c6eb5b9314a1f4ec99fa0fdf7ce01ecda0cbe8" - integrity sha1-U8brW5MUofTsmfoP33zgHs2gy+g= - dependencies: - character-entities "^1.0.0" - character-entities-legacy "^1.0.0" - character-reference-invalid "^1.0.0" - is-alphanumerical "^1.0.0" - is-decimal "^1.0.0" - is-hexadecimal "^1.0.0" - parse-json@^4.0.0: version "4.0.0" resolved "https://registry.nlark.com/parse-json/download/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0" @@ -9343,11 +9235,6 @@ pretty-format@^26.0.0, pretty-format@^26.6.0, pretty-format@^26.6.2: ansi-styles "^4.0.0" react-is "^17.0.1" -prismjs@^1.22.0, prismjs@~1.24.0: - version "1.24.1" - resolved "https://registry.nlark.com/prismjs/download/prismjs-1.24.1.tgz#c4d7895c4d6500289482fa8936d9cdd192684036" - integrity sha1-xNeJXE1lACiUgvqJNtnN0ZJoQDY= - process-nextick-args@~2.0.0: version "2.0.1" resolved "https://registry.npm.taobao.org/process-nextick-args/download/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" @@ -9407,13 +9294,6 @@ prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.2, prop-types@^15.7.2: object-assign "^4.1.1" react-is "^16.8.1" -property-information@^5.0.0: - version "5.6.0" - resolved "https://registry.nlark.com/property-information/download/property-information-5.6.0.tgz#61675545fb23002f245c6540ec46077d4da3ed69" - integrity sha1-YWdVRfsjAC8kXGVA7EYHfU2j7Wk= - dependencies: - xtend "^4.0.0" - proxy-addr@~2.0.5: version "2.0.7" resolved "https://registry.nlark.com/proxy-addr/download/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" @@ -10137,17 +10017,6 @@ react-scripts@4.0.3: optionalDependencies: fsevents "^2.1.3" -react-syntax-highlighter@^15.4.3: - version "15.4.3" - resolved "https://registry.npm.taobao.org/react-syntax-highlighter/download/react-syntax-highlighter-15.4.3.tgz#fffe3286677ac470b963b364916d16374996f3a6" - integrity sha1-//4yhmd6xHC5Y7NkkW0WN0mW86Y= - dependencies: - "@babel/runtime" "^7.3.1" - highlight.js "^10.4.1" - lowlight "^1.17.0" - prismjs "^1.22.0" - refractor "^3.2.0" - react-textarea-autosize@^8.3.2: version "8.3.3" resolved "https://registry.nlark.com/react-textarea-autosize/download/react-textarea-autosize-8.3.3.tgz?cache=0&sync_timestamp=1622628433420&other_urls=https%3A%2F%2Fregistry.nlark.com%2Freact-textarea-autosize%2Fdownload%2Freact-textarea-autosize-8.3.3.tgz#f70913945369da453fd554c168f6baacd1fa04d8" @@ -10268,15 +10137,6 @@ redux@^4.1.0: dependencies: "@babel/runtime" "^7.9.2" -refractor@^3.2.0: - version "3.4.0" - resolved "https://registry.nlark.com/refractor/download/refractor-3.4.0.tgz#62bd274b06c942041f390c371b676eb67cb0a678" - integrity sha1-Yr0nSwbJQgQfOQw3G2dutnywpng= - dependencies: - hastscript "^6.0.0" - parse-entities "^2.0.0" - prismjs "~1.24.0" - regenerate-unicode-properties@^8.2.0: version "8.2.0" resolved "https://registry.npm.taobao.org/regenerate-unicode-properties/download/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec" @@ -11044,11 +10904,6 @@ sourcemap-codec@^1.4.4: resolved "https://registry.npm.taobao.org/sourcemap-codec/download/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4" integrity sha1-6oBL2UhXQC5pktBaOO8a41qatMQ= -space-separated-tokens@^1.0.0: - version "1.1.5" - resolved "https://registry.nlark.com/space-separated-tokens/download/space-separated-tokens-1.1.5.tgz#85f32c3d10d9682007e917414ddc5c26d1aa6899" - integrity sha1-hfMsPRDZaCAH6RdBTdxcJtGqaJk= - spdx-correct@^3.0.0: version "3.1.1" resolved "https://registry.npm.taobao.org/spdx-correct/download/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9" From 5f9626ba2e2e688f85b6ecb61078cb321de110e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=87=AA=E5=B8=A6=E5=A4=A7=E4=BD=AC=E6=B0=94=E5=9C=BA?= <188633308@qq.com> Date: Tue, 13 Jul 2021 15:38:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update=20=E7=A7=8D=E5=AD=90=E6=A8=A1?= =?UTF-8?q?=E7=89=88=E6=8C=AA=E5=8A=A8=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web-react/{public => }/seed/form-tabs/index.jsx | 0 web-react/{public => }/seed/form-tabs/tab/index.jsx | 0 web-react/{public => }/seed/form-tabs/tab/part.jsx | 0 web-react/{public => }/seed/form/index.jsx | 0 web-react/{public => }/seed/form/part.jsx | 0 web-react/{public => }/seed/query-table-form/form.jsx | 0 web-react/{public => }/seed/query-table/index.jsx | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename web-react/{public => }/seed/form-tabs/index.jsx (100%) rename web-react/{public => }/seed/form-tabs/tab/index.jsx (100%) rename web-react/{public => }/seed/form-tabs/tab/part.jsx (100%) rename web-react/{public => }/seed/form/index.jsx (100%) rename web-react/{public => }/seed/form/part.jsx (100%) rename web-react/{public => }/seed/query-table-form/form.jsx (100%) rename web-react/{public => }/seed/query-table/index.jsx (100%) diff --git a/web-react/public/seed/form-tabs/index.jsx b/web-react/seed/form-tabs/index.jsx similarity index 100% rename from web-react/public/seed/form-tabs/index.jsx rename to web-react/seed/form-tabs/index.jsx diff --git a/web-react/public/seed/form-tabs/tab/index.jsx b/web-react/seed/form-tabs/tab/index.jsx similarity index 100% rename from web-react/public/seed/form-tabs/tab/index.jsx rename to web-react/seed/form-tabs/tab/index.jsx diff --git a/web-react/public/seed/form-tabs/tab/part.jsx b/web-react/seed/form-tabs/tab/part.jsx similarity index 100% rename from web-react/public/seed/form-tabs/tab/part.jsx rename to web-react/seed/form-tabs/tab/part.jsx diff --git a/web-react/public/seed/form/index.jsx b/web-react/seed/form/index.jsx similarity index 100% rename from web-react/public/seed/form/index.jsx rename to web-react/seed/form/index.jsx diff --git a/web-react/public/seed/form/part.jsx b/web-react/seed/form/part.jsx similarity index 100% rename from web-react/public/seed/form/part.jsx rename to web-react/seed/form/part.jsx diff --git a/web-react/public/seed/query-table-form/form.jsx b/web-react/seed/query-table-form/form.jsx similarity index 100% rename from web-react/public/seed/query-table-form/form.jsx rename to web-react/seed/query-table-form/form.jsx diff --git a/web-react/public/seed/query-table/index.jsx b/web-react/seed/query-table/index.jsx similarity index 100% rename from web-react/public/seed/query-table/index.jsx rename to web-react/seed/query-table/index.jsx