Merge branch 'hotfix/更新文案' into develop

Former-commit-id: 9398564133ac12b9d0543c51774dab2c313d0077 [formerly acbd649347ba13668af99e144d24cdb7f17907cf] [formerly 9398564133ac12b9d0543c51774dab2c313d0077 [formerly acbd649347ba13668af99e144d24cdb7f17907cf] [formerly 9398564133ac12b9d0543c51774dab2c313d0077 [formerly acbd649347ba13668af99e144d24cdb7f17907cf] [formerly acbd649347ba13668af99e144d24cdb7f17907cf [formerly 25598877a0df6813372c579d673d99f40ec1e1bc [formerly 660ce40419df94c84ce8e305d0e3a1d374428b44]]]]] Former-commit-id: e6f72eb4e3cd1848d04837d346032fcf52d1b735 Former-commit-id: d9cbaa2b6653963315ea872b9f2ce28a481b618c Former-commit-id: 7a056a090f518f0cc67cae891b7e51eb71c6b9a4 [formerly 54a38d2abbd83ef4b81f3d141a85f4cfbfdb70b8] Former-commit-id: f88cb9bac1e2a372e6fd75fa21353dc0623980e8 Former-commit-id: 2d2448d423195359de9276ca011138fdf11c1f1d Former-commit-id: 5d85ca2e034dbf696da7877f2f8750a97849baf3 Former-commit-id: 1aefafda28f544ebf7d1994d8e18cdc881b9f7ea Former-commit-id: 291ae0766f8531f1e3aeaa258f803d1389872f6a
2018-12-28 09:38:59 +08:00
parent ea4d3b1b4c f2115f5b7a
commit adb3ddf27d
18 changed files with 30 additions and 22 deletions
--- a/src/menu/modules/demo-d2-crud.js
+++ b/src/menu/modules/demo-d2-crud.js
@@ -1,9 +1,9 @@
 export default {
  path: '/demo/d2-crud',
-  title: 'D2 CRUD',
+  title: 'D2 CRUD v2',
  iconSvg: 'd2-crud',
  children: (pre => [
-    { path: `${pre}index`, title: 'D2 CRUD ', icon: 'home' },
+    { path: `${pre}index`, title: 'D2 CRUD v2', icon: 'home' },
    {
      title: '基础功能',
      children: [
--- a/src/pages/demo/d2-crud/demo16/code.js
+++ b/src/pages/demo/d2-crud/demo16/code.js
@@ -78,7 +78,7 @@ export default {
    }
  },
  methods: {
-    handleDialogOpen ({mode}) {
+    handleDialogOpen ({ mode }) {
      this.$message({
        message: '打开模态框，模式为：' + mode,
        type: 'success'
--- a/src/pages/demo/d2-crud/demo16/index.vue
+++ b/src/pages/demo/d2-crud/demo16/index.vue
@@ -94,7 +94,7 @@ export default {
    }
  },
  methods: {
-    handleDialogOpen ({mode}) {
+    handleDialogOpen ({ mode }) {
      this.$message({
        message: '打开模态框，模式为：' + mode,
        type: 'success'
--- a/src/pages/demo/d2-crud/demo17/code.js
+++ b/src/pages/demo/d2-crud/demo17/code.js
@@ -120,7 +120,7 @@ export default {
    }
  },
  methods: {
-    handleDialogOpen ({mode, row}) {
+    handleDialogOpen ({ mode, row }) {
      this.$message({
        message: '打开模态框，模式为：' + mode,
        type: 'success'
@@ -142,7 +142,7 @@ export default {
        }
      })
    },
-    handleRowEdit ({index, row}, done) {
+    handleRowEdit ({ index, row }, done) {
      this.formOptions.saveLoading = true
      setTimeout(() => {
        console.log(index)
--- a/src/pages/demo/d2-crud/demo17/index.vue
+++ b/src/pages/demo/d2-crud/demo17/index.vue
@@ -136,7 +136,7 @@ export default {
    }
  },
  methods: {
-    handleDialogOpen ({mode, row}) {
+    handleDialogOpen ({ mode, row }) {
      this.$message({
        message: '打开模态框，模式为：' + mode,
        type: 'success'
--- a/src/pages/demo/d2-crud/demo18/code.js
+++ b/src/pages/demo/d2-crud/demo18/code.js
@@ -79,7 +79,7 @@ export default {
    }
  },
  methods: {
-    handleRowRemove ({index, row}, done) {
+    handleRowRemove ({ index, row }, done) {
      setTimeout(() => {
        console.log(index)
        console.log(row)
--- a/src/pages/demo/d2-crud/demo20/code.js
+++ b/src/pages/demo/d2-crud/demo20/code.js
@@ -107,7 +107,7 @@ export default {
    }
  },
  methods: {
-    handleRowEdit ({index, row}, done) {
+    handleRowEdit ({ index, row }, done) {
      this.formOptions.saveLoading = true
      setTimeout(() => {
        console.log(index)
--- a/src/pages/demo/d2-crud/demo21/code.js
+++ b/src/pages/demo/d2-crud/demo21/code.js
@@ -91,7 +91,7 @@ export default {
    }
  },
  methods: {
-    handleRowEdit ({index, row}, done) {
+    handleRowEdit ({ index, row }, done) {
      this.formOptions.saveLoading = true
      setTimeout(() => {
        console.log(index)
--- a/src/pages/demo/d2-crud/demo23/code.js
+++ b/src/pages/demo/d2-crud/demo23/code.js
@@ -76,7 +76,7 @@ export default {
    }
  },
  methods: {
-    handleCellDataChange ({rowIndex, key, value, row}) {
+    handleCellDataChange ({ rowIndex, key, value, row }) {
      console.log(rowIndex)
      console.log(key)
      console.log(value)
--- a/src/pages/demo/d2-crud/demo23/index.vue
+++ b/src/pages/demo/d2-crud/demo23/index.vue
@@ -92,7 +92,7 @@ export default {
    }
  },
  methods: {
-    handleCellDataChange ({rowIndex, key, value, row}) {
+    handleCellDataChange ({ rowIndex, key, value, row }) {
      console.log(rowIndex)
      console.log(key)
      console.log(value)
--- a/src/pages/demo/d2-crud/demo26/codeOverall.js
+++ b/src/pages/demo/d2-crud/demo26/codeOverall.js
@@ -105,7 +105,7 @@ export default {
    handleDataChange (data) {
      console.log(data)
    },
-    handleRowEdit ({index, row}, done) {
+    handleRowEdit ({ index, row }, done) {
      this.formOptions.saveLoading = true
      setTimeout(() => {
        console.log(index)
--- a/src/pages/demo/d2-crud/demo26/codePart.js
+++ b/src/pages/demo/d2-crud/demo26/codePart.js
@@ -110,7 +110,7 @@ export default {
    handleDataChange (data) {
      console.log(data)
    },
-    handleRowEdit ({index, row}, done) {
+    handleRowEdit ({ index, row }, done) {
      this.formOptions.saveLoading = true
      setTimeout(() => {
        console.log(index)
--- a/src/pages/demo/d2-crud/demo30/code.js
+++ b/src/pages/demo/d2-crud/demo30/code.js
@@ -105,11 +105,11 @@ export default {
    }
  },
  methods: {
-    handleFormDataChange ({key, value}) {
+    handleFormDataChange ({ key, value }) {
      console.log(key)
      console.log(value)
    },
-    handleRowEdit ({index, row}, done) {
+    handleRowEdit ({ index, row }, done) {
      this.formOptions.saveLoading = true
      setTimeout(() => {
        console.log(index)
--- a/src/pages/demo/d2-crud/demo30/index.vue
+++ b/src/pages/demo/d2-crud/demo30/index.vue
@@ -121,11 +121,11 @@ export default {
    }
  },
  methods: {
-    handleFormDataChange ({key, value}) {
+    handleFormDataChange ({ key, value }) {
      console.log(key)
      console.log(value)
    },
-    handleRowEdit ({index, row}, done) {
+    handleRowEdit ({ index, row }, done) {
      this.formOptions.saveLoading = true
      setTimeout(() => {
        console.log(index)
--- a/src/pages/demo/d2-crud/demo7/code.js
+++ b/src/pages/demo/d2-crud/demo7/code.js
@@ -110,7 +110,7 @@ export default {
    }
  },
  methods: {
-    handleRowRemove ({index, row}, done) {
+    handleRowRemove ({ index, row }, done) {
      this.$message({
        message: '删除成功',
        type: 'success'
--- a/src/pages/demo/d2-crud/demo7/index.vue
+++ b/src/pages/demo/d2-crud/demo7/index.vue
@@ -126,7 +126,7 @@ export default {
    }
  },
  methods: {
-    handleRowRemove ({index, row}, done) {
+    handleRowRemove ({ index, row }, done) {
      this.$message({
        message: '删除成功',
        type: 'success'
--- a/src/pages/demo/d2-crud/index/index.vue
+++ b/src/pages/demo/d2-crud/index/index.vue
@@ -1,6 +1,14 @@
 <template>
  <d2-container :filename="filename" type="ghost">
    <d2-module-index-banner slot="header" v-bind="banner"/>
+    <el-alert
+      title="目前 d2-crud 已经升级至 2.x，并且和 1.x 存在一些 API 不兼容，如果您使用的是 1.x，请点击此消息跳转至旧版示例"
+      type="warning"
+      :closable="false"
+      class="d2-mt"
+      show-icon
+      @click.native="$open('https://v1.d2-crud.fairyever.com/#/d2-crud/index')">
+    </el-alert>
    <d2-module-index-menu :menu="menu"/>
  </d2-container>
 </template>
@@ -13,7 +21,7 @@ export default {
      filename: __filename,
      menu,
      banner: {
-        title: 'D2 CRUD',
+        title: 'D2 CRUD v2',
        subTitle: 'D2 Crud 是一个基于 Vue.js 和 Element UI 的表格组件，封装了常用的表格操作。',
        link: 'https://github.com/d2-projects/d2-crud'
      }
--- a/src/router/modules/d2-crud.js
+++ b/src/router/modules/d2-crud.js
@@ -9,7 +9,7 @@ export default {
  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: 'index', name: `${pre}index`, component: () => import('@/pages/demo/d2-crud/index'), meta: { ...meta, title: 'D2 CRUD v2 首页' } },
    { 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: '带边框表格' } },