@lambo-design/shared 1.0.0-beta.242 → 1.0.0-beta.243

package/utils/ajax/interceptors.js

@@ -1,97 +1,97 @@
-import qs from 'qs'
-import cacheRules from "./cacheconf";
-import {getToken,getUrlParams} from '../platform'
-import Bus from '../bus';
-
-
-let timer1, timer2;
-let hasDialog = false;
-
-function requestInterceptors(config) {
-  const params = getUrlParams();
-
-  let token = getToken();
-  if (token) {
-    config.headers.token = token;
-  }
-
-  //sso_token认证
-  if (params.hasOwnProperty('sso_token')||sessionStorage.getItem('sso_token')) {
-    config.params = Object.assign({
-      sso_token: params.sso_token||sessionStorage.getItem('sso_token') ,
-      sso_id: params.sso_id
-    }, config.params)
-  }
-
-  //oauth认证
-  if (params.hasOwnProperty('token')) {
-    if (config.url.indexOf('?') === -1) {
-      config.url = config.url + "?token=" + params.token + "&ssoid=" + params.ssoid;
-    } else {
-      config.url = config.url + "&token=" + params.token + "&ssoid=" + params.ssoid;
-    }
-  }
-
-  if (config.method === 'post') {
-    // payload为自定义不使用qs.stringify序列化的标记，默认config.payload == undefined;
-    // 为true时用于匹配@requestBody定义参数的接口
-    // 使用方式:post(config.AAAServerContext + '/AAA/BBB/CCC', { ...paramRequestBody }, { payload: true })
-    if (!config.payload) {
-      config.data = qs.stringify(config.data)
-    }
-  } else if (config.method === 'get') {
-    for (let rule of cacheRules) {
-      if (rule.test(config.url)) {
-        return config;
-      }
-    }
-    if (config.url.indexOf('?') === -1) {
-      config.url = config.url + "?t=" + new Date().getTime();
-    } else {
-      config.url = config.url + "&t=" + new Date().getTime();
-    }
-  }
-  return config;
-}
-
-function requestError(error) {
-  console.error("服务器内部异常,请稍候再试",error);
-  return Promise.reject(error);
-}
-
-function responseInterceptors(response) {
-  const data = response.data;
-  if (data instanceof Object) {
-    const code = data["code"];
-    if (code === 10106) {
-      if (!hasDialog) {
-        clearTimeout(timer1);
-        timer1 = setTimeout(function () {
-          hasDialog = true;
-          if (confirm("会话已失效，是否重新登录")) {
-            hasDialog = false;
-            Bus.$emit("needLogin");
-          } else {
-            hasDialog = false;
-          }
-        }, 500)
-      }
-    }
-  }
-  return response;
-}
-
-function responseError(error) {
-  clearTimeout(timer2);
-  timer2 = setTimeout(function () {
-    console.error("服务器内部异常,请稍候再试");
-  }, 500)
-  return Promise.reject(error);
-}
-
-export default {
-  requestInterceptors,
-  responseInterceptors,
-  requestError,
-  responseError
-}
+import qs from 'qs'
+import cacheRules from "./cacheconf";
+import {getToken,getUrlParams} from '../platform'
+import Bus from '../bus';
+
+
+let timer1, timer2;
+let hasDialog = false;
+
+function requestInterceptors(config) {
+  const params = getUrlParams();
+
+  let token = getToken();
+  if (token) {
+    config.headers.token = token;
+  }
+
+  //sso_token认证
+  if (params.hasOwnProperty('sso_token')||sessionStorage.getItem('sso_token')) {
+    config.params = Object.assign({
+      sso_token: params.sso_token||sessionStorage.getItem('sso_token') ,
+      sso_id: params.sso_id
+    }, config.params)
+  }
+
+  //oauth认证
+  if (params.hasOwnProperty('token')) {
+    if (config.url.indexOf('?') === -1) {
+      config.url = config.url + "?token=" + params.token + "&ssoid=" + params.ssoid;
+    } else {
+      config.url = config.url + "&token=" + params.token + "&ssoid=" + params.ssoid;
+    }
+  }
+
+  if (config.method === 'post') {
+    // payload为自定义不使用qs.stringify序列化的标记，默认config.payload == undefined;
+    // 为true时用于匹配@requestBody定义参数的接口
+    // 使用方式:post(config.AAAServerContext + '/AAA/BBB/CCC', { ...paramRequestBody }, { payload: true })
+    if (!config.payload) {
+      config.data = qs.stringify(config.data)
+    }
+  } else if (config.method === 'get') {
+    for (let rule of cacheRules) {
+      if (rule.test(config.url)) {
+        return config;
+      }
+    }
+    if (config.url.indexOf('?') === -1) {
+      config.url = config.url + "?t=" + new Date().getTime();
+    } else {
+      config.url = config.url + "&t=" + new Date().getTime();
+    }
+  }
+  return config;
+}
+
+function requestError(error) {
+  console.error("服务器内部异常,请稍候再试",error);
+  return Promise.reject(error);
+}
+
+function responseInterceptors(response) {
+  const data = response.data;
+  if (data instanceof Object) {
+    const code = data["code"];
+    if (code === 10106) {
+      if (!hasDialog) {
+        clearTimeout(timer1);
+        timer1 = setTimeout(function () {
+          hasDialog = true;
+          if (confirm("会话已失效，是否重新登录")) {
+            hasDialog = false;
+            Bus.$emit("needLogin");
+          } else {
+            hasDialog = false;
+          }
+        }, 500)
+      }
+    }
+  }
+  return response;
+}
+
+function responseError(error) {
+  clearTimeout(timer2);
+  timer2 = setTimeout(function () {
+    console.error("服务器内部异常,请稍候再试");
+  }, 500)
+  return Promise.reject(error);
+}
+
+export default {
+  requestInterceptors,
+  responseInterceptors,
+  requestError,
+  responseError
+}

