From 11973743c58753f01086ffff98b795f6299ca56a Mon Sep 17 00:00:00 2001
From: Aaron <427787340@qq.com>
Date: Tue, 30 Jul 2019 17:22:20 +0800
Subject: [PATCH] 调整Scheme组件默认返回值格式

---
 examples/main.js             |  48 +++++++++++++++++++++++++++++-------------------
 examples/views/page/test.vue | 101 +++++++++++++++++++++++++++++++----------------------------------------------------------------------
 packages/form/index.vue      |   2 +-
 packages/scheme/index.vue    |  16 ++++++++--------
 packages/search/index.vue    |   2 +-
 5 files changed, 70 insertions(+), 99 deletions(-)

diff --git a/examples/main.js b/examples/main.js
index 0e1664e..4f79e3b 100644
--- a/examples/main.js
+++ b/examples/main.js
@@ -16,10 +16,12 @@ import "highlight.js/styles/color-brewer.css";
 import { Notification } from 'element-ui';
 
 const request = axios.create({
-  baseURL: 'http://47.110.137.80:7101/',
-  timeout: 1000,
+  baseURL: 'http://47.110.137.80:7104/cbin/',
+  timeout: 1000 * 60,
+  withCredentials: true,
   headers: {
-    'Authorization': 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJleHAiOjE2NTE4ODM0MTEsInN1YiI6ImFkbWluIiwiY3JlYXRlZCI6MTU1MTg4MzQxMTk2NX0.rocgsQq_EEbBDV-BcHpJCUS92KGjBH-0Pf47IrW9v3aj6xJCoFIrnKX4vtpPfYscTk1roBhR5s3I1DIvT8B9wg'
+    token: 'be81d1ba777f7081ef6897eec3b4bdf2',
+    'Accept-Language': 'zh-CN'
   }
 });
 
