Merge remote-tracking branch 'origin/client_sync' into v2

# Conflicts:
#	packages/ui/certd-client/CHANGELOG.md
#	packages/ui/certd-client/package.json

packages/ui/certd-client/src/router/source/modules/crud.ts

@@ -448,6 +448,12 @@ export const crudResources = [
             name: "FormView",
             path: "/crud/form/view",
             component: "/crud/form/view/index.vue"
+          },
+          {
+            title: "表单Watch",
+            name: "FormWatch",
+            path: "/crud/form/watch",
+            component: "/crud/form/watch/index.vue"
           }
         ]
       },
@@ -537,18 +543,6 @@ export const crudResources = [
             path: "/crud/feature/height",
             component: "/crud/feature/height/index.vue"
           },
-          {
-            title: "可编辑",
-            name: "FeatureEditable",
-            path: "/crud/feature/editable",
-            component: "/crud/feature/editable/index.vue"
-          },
-          {
-            title: "行编辑",
-            name: "FeatureEditableRow",
-            path: "/crud/feature/editable-row",
-            component: "/crud/feature/editable-row/index.vue"
-          },
           {
             title: "查询框",
             name: "FeatureSearch",
@@ -623,6 +617,47 @@ export const crudResources = [
           }
         ]
       },
+      {
+        title: "可编辑",
+        name: "Editable",
+        path: "/crud/editable",
+        redirect: "/crud/editable/free",
+        meta: {
+          icon: "ion:create-outline"
+        },
+        children: [
+          {
+            title: "自由编辑",
+            name: "EditableFree",
+            path: "/crud/editable/free",
+            component: "/crud/editable/free/index.vue"
+          },
+          {
+            title: "行编辑",
+            name: "EditableRow",
+            path: "/crud/editable/row",
+            component: "/crud/editable/row/index.vue"
+          },
+          {
+            title: "单元格编辑",
+            name: "EditableCell",
+            path: "/crud/editable/cell",
+            component: "/crud/editable/cell/index.vue"
+          },
+          {
+            title: "子表格编辑",
+            name: "EditableVModel",
+            path: "/crud/editable/vmodel",
+            component: "/crud/editable/vmodel/index.vue"
+          },
+          {
+            title: "子CRUD",
+            name: "EditableSubCrud",
+            path: "/crud/editable/sub-crud",
+            component: "/crud/editable/sub-crud/index.vue"
+          }
+        ]
+      },
       {
         title: "插槽",
         name: "Slots",