package/utils/assist.js

@@ -1,147 +1,147 @@
-// deepCopy
-
-
-export function deepCopy(data) {
-  let i;
-  const t = typeOf(data);
-  let o;
-
-  if (t === 'array') {
-    o = [];
-  } else if (t === 'object') {
-    o = {};
-  } else {
-    return data;
-  }
-
-  if (t === 'array') {
-    for (i = 0; i < data.length; i++) {
-      o.push(deepCopy(data[i]));
-    }
-  } else if (t === 'object') {
-    for (i in data) {
-      o[i] = deepCopy(data[i]);
-    }
-  }
-  return o;
-}
-export function deepMerge(target, ...sources) {
-  if (!sources.length) return target;
-  const source = sources.shift();
-
-  if (isObject(target) && isObject(source)) {
-    for (const key in source) {
-      if (isObject(source[key])) {
-        if (!target[key]) Object.assign(target, { [key]: {} });
-        deepMerge(target[key], source[key]);
-      } else {
-        Object.assign(target, { [key]: source[key] });
-      }
-    }
-  }
-
-  return deepMerge(target, ...sources);
-}
-
-export function typeOf(obj) {
-  const toString = Object.prototype.toString;
-  const map = {
-    '[object Boolean]': 'boolean',
-    '[object Number]': 'number',
-    '[object String]': 'string',
-    '[object Function]': 'function',
-    '[object Array]': 'array',
-    '[object Date]': 'date',
-    '[object RegExp]': 'regExp',
-    '[object Undefined]': 'undefined',
-    '[object Null]': 'null',
-    '[object Object]': 'object'
-  };
-  return map[toString.call(obj)];
-}
-
-export function operateBtn(vm, h, currentRow, operationName, operation, type, permission, disabled = false) {
-  let renderOption = {
-    props: {
-      type: type,
-      size: "small",
-      ghost: true,
-      disabled: disabled
-    },
-    style: {
-      margin: '0 2px'
-    },
-    on: {
-      'click': () => {
-        operation(vm, currentRow);
-      }
-    }
-  }
-  if(permission){
-    renderOption['directives'] = [{
-      name: "permission",
-      value: permission
-    }]
-  }
-
-  return h('Button', renderOption, operationName);
-
-}
-
-export function operateHref(vm, h, currentRow, operationName, operation, type, permission) {
-  let renderOption = {
-    style: {
-      margin: '0 4px'
-    },
-    on: {
-      'click': () => {
-        operation(vm, currentRow);
-      }
-    }
-  }
-  if(permission){
-    renderOption['directives'] = [{
-      name: "permission",
-      value: permission
-    }]
-  }
-
-   return h('a', renderOption, operationName);
-}
-
-export function operateMore(vm, h, operation) {
-  return h("Dropdown", {
-    style: {
-      marginLeft: "4px",
-    },
-    props: {
-      transfer: true,
-    }
-  }, [
-    h("a", {
-      style: {
-        margin: '0 4px',
-        borderBottom: '0px solid #CC9900',
-      }
-    }, [
-      h("span", "更多"),
-      h("Icon", {
-        props: {
-          type: "ios-arrow-down"
-        },
-      })
-    ]),
-    h('DropdownMenu', {
-      slot: "list",
-    }, operation)
-  ]);
-}
-
-export function isJson(arg) {
-  return typeof (arg) == "object" && Object.prototype.toString.call(arg).toLowerCase() == "[object object]" && !arg.length
-};
-
-
-export function isObject(item) {
-  return (item && typeof item === 'object' && !Array.isArray(item));
-}
+// deepCopy
+
+
+export function deepCopy(data) {
+  let i;
+  const t = typeOf(data);
+  let o;
+
+  if (t === 'array') {
+    o = [];
+  } else if (t === 'object') {
+    o = {};
+  } else {
+    return data;
+  }
+
+  if (t === 'array') {
+    for (i = 0; i < data.length; i++) {
+      o.push(deepCopy(data[i]));
+    }
+  } else if (t === 'object') {
+    for (i in data) {
+      o[i] = deepCopy(data[i]);
+    }
+  }
+  return o;
+}
+export function deepMerge(target, ...sources) {
+  if (!sources.length) return target;
+  const source = sources.shift();
+
+  if (isObject(target) && isObject(source)) {
+    for (const key in source) {
+      if (isObject(source[key])) {
+        if (!target[key]) Object.assign(target, { [key]: {} });
+        deepMerge(target[key], source[key]);
+      } else {
+        Object.assign(target, { [key]: source[key] });
+      }
+    }
+  }
+
+  return deepMerge(target, ...sources);
+}
+
+export function typeOf(obj) {
+  const toString = Object.prototype.toString;
+  const map = {
+    '[object Boolean]': 'boolean',
+    '[object Number]': 'number',
+    '[object String]': 'string',
+    '[object Function]': 'function',
+    '[object Array]': 'array',
+    '[object Date]': 'date',
+    '[object RegExp]': 'regExp',
+    '[object Undefined]': 'undefined',
+    '[object Null]': 'null',
+    '[object Object]': 'object'
+  };
+  return map[toString.call(obj)];
+}
+
+export function operateBtn(vm, h, currentRow, operationName, operation, type, permission, disabled = false) {
+  let renderOption = {
+    props: {
+      type: type,
+      size: "small",
+      ghost: true,
+      disabled: disabled
+    },
+    style: {
+      margin: '0 2px'
+    },
+    on: {
+      'click': () => {
+        operation(vm, currentRow);
+      }
+    }
+  }
+  if(permission){
+    renderOption['directives'] = [{
+      name: "permission",
+      value: permission
+    }]
+  }
+
+  return h('Button', renderOption, operationName);
+
+}
+
+export function operateHref(vm, h, currentRow, operationName, operation, type, permission) {
+  let renderOption = {
+    style: {
+      margin: '0 4px'
+    },
+    on: {
+      'click': () => {
+        operation(vm, currentRow);
+      }
+    }
+  }
+  if(permission){
+    renderOption['directives'] = [{
+      name: "permission",
+      value: permission
+    }]
+  }
+
+   return h('a', renderOption, operationName);
+}
+
+export function operateMore(vm, h, operation) {
+  return h("Dropdown", {
+    style: {
+      marginLeft: "4px",
+    },
+    props: {
+      transfer: true,
+    }
+  }, [
+    h("a", {
+      style: {
+        margin: '0 4px',
+        borderBottom: '0px solid #CC9900',
+      }
+    }, [
+      h("span", "更多"),
+      h("Icon", {
+        props: {
+          type: "ios-arrow-down"
+        },
+      })
+    ]),
+    h('DropdownMenu', {
+      slot: "list",
+    }, operation)
+  ]);
+}
+
+export function isJson(arg) {
+  return typeof (arg) == "object" && Object.prototype.toString.call(arg).toLowerCase() == "[object object]" && !arg.length
+};
+
+
+export function isObject(item) {
+  return (item && typeof item === 'object' && !Array.isArray(item));
+}