yuang-framework-ui-common 1.0.20 → 1.0.22

package/lib/config/gatewayConfig.ts

@@ -1,9 +1,10 @@
 import { http } from '../config/httpConfig';
 import { getLocalStorageItem, setLocalStorageItem, removeLocalStorageItem } from '../utils/storageUtils';
 
+const getGatewayConfigUrl = '/server/gateway/getGatewayConfig';
 const initGatewayConfig = () => {
     return new Promise<void>(async resolve => {
-        let res = await http.get('/server/gateway/getGatewayConfig');
+        let res = await http.get(getGatewayConfigUrl);
         setLocalStorageItem("gatewayAccessToken", res.data.data.gatewayAccessToken, res.data.data.gatewayTimeout);
         setLocalStorageItem("gatewayPublicKey", res.data.data.gatewayPublicKey, res.data.data.gatewayTimeout);
         resolve();
@@ -15,6 +16,7 @@ const clearGatewayConfig = () => {
     removeLocalStorageItem("gatewayPublicKey");
 }
 export {
+    getGatewayConfigUrl,
     initGatewayConfig,
     clearGatewayConfig
 }

package/lib/config/httpConfig.ts

@@ -5,7 +5,7 @@ import { alertMessageBox } from '../utils/messageBoxUtils';
 
 import { getSsoLoginUrl, clearSsoAccessToken, setSsoAccessToken } from '../utils/ssoUtils';
 
-import { clearGatewayConfig, initGatewayConfig } from '../config/gatewayConfig';
+import { clearGatewayConfig, initGatewayConfig, getGatewayConfigUrl } from '../config/gatewayConfig';
 
 import { getLocalStorageItem } from '../utils/storageUtils'
 
@@ -21,31 +21,14 @@ const http = axios.create({
 })
 
 
+
 /* 请求拦截 */
 http.interceptors.request.use(async config => {
-    config.headers["X-Requested-With"] = 'XMLHttpRequest';
-
     let gatewayAccessToken = getLocalStorageItem("gatewayAccessToken") ?? '';
-    let gatewayPublicKey = getLocalStorageItem("gatewayPublicKey") ?? '';
-    let ssoAccessToken = getLocalStorageItem("ssoAccessToken") ?? '';
-
-    debugger
-    if(!gatewayAccessToken && config.url != '/server/gateway/getGatewayConfig') {
+    if(!gatewayAccessToken && config.url != getGatewayConfigUrl) {
         await initGatewayConfig();
-        return axios.request(config);
-    }
-
-    if (gatewayAccessToken) {
-        config.headers["Gateway-Access-Token"] = gatewayAccessToken;
     }
-    if (gatewayPublicKey) {
-        config.headers["Gateway-Public-Key"] = gatewayPublicKey;
-    }
-
-    if (ssoAccessToken) {
-        config.headers["Sso-Access-Token"] = ssoAccessToken;
-    }
-    config.headers["Request-Id"] = 'test';
+    beforeRequestConfig(config);
     return config;
 }, error => {
     showErrorMessage(error?.message || messageMap.requestError);
@@ -103,5 +86,32 @@ http.interceptors.response.use((res) => {
     return Promise.reject(error);
 });
 
+/**
+ * 请求之前的配置
+ * @param config
+ */
+const beforeRequestConfig = (config) => {
+    if(!config.url){
+        return console.error('参数[url]不存在');
+    }
+    config.headers["X-Requested-With"] = 'XMLHttpRequest';
+
+    let gatewayAccessToken = getLocalStorageItem("gatewayAccessToken") ?? '';
+    let gatewayPublicKey = getLocalStorageItem("gatewayPublicKey") ?? '';
+    let ssoAccessToken = getLocalStorageItem("ssoAccessToken") ?? '';
+
+    if (gatewayAccessToken) {
+        config.headers["Gateway-Access-Token"] = gatewayAccessToken;
+    }
+    if (gatewayPublicKey) {
+        config.headers["Gateway-Public-Key"] = gatewayPublicKey;
+    }
+
+    if (ssoAccessToken) {
+        config.headers["Sso-Access-Token"] = ssoAccessToken;
+    }
+    config.headers["Request-Id"] = 'test';
+}
+
 
 export { http }

package/lib/config/initConfig.ts

@@ -12,7 +12,7 @@ import 'vant/lib/index.css';
 import {http} from './httpConfig';
 import moment from 'moment';
 
-const initConfig = (app) => {
+const initConfig = (app: any) => {
     app.config.globalProperties.$http = http;
     app.config.globalProperties.$moment = moment;
 

package/lib/utils/dateUtils.ts

@@ -0,0 +1,41 @@
+/**
+ * 某个时间在当前时间的多久前
+ * @param time 需要语义化的时间
+ * @param onlyDate 超过30天是否仅返回日期
+ * @returns {string} 语义化后的时间
+ */
+const getTimeAgoString = (time, onlyDate) => {
+    if (!time) return '';
+    if (typeof time === 'string') time = time.replace(/-/g, '/');
+    let arr = [[], []], stamp = new Date().getTime() - new Date(time).getTime();
+    // 30天以上返回具体日期
+    if (stamp > 1000 * 60 * 60 * 24 * 31) {
+        stamp = new Date(time);
+        arr[0][0] = this.digit(stamp.getFullYear(), 4);
+        arr[0][1] = this.digit(stamp.getMonth() + 1);
+        arr[0][2] = this.digit(stamp.getDate());
+        if (!onlyDate) {  // 是否输出时间
+            arr[1][0] = this.digit(stamp.getHours());
+            arr[1][1] = this.digit(stamp.getMinutes());
+            arr[1][2] = this.digit(stamp.getSeconds());
+        }
+        return arr[0].join('-') + ' ' + arr[1].join(':');
+    }
+    // 30天以内，返回“多久前”
+    if (stamp >= 1000 * 60 * 60 * 24) {
+        return ((stamp / 1000 / 60 / 60 / 24) | 0) + '天前';
+    } else if (stamp >= 1000 * 60 * 60) {
+        return ((stamp / 1000 / 60 / 60) | 0) + '小时前';
+    } else if (stamp >= 1000 * 60 * 3) {  // 3分钟以内为：刚刚
+        return ((stamp / 1000 / 60) | 0) + '分钟前';
+    } else if (stamp < 0) {
+        return '未来';
+    } else {
+        return '刚刚';
+    }
+}
+
+export {
+    getTimeAgoString,
+
+}

package/lib/utils/objectUtils.ts

@@ -1,6 +1,5 @@
 import { cloneDeep } from 'lodash';
 
 export {
-
     cloneDeep
 }

package/lib/utils/uuidUtils.ts

@@ -0,0 +1,26 @@
+/**
+ * 生成UUID
+ * @returns {string}
+ */
+const getUuid = () => {
+    let d = new Date().getTime();
+    if (window.performance && typeof window.performance.now === "function") {
+        d += performance.now(); //use high-precision timer if available
+    }
+    let uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+        var r = (d + Math.random() * 16) % 16 | 0;
+        d = Math.floor(d / 16);
+        return (c == 'x' ? r : (r & 0x3 | 0x8)).toString(16);
+    });
+    return uuid;
+}
+const getShortUuid = () => {
+    let uuid = this.getUuid();
+    uuid = uuid.replace(/-/g, '');
+    return uuid;
+}
+
+export {
+    getUuid,
+    getShortUuid
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yuang-framework-ui-common",
-  "version": "1.0.20",
+  "version": "1.0.22",
   "private": false,
   "type": "module",
   "scripts": {

package/src/router/index.ts

@@ -4,6 +4,11 @@ import {getExceptionRoutes} from '../../lib/utils/vueRouterUtils'
 const router = createRouter({
     history: createWebHistory(import.meta.env.BASE_URL),
     routes: [
+        {
+            path: '/config/gateway-config',
+            component: () => import('@/views/config/gateway-config.vue')
+        },
+
         {
             path: '/utils/aes-utils',
             component: () => import('@/views/utils/aes-utils.vue')

package/src/views/config/gateway-config.vue

@@ -0,0 +1,19 @@
+<template>
+<div></div>
+</template>
+
+<script setup lang="ts">
+import { onMounted, ref, getCurrentInstance } from 'vue';
+const { proxy } = getCurrentInstance() as any;
+
+
+onMounted(() => {
+  proxy.$http.get('/sso-api/standard/captcha/getCaptcha', { params: {} }).then((res: any) => {
+
+  });
+})
+</script>
+
+<style scoped>
+
+</style>