@lambo-design/shared 1.0.0-beta.312 → 1.0.0-beta.314

package/nstyles/components/form.less

@@ -61,6 +61,7 @@
     }
     .ivu-form-item-label {
       flex-shrink: 0;
+      text-align: right !important;
     }
     .textAlignLeft {
       text-align: left;

package/nstyles/third/ag.less

@@ -204,3 +204,7 @@
     var(--ag-internal-padded-row-height)
   ) !important;
 }
+
+.column-highlight {
+  background: var(--ag-selected-row-background-color);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/shared",
-  "version": "1.0.0-beta.312",
+  "version": "1.0.0-beta.314",
   "description": "",
   "main": "index.js",
   "author": "lambo",

package/utils/ajax/abort-controller.js

@@ -1,4 +1,6 @@
 // 用于存储每个请求的标识和取消函数
+import qs from "qs";
+
 const pendingMap = new Map();
 
 const getPendingUrl = (config) => {
@@ -7,7 +9,7 @@ const getPendingUrl = (config) => {
   // 生成请求唯一标识
   return headers['is-cancel-token']
       ? headers['is-cancel-token']
-      : [url, method].join('&');
+      : [url, method, qs.stringify(data)].join('&');
 };
 
 /**
@@ -35,7 +37,7 @@ function removePending(config) {
     // 如果当前请求在等待中，取消它并将其从等待中移除
     const abortController = pendingMap.get(url);
     if (abortController) {
-      abortController.abort(url);
+      abortController.abort();
     }
     pendingMap.delete(url);
   }

package/utils/ajax/cancel-reason.js

@@ -0,0 +1,25 @@
+// 自定义取消原因枚举
+import Vue from "vue";
+
+export const CancelReason = {
+    USER_ACTION: 'user_action',
+    NAVIGATION: 'navigation',
+    TIMEOUT: 'timeout',
+    DUPLICATE: 'duplicate'
+};
+
+export const showReason = (reason)=>{
+    switch (reason) {
+        case CancelReason.USER_ACTION:
+            Vue.prototype.$Message.info('操作已取消')
+            break;
+        case CancelReason.TIMEOUT:
+            Vue.prototype.$Message.error('请求超时，请重试');
+            break;
+        case CancelReason.DUPLICATE:
+            Vue.prototype.$Message.warning('重复请求已取消');
+            break;
+        default:
+            Vue.prototype.$Message.error('请求已取消');
+    }
+}

package/utils/ajax/cancel-token.js

@@ -1,6 +1,7 @@
 // axios 0.22.0 版本以后推荐使用abort-controller
 import axios from "axios";
-
+import qs from 'qs'
+import {CancelReason} from "./cancel-reason";
 // 存储所有请求的取消函数
 const cancelTokenMap = {};
 
@@ -10,7 +11,7 @@ const getPendingUrl = (config) => {
   // 生成请求唯一标识
   return headers['is-cancel-token']
       ? headers['is-cancel-token']
-      : [url, method, JSON.stringify(data), JSON.stringify(headers)].join('&');
+      : [url, method, qs.stringify(data)].join('&');
 };
 /**
  * 生成请求唯一标识并注册取消函数
@@ -47,7 +48,12 @@ function removePending(config) {
   const cancelFn = cancelTokenMap[requestId];
 
   if (cancelFn && typeof cancelFn === 'function') {
-    cancelFn(); // 执行取消
+    cancelFn({
+      type: 'cancel',
+      url: requestId,
+      reason: CancelReason.DUPLICATE,
+      message: '数据正在处理，请勿重复提交'
+    }); // 执行取消
     delete cancelTokenMap[requestId]; // 清理
   }
 }
@@ -58,7 +64,15 @@ function removePending(config) {
 function removeAllPending() {
   Object.keys(cancelTokenMap).forEach(key => {
     const cancelFn = cancelTokenMap[key];
-    cancelFn();
+    if (cancelFn && typeof cancelFn === 'function') {
+      cancelFn({
+        type: 'cancel',
+        url: key,
+        reason: CancelReason.NAVIGATION,
+        message: '请求已取消'
+      }); // 执行取消
+      delete cancelTokenMap[key]; // 清理
+    }
   });
 }
 

package/utils/ajax/interceptors.js

@@ -6,6 +6,9 @@ import headers from './headers';
 import {throttle} from "./throttle";
 import abortController from "./abort-controller"
 import cancelToken from "./cancel-token"
+import { isCancel,Cancel } from "axios";
+import Vue from "vue";
+import {CancelReason} from "./cancel-reason";
 let timer1, timer2;
 let hasDialog = false;
 
@@ -64,9 +67,9 @@ function requestInterceptors(config) {
 
   // 添加防止重复提交
   if(process.env.VUE_APP_IF_OPEN_NO_REPEAT_SUBMIT &&  process.env.VUE_APP_IF_OPEN_NO_REPEAT_SUBMIT === "true"){
-    if(throttle(config)){
-      return Promise.reject(new Error('数据正在处理，请勿重复提交'));
-    }
+    // if(throttle(config)){
+    //   return Promise.reject(new Error('数据正在处理，请勿重复提交'));
+    // }
     // if(!config.ignoreCancelToken){
     //   abortController.addPending(config);
     // }
@@ -109,11 +112,16 @@ function responseInterceptors(response) {
 }
 
 function responseError(error) {
-  clearTimeout(timer2);
-  timer2 = setTimeout(function () {
-    console.error("服务器内部异常,请稍候再试");
-  }, 500)
-  return Promise.reject(error);
+  if(isCancel(error)){
+    Vue.prototype.$Message.error(error.message)
+    return new Promise(() => {});
+  } else {
+    clearTimeout(timer2);
+    timer2 = setTimeout(function () {
+      console.error("服务器内部异常,请稍候再试");
+    }, 500)
+    return Promise.reject(error);
+  }
 }
 
 export default {

package/utils/ajax/throttle.js

@@ -1,9 +1,10 @@
+import qs from 'qs'
 const requestObjMap = {};
 
 const getPendingUrl = (config) => {
     const { url, method, data, headers } = config;
     // 生成请求唯一标识
-    return [url, method, JSON.stringify(data), JSON.stringify(headers)].join('&');
+    return [url, method, qs.stringify(data), qs.stringify(headers)].join('&');
 };
 /**
  * 防止重复提交

package/utils/style.js

@@ -1,24 +1,24 @@
-const SPECIAL_CHARS_REGEXP = /([\:\-\_]+(.))/g
-const MOZ_HACK_REGEXP = /^moz([A-Z])/
-
-function camelCase(name) {
-  return name
-    .replace(SPECIAL_CHARS_REGEXP, function (_, separator, letter, offset) {
-      return offset ? letter.toUpperCase() : letter
-    })
-    .replace(MOZ_HACK_REGEXP, 'Moz$1')
-}
-// getStyle
-export function getStyle(element, styleName) {
-  if (!element || !styleName) return null
-  styleName = camelCase(styleName)
-  if (styleName === 'float') {
-    styleName = 'cssFloat'
-  }
-  try {
-    const computed = document.defaultView.getComputedStyle(element, '')
-    return element.style[styleName] || computed ? computed[styleName] : null
-  } catch (e) {
-    return element.style[styleName]
-  }
-}
+const SPECIAL_CHARS_REGEXP = /([\:\-\_]+(.))/g
+const MOZ_HACK_REGEXP = /^moz([A-Z])/
+
+function camelCase(name) {
+  return name
+    .replace(SPECIAL_CHARS_REGEXP, function (_, separator, letter, offset) {
+      return offset ? letter.toUpperCase() : letter
+    })
+    .replace(MOZ_HACK_REGEXP, 'Moz$1')
+}
+// getStyle
+export function getStyle(element, styleName) {
+  if (!element || !styleName) return null
+  styleName = camelCase(styleName)
+  if (styleName === 'float') {
+    styleName = 'cssFloat'
+  }
+  try {
+    const computed = document.defaultView.getComputedStyle(element, '')
+    return element.style[styleName] || computed ? computed[styleName] : null
+  } catch (e) {
+    return element.style[styleName]
+  }
+}

package/utils/transfer-queue.js

@@ -1,7 +1,7 @@
-let transferIndex = 1000
-
-function transferIncrease() {
-  transferIndex++
-}
-
-export { transferIndex, transferIncrease }
+let transferIndex = 1000
+
+function transferIncrease() {
+  transferIndex++
+}
+
+export { transferIndex, transferIncrease }