vue2-client 1.3.0 → 1.3.3

package/src/utils/excel/Export2Excel.js

@@ -1,142 +1,141 @@
-/* eslint-disable */
-require('script-loader!file-saver');
-require('./Blob.js');
-require('script-loader!xlsx/dist/xlsx.core.min');
-
-function generateArray(table) {
-  var out = [];
-  var rows = table.querySelectorAll('tr');
-  var ranges = [];
-  for (var R = 0; R < rows.length; ++R) {
-    var outRow = [];
-    var row = rows[R];
-    var columns = row.querySelectorAll('td');
-    for (var C = 0; C < columns.length; ++C) {
-      var cell = columns[C];
-      var colspan = cell.getAttribute('colspan');
-      var rowspan = cell.getAttribute('rowspan');
-      var cellValue = cell.innerText;
-      if (cellValue !== "" && cellValue == +cellValue) cellValue = +cellValue;
-
-      //Skip ranges
-      ranges.forEach(function (range) {
-        if (R >= range.s.r && R <= range.e.r && outRow.length >= range.s.c && outRow.length <= range.e.c) {
-          for (var i = 0; i <= range.e.c - range.s.c; ++i) outRow.push(null);
-        }
-      });
-
-      //Handle Row Span
-      if (rowspan || colspan) {
-        rowspan = rowspan || 1;
-        colspan = colspan || 1;
-        ranges.push({s: {r: R, c: outRow.length}, e: {r: R + rowspan - 1, c: outRow.length + colspan - 1}});
-      }
-      ;
-
-      //Handle Value
-      outRow.push(cellValue !== "" ? cellValue : null);
-
-      //Handle Colspan
-      if (colspan) for (var k = 0; k < colspan - 1; ++k) outRow.push(null);
-    }
-    out.push(outRow);
-  }
-  return [out, ranges];
-};
-
-function datenum(v, date1904) {
-  if (date1904) v += 1462;
-  var epoch = Date.parse(v);
-  return (epoch - new Date(Date.UTC(1899, 11, 30))) / (24 * 60 * 60 * 1000);
-}
-
-function sheet_from_array_of_arrays(data, opts) {
-  var ws = {};
-  var range = {s: {c: 10000000, r: 10000000}, e: {c: 0, r: 0}};
-  for (var R = 0; R != data.length; ++R) {
-    for (var C = 0; C != data[R].length; ++C) {
-      if (range.s.r > R) range.s.r = R;
-      if (range.s.c > C) range.s.c = C;
-      if (range.e.r < R) range.e.r = R;
-      if (range.e.c < C) range.e.c = C;
-      var cell = {v: data[R][C]};
-      if (cell.v == null) continue;
-      var cell_ref = XLSX.utils.encode_cell({c: C, r: R});
-
-      if (typeof cell.v === 'number') cell.t = 'n';
-      else if (typeof cell.v === 'boolean') cell.t = 'b';
-      else if (cell.v instanceof Date) {
-        cell.t = 'n';
-        cell.z = XLSX.SSF._table[14];
-        cell.v = datenum(cell.v);
-      } else cell.t = 's';
-
-      ws[cell_ref] = cell;
-    }
-  }
-  if (range.s.c < 10000000) ws['!ref'] = XLSX.utils.encode_range(range);
-  return ws;
-}
-
-function Workbook() {
-  if (!(this instanceof Workbook)) return new Workbook();
-  this.SheetNames = [];
-  this.Sheets = {};
-}
-
-function s2ab(s) {
-  var buf = new ArrayBuffer(s.length);
-  var view = new Uint8Array(buf);
-  for (var i = 0; i != s.length; ++i) view[i] = s.charCodeAt(i) & 0xFF;
-  return buf;
-}
-
-export function exportTable(id) {
-  var theTable = document.getElementById(id);
-  console.log('a')
-  var oo = generateArray(theTable);
-  var ranges = oo[1];
-
-  /* original data */
-  var data = oo[0];
-  var ws_name = "SheetJS";
-  console.log(data);
-
-  var wb = new Workbook(), ws = sheet_from_array_of_arrays(data);
-
-  /* add ranges to worksheet */
-  // ws['!cols'] = ['apple', 'banan'];
-  ws['!merges'] = ranges;
-
-  /* add worksheet to workbook */
-  wb.SheetNames.push(ws_name);
-  wb.Sheets[ws_name] = ws;
-
-  var wbout = XLSX.write(wb, {bookType: 'xlsx', bookSST: false, type: 'binary'});
-
-  saveAs(new Blob([s2ab(wbout)], {type: "application/octet-stream"}), "test.xlsx")
-}
-
-function formatJson(jsonData) {
-  console.log(jsonData)
-}
-
-export function exportJson(th, jsonData, defaultTitle) {
-
-  /* original data */
-
-  var data = jsonData;
-  data.unshift(th);
-  var ws_name = "SheetJS";
-
-  var wb = new Workbook(), ws = sheet_from_array_of_arrays(data);
-
-
-  /* add worksheet to workbook */
-  wb.SheetNames.push(ws_name);
-  wb.Sheets[ws_name] = ws;
-
-  var wbout = XLSX.write(wb, {bookType: 'xlsx', bookSST: false, type: 'binary'});
-  var title = defaultTitle || '列表'
-  saveAs(new Blob([s2ab(wbout)], {type: "application/octet-stream"}), title + ".xlsx")
-}
+/* eslint-disable */
+require('script-loader!file-saver');
+require('./Blob.js');
+require('script-loader!xlsx/dist/xlsx.core.min');
+
+function generateArray(table) {
+  const out = [];
+  const rows = table.querySelectorAll('tr');
+  const ranges = [];
+  for (let R = 0; R < rows.length; ++R) {
+    const outRow = [];
+    const row = rows[R];
+    const columns = row.querySelectorAll('td');
+    for (let C = 0; C < columns.length; ++C) {
+      const cell = columns[C];
+      let colspan = cell.getAttribute('colspan');
+      let rowspan = cell.getAttribute('rowspan');
+      let cellValue = cell.innerText;
+      if (cellValue !== "" && cellValue == +cellValue) cellValue = +cellValue;
+
+      //Skip ranges
+      ranges.forEach(function (range) {
+        if (R >= range.s.r && R <= range.e.r && outRow.length >= range.s.c && outRow.length <= range.e.c) {
+          for (let i = 0; i <= range.e.c - range.s.c; ++i) outRow.push(null);
+        }
+      });
+
+      //Handle Row Span
+      if (rowspan || colspan) {
+        rowspan = rowspan || 1;
+        colspan = colspan || 1;
+        ranges.push({s: {r: R, c: outRow.length}, e: {r: R + rowspan - 1, c: outRow.length + colspan - 1}});
+      }
+
+      //Handle Value
+      outRow.push(cellValue !== "" ? cellValue : null);
+
+      //Handle Colspan
+      if (colspan) for (let k = 0; k < colspan - 1; ++k) outRow.push(null);
+    }
+    out.push(outRow);
+  }
+  return [out, ranges];
+}
+
+function datenum(v, date1904) {
+  if (date1904) v += 1462;
+  const epoch = Date.parse(v);
+  return (epoch - new Date(Date.UTC(1899, 11, 30))) / (24 * 60 * 60 * 1000);
+}
+
+function sheet_from_array_of_arrays(data, opts) {
+  const ws = {};
+  const range = {s: {c: 10000000, r: 10000000}, e: {c: 0, r: 0}};
+  for (let R = 0; R != data.length; ++R) {
+    for (let C = 0; C != data[R].length; ++C) {
+      if (range.s.r > R) range.s.r = R;
+      if (range.s.c > C) range.s.c = C;
+      if (range.e.r < R) range.e.r = R;
+      if (range.e.c < C) range.e.c = C;
+      const cell = {v: data[R][C]};
+      if (cell.v == null) continue;
+      const cell_ref = XLSX.utils.encode_cell({c: C, r: R});
+
+      if (typeof cell.v === 'number') cell.t = 'n';
+      else if (typeof cell.v === 'boolean') cell.t = 'b';
+      else if (cell.v instanceof Date) {
+        cell.t = 'n';
+        cell.z = XLSX.SSF._table[14];
+        cell.v = datenum(cell.v);
+      } else cell.t = 's';
+
+      ws[cell_ref] = cell;
+    }
+  }
+  if (range.s.c < 10000000) ws['!ref'] = XLSX.utils.encode_range(range);
+  return ws;
+}
+
+function Workbook() {
+  if (!(this instanceof Workbook)) return new Workbook();
+  this.SheetNames = [];
+  this.Sheets = {};
+}
+
+function s2ab(s) {
+  const buf = new ArrayBuffer(s.length);
+  const view = new Uint8Array(buf);
+  for (let i = 0; i != s.length; ++i) view[i] = s.charCodeAt(i) & 0xFF;
+  return buf;
+}
+
+export function exportTable(id) {
+  const theTable = document.getElementById(id);
+  console.log('a')
+  const oo = generateArray(theTable);
+  const ranges = oo[1];
+
+  /* original data */
+  const data = oo[0];
+  const ws_name = "SheetJS";
+  console.log(data);
+
+  const wb = new Workbook(), ws = sheet_from_array_of_arrays(data);
+
+  /* add ranges to worksheet */
+  // ws['!cols'] = ['apple', 'banan'];
+  ws['!merges'] = ranges;
+
+  /* add worksheet to workbook */
+  wb.SheetNames.push(ws_name);
+  wb.Sheets[ws_name] = ws;
+
+  const wbout = XLSX.write(wb, {bookType: 'xlsx', bookSST: false, type: 'binary'});
+
+  saveAs(new Blob([s2ab(wbout)], {type: "application/octet-stream"}), "test.xlsx")
+}
+
+function formatJson(jsonData) {
+  console.log(jsonData)
+}
+
+export function exportJson(th, jsonData, defaultTitle) {
+
+  /* original data */
+
+  const data = jsonData;
+  data.unshift(th);
+  const ws_name = "SheetJS";
+
+  const wb = new Workbook(), ws = sheet_from_array_of_arrays(data);
+
+
+  /* add worksheet to workbook */
+  wb.SheetNames.push(ws_name);
+  wb.Sheets[ws_name] = ws;
+
+  const wbout = XLSX.write(wb, {bookType: 'xlsx', bookSST: false, type: 'binary'});
+  const title = defaultTitle || '列表';
+  saveAs(new Blob([s2ab(wbout)], {type: "application/octet-stream"}), title + ".xlsx")
+}

