From 8374c330711df632e7c92309df33cd277f0ecc6c Mon Sep 17 00:00:00 2001
From: Aaron <427787340@qq.com>
Date: Thu, 29 Aug 2019 11:32:42 +0800
Subject: [PATCH] 优化Scheme静态数据维护

---
 examples/components/code-snippet.vue    |  3 +++
 examples/router/routes.js               | 10 +++++-----
 examples/views/docs/component/scheme.md |  5 +++--
 examples/views/docs/guide/introduce.md  |  2 +-
 examples/views/page/other.vue           | 15 +++++++++++++++
 examples/views/page/test.vue            | 77 -----------------------------------------------------------------------------
 packages/scheme/index.vue               | 17 +++++++++--------
 packages/scheme/utils.js                | 29 +++++++++++++++++++++++++++++
 8 files changed, 65 insertions(+), 93 deletions(-)
 create mode 100644 examples/views/page/other.vue
 delete mode 100644 examples/views/page/test.vue

diff --git a/examples/components/code-snippet.vue b/examples/components/code-snippet.vue
index b5d8ad5..68870ac 100644
--- a/examples/components/code-snippet.vue
+++ b/examples/components/code-snippet.vue
@@ -53,6 +53,9 @@ export default {
     margin: 0px !important;
     padding: 0px !important;
   }
+  .el-pagination.is-background .el-pager li {
+    margin: 0 5px !important;
+  }
 }
 .eagle-code-snippet--demo {
   box-sizing: border-box;
diff --git a/examples/router/routes.js b/examples/router/routes.js
index d5d105c..ab87345 100644
--- a/examples/router/routes.js
+++ b/examples/router/routes.js
@@ -73,13 +73,13 @@ const _components = [
     ]
   },
   {
-    group: '测试',
+    group: '其它',
     children: [
       {
-        path: 'test',
-        name: 'test',
-        meta: { title: 'Scheme 测试' },
-        component: () => import('@/views/page/test'),
+        path: 'other',
+        name: 'other',
+        meta: { title: 'Other 其它' },
+        component: () => import('@/views/page/other'),
       },
     ]
   }
diff --git a/examples/views/docs/component/scheme.md b/examples/views/docs/component/scheme.md
index e18cdb5..ff87a54 100644
--- a/examples/views/docs/component/scheme.md
+++ b/examples/views/docs/component/scheme.md
@@ -4,9 +4,9 @@ Scheme是一个数据驱动的解决方案，通过既定的业务配置参数�
 
 ## 基础用法
 
-配置项list中通过type可以配置任意组件，不受框架限制
+配置一个数据项列表快速生成一个增删改查业务视图
 
