Merge remote-tracking branch 'origin/develop'

Former-commit-id: 08ea2abbf021bfb87a309f5327d1a4c6a1194b13 [formerly 08ea2abbf021bfb87a309f5327d1a4c6a1194b13 [formerly 08ea2abbf021bfb87a309f5327d1a4c6a1194b13 [formerly 08ea2abbf021bfb87a309f5327d1a4c6a1194b13 [formerly d92109d [formerly 86a27dc9c3f44c2d73944c5800a903f685203d6f]]]]]
Former-commit-id: 40abc9c
Former-commit-id: 751b9c5
Former-commit-id: a8fa161b502ebd5c658cd3f5932cdb7a32dffc60 [formerly 577f6d2adf59ad51ba034552da1f27b22ff5500b]
Former-commit-id: 072a4b0e0e6dc2658c1dc35b457b8b2e23c2ac69
Former-commit-id: b711d2867f649c789c550409d0b0e9d8312fb973
Former-commit-id: d3c1ef141f863ae3ddd9f31f1e2610428b701c09
Former-commit-id: 1b0a1b4805f826e6f5964edced98bd84fb15e445
Former-commit-id: 4ea1e704d54bdecab60ee58463642852672285e6

package.json

@@ -1,6 +1,6 @@
 {
   "name": "d2-admin",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve --open",

src/router/modules/business.js

@@ -0,0 +1,15 @@
+import layoutHeaderAside from '@/layout/header-aside'
+
+const meta = { requiresAuth: true }
+
+export default {
+  path: '/demo/business',
+  name: 'demo-business',
+  meta,
+  redirect: { name: 'demo-business-index' },
+  component: layoutHeaderAside,
+  children: (pre => [
+    { path: 'index', name: `${pre}index`, component: () => import('@/pages/demo/business/index'), meta: { ...meta, title: '示例首页' } },
+    { path: 'table/1', name: `${pre}table-1`, component: () => import('@/pages/demo/business/table/1'), meta: { ...meta, title: '表格 1' } }
+  ])('demo-business-')
+}

src/router/modules/d2-crud.js

@@ -0,0 +1,43 @@
+import layoutHeaderAside from '@/layout/header-aside'
+
+const meta = { requiresAuth: true }
+
+export default {
+  path: '/demo/d2-crud',
+  name: 'demo-d2-crud',
+  meta,
+  redirect: { name: 'demo-d2-crud-index' },
+  component: layoutHeaderAside,
+  children: (pre => [
+    { path: 'index', name: `${pre}index`, component: () => import('@/pages/demo/d2-crud/index'), meta: { ...meta, title: 'D2 CRUD 首页' } },
+    { path: 'demo1', name: `${pre}demo1`, component: () => import('@/pages/demo/d2-crud/demo1'), meta: { ...meta, title: '基础表格' } },
+    { path: 'demo2', name: `${pre}demo2`, component: () => import('@/pages/demo/d2-crud/demo2'), meta: { ...meta, title: '带斑马纹表格' } },
+    { path: 'demo3', name: `${pre}demo3`, component: () => import('@/pages/demo/d2-crud/demo3'), meta: { ...meta, title: '带边框表格' } },
+    { path: 'demo4', name: `${pre}demo4`, component: () => import('@/pages/demo/d2-crud/demo4'), meta: { ...meta, title: '带状态表格' } },
+    { path: 'demo5', name: `${pre}demo5`, component: () => import('@/pages/demo/d2-crud/demo5'), meta: { ...meta, title: '固定表头' } },
+    { path: 'demo6', name: `${pre}demo6`, component: () => import('@/pages/demo/d2-crud/demo6'), meta: { ...meta, title: '固定列' } },
+    { path: 'demo7', name: `${pre}demo7`, component: () => import('@/pages/demo/d2-crud/demo7'), meta: { ...meta, title: '流体高度' } },
+    { path: 'demo8', name: `${pre}demo8`, component: () => import('@/pages/demo/d2-crud/demo8'), meta: { ...meta, title: '多级表头' } },
+    { path: 'demo9', name: `${pre}demo9`, component: () => import('@/pages/demo/d2-crud/demo9'), meta: { ...meta, title: '单选' } },
+    { path: 'demo10', name: `${pre}demo10`, component: () => import('@/pages/demo/d2-crud/demo10'), meta: { ...meta, title: '多选' } },
+    { path: 'demo11', name: `${pre}demo11`, component: () => import('@/pages/demo/d2-crud/demo11'), meta: { ...meta, title: '排序' } },
+    { path: 'demo12', name: `${pre}demo12`, component: () => import('@/pages/demo/d2-crud/demo12'), meta: { ...meta, title: '筛选' } },
+    { path: 'demo13', name: `${pre}demo13`, component: () => import('@/pages/demo/d2-crud/demo13'), meta: { ...meta, title: '表尾合计行' } },
+    { path: 'demo14', name: `${pre}demo14`, component: () => import('@/pages/demo/d2-crud/demo14'), meta: { ...meta, title: '合并行' } },
+    { path: 'demo15', name: `${pre}demo15`, component: () => import('@/pages/demo/d2-crud/demo15'), meta: { ...meta, title: '合并列' } },
+    { path: 'demo16', name: `${pre}demo16`, component: () => import('@/pages/demo/d2-crud/demo16'), meta: { ...meta, title: '新增数据' } },
+    { path: 'demo17', name: `${pre}demo17`, component: () => import('@/pages/demo/d2-crud/demo17'), meta: { ...meta, title: '修改数据' } },
+    { path: 'demo18', name: `${pre}demo18`, component: () => import('@/pages/demo/d2-crud/demo18'), meta: { ...meta, title: '删除数据' } },
+    { path: 'demo19', name: `${pre}demo19`, component: () => import('@/pages/demo/d2-crud/demo19'), meta: { ...meta, title: '自定义操作列' } },
+    { path: 'demo20', name: `${pre}demo20`, component: () => import('@/pages/demo/d2-crud/demo20'), meta: { ...meta, title: '表单组件渲染' } },
+    { path: 'demo21', name: `${pre}demo21`, component: () => import('@/pages/demo/d2-crud/demo21'), meta: { ...meta, title: '表单布局' } },
+    { path: 'demo22', name: `${pre}demo22`, component: () => import('@/pages/demo/d2-crud/demo22'), meta: { ...meta, title: '表单校验' } },
+    { path: 'demo23', name: `${pre}demo23`, component: () => import('@/pages/demo/d2-crud/demo23'), meta: { ...meta, title: '表格内编辑' } },
+    { path: 'demo24', name: `${pre}demo24`, component: () => import('@/pages/demo/d2-crud/demo24'), meta: { ...meta, title: '表格slot' } },
+    { path: 'demo25', name: `${pre}demo25`, component: () => import('@/pages/demo/d2-crud/demo25'), meta: { ...meta, title: '表格自定义组件' } },
+    { path: 'demo26', name: `${pre}demo26`, component: () => import('@/pages/demo/d2-crud/demo26'), meta: { ...meta, title: '表单自定义组件' } },
+    { path: 'demo27', name: `${pre}demo27`, component: () => import('@/pages/demo/d2-crud/demo27'), meta: { ...meta, title: '加载状态' } },
+    { path: 'demo28', name: `${pre}demo28`, component: () => import('@/pages/demo/d2-crud/demo28'), meta: { ...meta, title: '自定义加载状态' } },
+    { path: 'demo29', name: `${pre}demo29`, component: () => import('@/pages/demo/d2-crud/demo29'), meta: { ...meta, title: '分页' } }
+  ])('demo-d2-crud-')
+}