Merge branch 'dev' of https://github.com/alibaba/x-render into dev

siyi98 · siyi98 · commit 4e721e462d05 · 2022-01-26T14:21:14.000+08:00
diff --git a/.umirc.js b/.umirc.js
@@ -11,24 +11,6 @@ export default defineConfig({
     loading: '@/docs/Loading.js',
   },
   locales: [['zh-CN', '中文']],
-  hire: {
-    title: '飞猪用户技术正寻觅前端',
-    content: `
-<p><strong>招聘团队：</strong>飞猪用户技术（拔赤）- 前端组</p>
-<p><strong>招聘层级：</strong>P5 ~ P7</p>
-<p><strong>工作城市：</strong>杭州、北京</p>
-<p><strong>面试效率：</strong>加急面试</p>
-<p><strong>团队链接：</strong></p>
-<ul>
-  <li>微信：<a href="https://weixin.sogou.com/weixin?query=Fliggy+F2E" target="_blank">Fliggy F2E</a></li>
-  <li>掘金：<a href="https://juejin.cn/user/3051900006845944" target="_blank">飞猪前端团队</a></li>
-  <li>开源：<a href="https://github.com/alibaba/form-render/" target="_blank">alibaba/x-render</a></li>
-  <li>开源：<a href="https://github.com/apache/incubator-weex-ui" target="_blank">apache/weex-ui</a></li>
-  <li>开源：<a href="https://github.com/fliggy-mobile" target="_blank">fliggy-mobile</a></li>
-</ul>`,
-    email: 'tw102972@alibaba-inc.com',
-    slogan: '想快乐的写前端吗？',
-  },
   ignoreMomentLocale: false,
   navs: [
     {
diff --git a/docs/form-render/OldSchemaTransformer.md b/docs/form-render/OldSchemaTransformer.md
diff --git a/docs/form-render/advanced/display.md b/docs/form-render/advanced/display.md
@@ -1,5 +1,8 @@
 ---
-order: 4
+order: 8
+group:
+  order: 3
+  title: 高级用法
 toc: content
 ---
 
diff --git a/docs/form-render/advanced/form-methods.md b/docs/form-render/advanced/form-methods.md
@@ -1,6 +1,9 @@
 ---
-order: 3
-toc: content
+order: 4
+group:
+  order: 3
+  title: 高级用法
+toc: false
 ---
 
 # 表单方法（form）
diff --git a/docs/form-render/advanced/lifeCycle.md b/docs/form-render/advanced/lifeCycle.md
@@ -1,5 +1,8 @@
 ---
 order: 6
+group:
+  order: 3
+  title: 高级用法
 toc: false
 ---
 
diff --git a/docs/form-render/advanced/listDisplay.md b/docs/form-render/advanced/listDisplay.md
@@ -1,5 +1,8 @@
 ---
 order: 7
+group:
+  order: 3
+  title: 高级用法
 toc: content
 ---
 
diff --git a/docs/form-render/advanced/mapping.md b/docs/form-render/advanced/mapping.md
@@ -1,5 +1,5 @@
 ---
-order: 2.5
+order: 3
 group:
   order: 3
   title: 高级用法
diff --git a/docs/form-render/advanced/measure.md b/docs/form-render/advanced/measure.md
@@ -1,9 +1,9 @@
 ---
-order: 1
+order: 9
 group:
-  order: 4
-  title: 度量
-toc: false
+  order: 3
+  title: 高级用法
+toc: content
 ---
 
 # 表单健康度 & 提效
@@ -12,18 +12,6 @@ toc: false
 
 目前 FormRender 提供了两个触发时机以及一系列相关数据作为对外开放接口，推荐用户用于接入适合自己项目的埋点 & 数据监控方案。
 
-## RoadMap
-
-数据
-
-- 一期我们的度量会是更为整体的数据：例如表单的报错和提交是否成功，整体表单提交时长等。
-- 二期我们会提供更为细致的数据进一步找寻到如果一个表单的用户填写效率低下，是哪个表单原件和操作造成了缓慢，更进一步以数据给出优化的指引
-
-方案
-
-- 一期我们对外提供了触发钩子以及数据，让用户自行选择监控和数据埋点方案
-- 二期我们会给出全套的服务，只需要简单注册即可获取表单健康信息
-
 ## 使用
 
 提供了 `logOnMount` 和 `logOnSubmit` 两个钩子。在使用 `useForm` 时注入：
diff --git a/docs/form-render/advanced/watch.md b/docs/form-render/advanced/watch.md
@@ -1,5 +1,9 @@
 ---
 order: 5
+group:
+  order: 3
+  title: 高级用法
+toc: content
 ---
 
 # 表单监听（watch）
diff --git a/docs/form-render/demos/testing.md b/docs/form-render/demos/testing.md
@@ -1,8 +1,8 @@
 ---
-order: 5
+order: 9
 group:
-  order: 5
-  title: 错误排查技巧
+  order: 4
+  title: 示例
 toc: content
 ---
 
diff --git a/docs/form-render/migrate.md b/docs/form-render/migrate.md
@@ -1,12 +1,10 @@
 ---
-order: 1
-group:
-  order: 6
-  title: 0.x 到 1.x
+order: 6
+title: 0.x 到 1.x 升级方案
 toc: content
 ---
 
-# 升级方案（推荐）
+# 升级方案
 
 ## 三个改变
 
@@ -190,7 +188,8 @@ const MyWidget = props => {
 ```jsx
 import React, { useState } from 'react';
 import { Input, Button } from 'antd';
-import { updateSchemaToNewVersion } from '../../../packages/form-render/src/utils.js';
+import { updateSchemaToNewVersion } from 'form-render/src/utils.js';
+
 const TextArea = Input.TextArea;
 
 const old = {
diff --git a/docs/form-render/migrate/migrate2.md b/docs/form-render/migrate/migrate2.md
diff --git a/docs/form-render/schema/inner-widget.md b/docs/form-render/schema/inner-widget.md
@@ -1,5 +1,8 @@
 ---
 order: 4
+group:
+  order: 2
+  title: 协议（schema）
 toc: content
 ---
 
diff --git a/docs/form-render/schema/props.md b/docs/form-render/schema/props.md
@@ -1,5 +1,8 @@
 ---
 order: 3
+group:
+  order: 2
+  title: 协议（schema）
 toc: content
 ---
 
diff --git a/docs/form-render/schema/rules.md b/docs/form-render/schema/rules.md
diff --git a/package.json b/package.json