-::: snippet 使用`list`属性设置数据源，列表项中的`type`指定组件类型，每一项都已设置为**el-form-item**的子组件，通过`rules`配置校验规则
+::: snippet 使用`list`属性设置数据源，列表项中的`type`指定组件类型，其它包括**Form**、**Detail**、**Search**组件的配置参数格式
 
 ```html
 <template>
@@ -44,4 +44,5 @@ export default {
 
 参数|说明|类型|可选值|默认值
 -|-|-|-|-
+value / v-model |	绑定值 | Array | - | []
 list | 表单项配置列表 | Array | - | []
\ No newline at end of file
diff --git a/examples/views/docs/guide/introduce.md b/examples/views/docs/guide/introduce.md
index dc2e29a..7542367 100644
--- a/examples/views/docs/guide/introduce.md
+++ b/examples/views/docs/guide/introduce.md
@@ -16,7 +16,7 @@
 </div>
 :::
 
-**Vue.js**提供核心驱动，**Element**组成基本结构，{{ appName }}渲染配置项数据
+**Vue.js**提供核心驱动，**Element**组成基本结构，{{ appName }}渲染配置数据
 
 ## 谁在使用
 
diff --git a/examples/views/page/other.vue b/examples/views/page/other.vue
new file mode 100644
index 0000000..339e786
--- /dev/null
+++ b/examples/views/page/other.vue
@@ -0,0 +1,15 @@
+<template>
+  <div>这是一个非markdown页面</div>
+</template>
+
+<script>
+export default {
+  name: 'other',
+  data() {
+    return {
+    }
+  },
+  methods: {
+  }
+}
+</script>
\ No newline at end of file
diff --git a/examples/views/page/test.vue b/examples/views/page/test.vue
deleted file mode 100644
index 429bd85..0000000
--- a/examples/views/page/test.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-<template>
-  <eagle-scheme class="p-3" :list="schemeList" :option="{ $http: $axios, url: '/overseas/price/sale', showActionBtnDelete: false }" @selection="handleSelection">
-    <template #search-enableFlag="{ model }">
-      <eagle-select v-model="model.enableFlag" :dataSource="[{ label: '正常', value: true }, { label: '禁用', value: false }]"></eagle-select>
-    </template>
-    <el-table-column type="selection" width="50"></el-table-column>
-    <template #action-btn-new>
-      <el-button>按钮</el-button>
-    </template>
-    <template #form-label-code="{ label }">
-      修改 - {{ label }}
-    </template>
-    <!-- <template #table-operation-btn-edit>
-      <el-button class="eagle-scheme__table-btn" type="text">测试</el-button>
-    </template> -->
-    <template #table-append>
-      <el-table-column prop="createTime" label="创建时间" min-width="180"></el-table-column>
-      <el-table-column prop="createUser" label="创建人" min-width="160" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="modifyTime" label="修改时间" min-width="180"></el-table-column>
-      <el-table-column prop="modifyUser" label="修改人" min-width="160" show-overflow-tooltip></el-table-column>
-    </template>
-  </eagle-scheme>
-</template>
-
-<script>
-export default {
-  name: 'basicStore',
-  data() {
-    return {
-      schemeList: [
-        { type: 'el-input', label: 'ID', key: 'id', include: 'form', visible: (model, { formMode } = {}) => { return formMode == 'edit' }, show: false,
-          props: { disabled: true },
-        },
-        { type: 'el-input', label: '编码', key: 'code', default: '1231231321231',
-          rules: [{ required: true, message: '编码不能为空', trigger: 'blur' }],
-          props: { placeholder: '编码', disabled: (model, { formMode } = {}) => { return formMode == 'edit' } },
-        },
-        { type: 'el-input', label: '产品', key: 'productCode', agentKey: 'productName',
-          rules: [{ required: true, message: '产品不能为空', trigger: 'blur' }],
-          props: { url: '/overseas/product/select' },
-        },
-        { type: 'el-input-number', label: '价格', key: 'price', exclude: 'search',
-          rules: [{ required: true, message: '价格不能为空', trigger: 'blur' }],
-          props: { placeholder: '价格' },
-        },
-        { type: 'el-input', label: '价格说明', key: 'note', exclude: 'search',
-          props: { placeholder: '价格说明' },
-        },
-        { type: 'el-input', label: '出发城市', key: 'fromCity', exclude: 'search',
-          rules: [{ required: true, message: '出发城市不能为空', trigger: 'change' }],
-          props: { dictionaryCode: 'FROM_CITY_LIST' },
-        },
-        { type: 'el-input', label: '目的地', key: 'toCountry', exclude: 'search',
-          rules: [{ required: true, message: '目的地不能为空', trigger: 'change' }],
-          props: { dictionaryCode: 'TO_COUNTRY' },
-        },
-        { type: 'el-input', label: '状态', key: 'enableFlag', span: 24, searchScheme: { span: 6 },
-          formatter: (r, c, v) => v ? '正常' : '禁用'
-        },
-        { type: 'el-date-picker', label: '生效时间', key: 'enabledTime', exclude: 'search', minWidth: '180',
-          rules: [{ required: true, message: '生效时间不能为空', trigger: 'change' }],
-          props: { type: 'datetime', placeholder: '生效时间', 'value-format': 'yyyy-MM-dd HH:mm:ss' },
-        },
-        { type: 'el-date-picker', label: '禁用时间', key: 'disabledTime', exclude: 'search', minWidth: '180',
-          rules: [{ required: true, message: '禁用时间不能为空', trigger: 'change' }],
-          props: { type: 'datetime', placeholder: '禁用时间', 'value-format': 'yyyy-MM-dd HH:mm:ss' },
-        },
-      ],
-    }
-  },
-  methods: {
-    handleSelection(selection) {
-      console.log(selection);
-    }
-  }
-}
-</script>
\ No newline at end of file
diff --git a/packages/scheme/index.vue b/packages/scheme/index.vue
index 3896852..f67fde9 100644
--- a/packages/scheme/index.vue
+++ b/packages/scheme/index.vue
@@ -164,7 +164,7 @@
 
 <script>
 import { generateListSpace } from './parser';
-import { stringify } from './utils';
+import { stringify, getUUID } from './utils';
 
 let _$http = null;
 let TABLE_DATA_STATIC = [];
@@ -290,9 +290,9 @@ export default {
     }
   },
   mounted() {
-    this.tableData = this.value;
-    this.totalCount = this.value.length;
-    TABLE_DATA_STATIC = this.value;
+    const defaultData = this.value;
+    this.totalCount = defaultData.length;
+    TABLE_DATA_STATIC = defaultData.map(item => { return { ...item, id: item.id || getUUID() } });
     // 设置自动加载数据
     if (this.option.auto !== false) {
       this.handleSearch();
@@ -566,7 +566,8 @@ export default {
           this.dialogLoading = false;
         });
       } else {
-        TABLE_DATA_STATIC.splice(selection[0].$index, 1);
+        TABLE_DATA_STATIC = TABLE_DATA_STATIC.filter(item => item.id !== selection[0].id);
+        // TABLE_DATA_STATIC.splice(selection[0].$index, 1);
         this.hideDialog();
         this.handleSearch();
       }
@@ -647,9 +648,9 @@ export default {
           this.dialogLoading = false;
         });
       } else {
-        TABLE_DATA_STATIC.push(param);
+        TABLE_DATA_STATIC.push({ ...param, id: param.id || getUUID() });
         this.totalCount = TABLE_DATA_STATIC.length;
-        this.hideDialog();
+        // this.hideDialog();
         this.handleSearch();
       }
     },
@@ -684,7 +685,7 @@ export default {
           this.dialogLoading = false;
         });
       } else {
-        this.$set(TABLE_DATA_STATIC, this.tableCurrentRow.$index, param);
+        this.$set(TABLE_DATA_STATIC, this.tableCurrentRow.$index, { ...param, id: param.id || getUUID() });
         this.hideDialog();
         this.handleSearch();
       }
diff --git a/packages/scheme/utils.js b/packages/scheme/utils.js
index 790fe65..0fa703d 100644
--- a/packages/scheme/utils.js
+++ b/packages/scheme/utils.js
@@ -38,4 +38,33 @@ export const parse = (url) => {
     });
   }
   return obj;
+}
+
+export const getUUID = (len, radix) => {
+  var chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('');
+  var uuid = [], i;
+  radix = radix || chars.length;
+
+  if (len) {
+    // Compact form
+    for (i = 0; i < len; i++) uuid[i] = chars[0 | Math.random()*radix];
+  } else {
+    // rfc4122, version 4 form
+    var r;
+
+    // rfc4122 requires these characters
+    uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-';
+    uuid[14] = '4';
+
+    // Fill in random data.  At i==19 set the high bits of clock sequence as
+    // per rfc4122, sec. 4.1.5
+    for (i = 0; i < 36; i++) {
+      if (!uuid[i]) {
+        r = 0 | Math.random()*16;
+        uuid[i] = chars[(i == 19) ? (r & 0x3) | 0x8 : r];
+      }
+    }
+  }
+
+  return uuid.join('');
 }
\ No newline at end of file
--
libgit2 0.21.0