package/src/utils/i18n.js

@@ -1,80 +1,80 @@
-import Vue from 'vue'
-import VueI18n from 'vue-i18n'
-import routesI18n from '@vue2-client/router/i18n'
-import './Objects'
-import { getI18nKey } from '@vue2-client/utils/routerUtil'
-
-/**
- * 创建 i18n 配置
- * @param locale 本地化语言
- * @param fallback 回退语言
- * @returns {VueI18n}
- */
-function initI18n (locale, fallback) {
-  Vue.use(VueI18n)
-  const i18nOptions = {
-    locale,
-    fallbackLocale: fallback,
-    silentFallbackWarn: true
-  }
-  return new VueI18n(i18nOptions)
-}
-
-/**
- * 根据 router options 配置生成 国际化语言
- * @param lang
- * @param routes
- * @param valueKey
- * @returns {*}
- */
-function generateI18n (lang, routes, valueKey) {
-  routes.forEach(route => {
-    const keys = getI18nKey(route.fullPath).split('.')
-    const value = valueKey === 'path' ? route[valueKey].split('/').filter(item => !item.startsWith(':') && item != '').join('.') : route[valueKey]
-    lang.assignProps(keys, value)
-    if (route.children) {
-      generateI18n(lang, route.children, valueKey)
-    }
-  })
-  return lang
-}
-
-/**
- * 格式化 router.options.routes，生成 fullPath
- * @param routes
- * @param parentPath
- */
-function formatFullPath (routes, parentPath = '') {
-  routes.forEach(route => {
-    const isFullPath = route.path.substring(0, 1) === '/'
-    route.fullPath = isFullPath ? route.path : (parentPath === '/' ? parentPath + route.path : parentPath + '/' + route.path)
-    if (route.children) {
-      formatFullPath(route.children, route.fullPath)
-    }
-  })
-}
-
-/**
- * 从路由提取国际化数据
- * @param i18n
- * @param routes
- */
-function mergeI18nFromRoutes (i18n, routes) {
-  formatFullPath(routes)
-  // eslint-disable-next-line no-new-object
-  const CN = generateI18n(new Object(), routes, 'name')
-  // eslint-disable-next-line no-new-object
-  const US = generateI18n(new Object(), routes, 'path')
-  i18n.mergeLocaleMessage('CN', CN)
-  i18n.mergeLocaleMessage('US', US)
-  const messages = routesI18n.messages
-  Object.keys(messages).forEach(lang => {
-    i18n.mergeLocaleMessage(lang, messages[lang])
-  })
-}
-
-export {
-  initI18n,
-  mergeI18nFromRoutes,
-  formatFullPath
-}
+import Vue from 'vue'
+import VueI18n from 'vue-i18n'
+import routesI18n from '@vue2-client/router/i18n'
+import './Objects'
+import { getI18nKey } from '@vue2-client/utils/routerUtil'
+
+/**
+ * 创建 i18n 配置
+ * @param locale 本地化语言
+ * @param fallback 回退语言
+ * @returns {VueI18n}
+ */
+function initI18n (locale, fallback) {
+  Vue.use(VueI18n)
+  const i18nOptions = {
+    locale,
+    fallbackLocale: fallback,
+    silentFallbackWarn: true
+  }
+  return new VueI18n(i18nOptions)
+}
+
+/**
+ * 根据 router options 配置生成 国际化语言
+ * @param lang
+ * @param routes
+ * @param valueKey
+ * @returns {*}
+ */
+function generateI18n (lang, routes, valueKey) {
+  routes.forEach(route => {
+    const keys = getI18nKey(route.fullPath).split('.')
+    const value = valueKey === 'path' ? route[valueKey].split('/').filter(item => !item.startsWith(':') && item != '').join('.') : route[valueKey]
+    lang.assignProps(keys, value)
+    if (route.children) {
+      generateI18n(lang, route.children, valueKey)
+    }
+  })
+  return lang
+}
+
+/**
+ * 格式化 router.options.routes，生成 fullPath
+ * @param routes
+ * @param parentPath
+ */
+function formatFullPath (routes, parentPath = '') {
+  routes.forEach(route => {
+    const isFullPath = route.path.substring(0, 1) === '/'
+    route.fullPath = isFullPath ? route.path : (parentPath === '/' ? parentPath + route.path : parentPath + '/' + route.path)
+    if (route.children) {
+      formatFullPath(route.children, route.fullPath)
+    }
+  })
+}
+
+/**
+ * 从路由提取国际化数据
+ * @param i18n
+ * @param routes
+ */
+function mergeI18nFromRoutes (i18n, routes) {
+  formatFullPath(routes)
+  // eslint-disable-next-line no-new-object
+  const CN = generateI18n({}, routes, 'name')
+  // eslint-disable-next-line no-new-object
+  const US = generateI18n({}, routes, 'path')
+  i18n.mergeLocaleMessage('CN', CN)
+  i18n.mergeLocaleMessage('US', US)
+  const messages = routesI18n.messages
+  Object.keys(messages).forEach(lang => {
+    i18n.mergeLocaleMessage(lang, messages[lang])
+  })
+}
+
+export {
+  initI18n,
+  mergeI18nFromRoutes,
+  formatFullPath
+}

package/src/utils/request.js

@@ -159,12 +159,12 @@ const errorHandler = (error) => {
     const data = error.response.data
     // 从 localstorage 获取 token
     const token = localStorage.getItem(ACCESS_TOKEN)
-    if (error.response.status === 403 || data.code === 403) {
+    if (error.response.status === 403 || (data && data.code === 403)) {
       notification.error({
         message: '禁止访问',
         description: data
       })
-    } else if ((error.response.status === 401 || data.code === 401) && !(data.result && data.result.isLogin)) {
+    } else if (error.response.status === 401 || (data && data.code === 401)) {
       notification.error({
         message: '鉴权失败',
         description: data
@@ -176,14 +176,14 @@ const errorHandler = (error) => {
           }, 1500)
         })
       }
-    } else if (error.response.status === 500 || data.code === 500) {
+    } else if (error.response.status === 500 || (data && data.code === 500)) {
       notification.error({
         message: '系统异常',
         description: data
       })
     } else {
       notification.error({
-        message: '数据异常',
+        message: '网络异常',
         description: data
       })
     }