@@ -64,32 +66,40 @@ const checkStatus = (response) => {
 // respone 拦截器
 request.interceptors.response.use(
   response => {
-    const { data = {} } = response;
-    const { businessException, errorCode, message, success } = data;
-    if (success) {
-      return data;
-    } else if (businessException) {
-      if (errorCode) {
-        Notification.error({
-          title: '提示',
-          message,
-          duration: 3000,
-        });
-      }
-      return { success: false };
+    const { data = {}, config } = response;
+    const { code, msg } = data;
+    if (config && config.interceptors === false) { // 请求配置不做返回拦截的情况
+      return response;
     } else {
-      if (errorCode) {
+      if (`${code}` === '401') { // 授权失效
+        removeToken();
+        router.push({ name: 'login' }, () => {
+          location.reload();
+        });
+      } else if (`${code}` === '1000') { // 业务逻辑错误提示
         Notification.error({
           title: '提示',
-          message: codeMessage[errorCode],
+          message: msg,
           duration: 3000,
         });
+        return false;
+      } else if (`${code}` === '0') { // 请求成功
+        return data;
+      } else { // 其它错误，开发环境提示
+        if (process.env.NODE_ENV === 'development') {
+          Notification.error({
+            title: '提示',
+            message: msg,
+            duration: 3000,
+          });
+        }
+        return false;
       }
-      return { success: false };
     }
   },
   error => {
     const e = checkStatus(error.response);
+    console.error(e);
     return { success: false };
   });
 
diff --git a/examples/views/page/test.vue b/examples/views/page/test.vue
index 1dfccc6..7a38097 100644
--- a/examples/views/page/test.vue
+++ b/examples/views/page/test.vue
@@ -1,11 +1,7 @@
 <template>
   <eagle-scheme
-    :option="{ $http: $axios, url: '/dataDictionary', detailMethod: 'queryById', getMethod: 'queryById', editMethod: 'modify' }"
+    :option="{ $http: $axios, url: '/overseas/store' }"
     :list="schemeList"
-    :formProps="{ span: 24, 'label-width': '60px' }"
-    :detailProps="{ span: 24, 'label-width': '50px' }"
-    :dialogProps="dialogProps"
-    @dialog-change="handleDialogChange"
   >
     <el-table-column type="selection" width="50"></el-table-column>
   </eagle-scheme>
@@ -13,82 +9,47 @@
 
 <script>
 export default {
-  name: 'test',
+  name: 'basicStore',
   data() {
     return {
       schemeList: [
         { type: 'el-input', label: 'ID', key: 'id', include: 'form', visible: (model, { formMode } = {}) => { return formMode == 'edit' },
           props: { disabled: true },
         },
-        { type: 'el-input', label: '编码', key: 'code', exclude: 'search',
-          rules: [{ required: true, message: '编码不能为空', trigger: 'blur' }],
-          props: { placeholder: '编码' },
+        { type: 'el-input', label: '门店编码', key: 'code', exclude: 'search',
+          rules: [{ required: true, message: '门店编码不能为空', trigger: 'blur' }],
+          props: { placeholder: '门店编码' },
         },
-        { type: 'el-input', label: '名称', key: 'name',
-          rules: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-          props: { placeholder: '名称' },
+        { type: 'el-input', label: '门店名称', key: 'name',
+          rules: [{ required: true, message: '门店名称不能为空', trigger: 'blur' }],
+          props: { placeholder: '门店名称' },
         },
-        { type: 'el-input', label: '备注', key: 'remark', include: 'table',
-          props: { placeholder: '备注' },
+        { type: 'el-input', label: '合作伙伴', key: 'dwCustomerCode', exclude: 'search',
+          rules: [{ required: true, message: '合作伙伴不能为空', trigger: 'change' }],
+          props: { placeholder: '合作伙伴' },
+        },
+        { type: 'el-input', label: '联系人', key: 'contact', exclude: 'search',
+          rules: [{ required: true, message: '联系人不能为空', trigger: 'change' }],
+          props: { placeholder: '联系人' },
+        },
+        { type: 'el-input', label: '联系方式', key: 'phone', exclude: 'search',
+          rules: [{ required: true, message: '联系方式不能为空', trigger: 'change' }],
+          props: { placeholder: '联系方式' },
+        },
+        { type: 'el-input', label: '联系地址', key: 'address', exclude: 'search',
+          rules: [{ required: true, message: '联系地址不能为空', trigger: 'change' }],
+          props: { placeholder: '联系地址' },
+        },
+        { type: 'el-input', label: '管理员密码', key: 'password', exclude: 'search',
+          rules: [{ required: true, message: '管理员密码不能为空', trigger: 'change' }],
+          props: { placeholder: '管理员密码' },
+        },
+        { type: 'el-input', label: '门店类型', key: 'type',
+          rules: [{ required: true, message: '管理员密码不能为空', trigger: 'change' }],
+          props: { placeholder: '管理员密码' },
         },
       ],
-      dialogType: '',
-    }
-  },
-  computed: {
-    dialogProps() {
-      return { width: this.dialogType === 'dialog-form' ? '500px' : '400px' };
     }
   },
-  methods: {
-    async searchAPI(param) {
-      return this.$axios.get(`/dataDictionary/page?current=1&size=10`)
-        .then((response) => {
-          const { result = [], totalCount = 0 } = response || {};
-          return { result, totalCount };
-        }).catch(() => {
-          return {};
-        });
-    },
-    async getAPI(param) {
-      return this.$axios.get(`/dataDictionary/queryById?id=${param.id}`)
-        .then((response) => {
-          const { result = {} } = response || {};
-          return result;
-        }).catch(() => {
-          return {};
-        });
-    },
-    async newAPI(param) {
-      return this.$axios.post('/dataDictionary/add', param)
-        .then((response) => {
-          const { success = false } = response || {};
-          return success;
-        }).catch(() => {
-          return false;
-        });
-    },
-    async editAPI(param) {
-      return this.$axios.post('/dataDictionary/modify', param)
-        .then((response) => {
-          const { success = false } = response || {};
-          return success;
-        }).catch(() => {
-          return false;
-        });
-    },
-    async deleteAPI(param) {
-      return this.$axios.post('/dataDictionary/delete', param)
-        .then((response) => {
-          const { success = false } = response || {};
-          return success;
-        }).catch(() => {
-          return false;
-        });
-    },
-    handleDialogChange(type) {
-      this.dialogType = type;
-    }
-  }
 }
 </script>
\ No newline at end of file
diff --git a/packages/form/index.vue b/packages/form/index.vue
index a3b92ae..c5176c7 100644
--- a/packages/form/index.vue
+++ b/packages/form/index.vue
@@ -17,7 +17,7 @@
 </style>
 
 <template>
-  <el-form class="eagle-form" ref="form" :model="model" v-bind="{ size: 'small', 'label-width': '90px', ...formProps }">
+  <el-form class="eagle-form" ref="form" :model="model" v-bind="{ size: 'small', 'label-width': '100px', ...formProps }">
     <el-row :gutter="15">
       <template v-for="(data, index) in listOption.dataList">
         <template v-if="listOption.isGroup">
diff --git a/packages/scheme/index.vue b/packages/scheme/index.vue
index 3efe5bd..cd57488 100644
--- a/packages/scheme/index.vue
+++ b/packages/scheme/index.vue
@@ -307,8 +307,8 @@ export default {
         this.tableLoading = true;
         _$http.get(`${this.option.url.trim('/')}/${this.option.searchMethod || 'page'}?${stringify(param)}`)
         .then((response) => {
-          const { result = [], totalCount = 0 } = response || {};
-          this.tableData = result;
+          const { result: { list = [], totalCount = 0 } = {} } = response || {};
+          this.tableData = list;
           this.totalCount = totalCount;
         })
         .finally(() => {
@@ -456,8 +456,8 @@ export default {
         const postData = param;
         _$http.post(`${this.option.url.trim('/')}/${this.option.newMethod || 'delete'}`, postData)
         .then(response => {
-          const { success = false } = response || {};
-          if (success) {
+          const { code } = response || {};
+          if (`${code}` === '0') {
             this.hideDialog();
             this.handleSearch();
             if (this.$message) { this.$message({ message: '删除成功', type: 'success' }); }
@@ -523,8 +523,8 @@ export default {
         delete postData[formPrimaryKey || primaryKey];
         _$http.post(`${this.option.url.trim('/')}/${this.option.newMethod || 'add'}`, postData)
         .then(response => {
-          const { success = false } = response || {};
-          if (success) {
+          const { code } = response || {};
+          if (`${code}` === '0') {
             this.hideDialog();
             this.handleSearch();
             if (this.$message) { this.$message({ message: '提交成功', type: 'success' }); }
@@ -557,8 +557,8 @@ export default {
         this.dialogLoading = true;
         _$http.post(`${this.option.url.trim('/')}/${this.option.editMethod || 'update'}`, param)
         .then(response => {
-          const { success = false } = response || {};
-          if (success) {
+          const { code } = response || {};
+          if (`${code}` === '0') {
             this.hideDialog();
             this.handleSearch();
             if (this.$message) { this.$message({ message: '编辑成功', type: 'success' }); }
diff --git a/packages/search/index.vue b/packages/search/index.vue
index 13ee4c1..6c7fea8 100644
--- a/packages/search/index.vue
+++ b/packages/search/index.vue
@@ -60,7 +60,7 @@ export default {
       default() {
         return {
           size: 'small',
-          'label-width': '70px'
+          'label-width': '90px'
         }
       }
     },
--
libgit2 0.21.0