yuang-framework-ui-common 1.0.97 → 1.0.99

package/lib/utils/dataUtils.ts

@@ -0,0 +1,17 @@
+/**
+ * 设置数字补零
+ * @param num 数字
+ * @param length 位数
+ * @returns {string}
+ */
+const setNumAddZero = (num, length = 2) => {
+    let str = '';
+    num = String(num);
+    for (let i = num.length; i < length; i++) str += '0';
+    return num < Math.pow(10, length) ? str + (num | 0) : num;
+};
+
+export {
+    setNumAddZero,
+
+}

package/lib/utils/dateUtils.ts

@@ -1,3 +1,139 @@
+import { setNumAddZero } from './dataUtils';
+
+import moment, { type MomentInput } from 'moment';
+// 可选：引入中文语言包（按需开启）
+import 'moment/locale/zh-cn';
+
+moment.locale('zh-cn');
+
+/**
+ * 初始化日期对象（内部工具函数，不对外导出）
+ * @param {string|number|Date|moment.Moment} date - 日期入参（不传则为当前时间）
+ * @returns {moment.Moment} 格式化后的moment对象（无效则返回当前时间）
+ */
+const initDate = (date?: MomentInput): moment.Moment => {
+    if (!date) return moment();
+    const momentDate = moment(date);
+    return momentDate.isValid() ? momentDate : moment();
+};
+
+/**
+ * 日期格式化（默认格式：YYYY-MM-DD HH:mm:ss）
+ * @param {string|number|Date|moment.Moment} date - 要格式化的日期
+ * @param {string} format - 自定义格式
+ * @returns {string} 格式化后的日期字符串
+ */
+const formatDate = (date, format = 'YYYY-MM-DD HH:mm:ss') => {
+    return initDate(date).format(format);
+};
+
+/**
+ * 获取当前时间（快捷方法）
+ * @param {string} format - 自定义格式
+ * @returns {string} 当前时间字符串
+ */
+const getNow = (format = 'YYYY-MM-DD HH:mm:ss') => {
+    return moment().format(format);
+};
+
+/**
+ * 日期加减计算
+ * @param {string|number|Date|moment.Moment} date - 基准日期
+ * @param {number} num - 加减的数值（正数加，负数减）
+ * @param {string} unit - 单位（year/month/day/hour/minute/second/week）
+ * @param {string} format - 输出格式
+ * @returns {string} 计算后的日期字符串
+ */
+const addSubtractDate = (date, num, unit, format = 'YYYY-MM-DD HH:mm:ss') => {
+    const momentDate = initDate(date);
+    return momentDate.add(num, unit).format(format);
+};
+
+/**
+ * 比较两个日期的大小
+ * @param {string|number|Date|moment.Moment} date1 - 日期1
+ * @param {string|number|Date|moment.Moment} date2 - 日期2
+ * @returns {number} 1: date1 > date2；-1: date1 < date2；0: 相等
+ */
+const compareDate = (date1, date2) => {
+    const m1 = initDate(date1);
+    const m2 = initDate(date2);
+    if (m1.isAfter(m2)) return 1;
+    if (m1.isBefore(m2)) return -1;
+    return 0;
+};
+
+/**
+ * 计算两个日期的差值
+ * @param {string|number|Date|moment.Moment} date1 - 日期1
+ * @param {string|number|Date|moment.Moment} date2 - 日期2
+ * @param {string} unit - 差值单位（days/hours/minutes/seconds/months/years）
+ * @returns {number} 差值（正数，date1 - date2 的绝对值）
+ */
+const diffDate = (date1: MomentInput, date2: MomentInput, unit = 'days'): number => {
+    const m1 = initDate(date1);
+    const m2 = initDate(date2);
+    // @ts-ignore
+    return Math.abs(m1.diff(m2, unit));
+};
+
+/**
+ * 验证日期是否有效
+ * @param {string|number|Date|moment.Moment} date - 要验证的日期
+ * @returns {boolean} true: 有效；false: 无效
+ */
+const isValidDate = (date) => {
+    return moment(date).isValid();
+};
+
+/**
+ * 获取日期的指定部分（年/月/日/时/分/秒）
+ * @param {string|number|Date|moment.Moment} date - 基准日期
+ * @param {string} unit - 要获取的单位（year/month/day/hour/minute/second/weekday）
+ * @returns {number} 对应的值（month 从 1 开始，weekday 周日为 0）
+ */
+const getDatePart = (date, unit) => {
+    const momentDate = initDate(date);
+    if (unit === 'month') {
+        return momentDate.month() + 1; // moment的month是0开始，转为1开始
+    }
+    return momentDate[unit]();
+};
+
+/**
+ * 转换为时间戳
+ * @param {string|number|Date|moment.Moment} date - 基准日期
+ * @param {boolean} isMillisecond - 是否返回毫秒级（默认false：秒级）
+ * @returns {number} 时间戳
+ */
+const toDateTimestamp = (date, isMillisecond = false) => {
+    const momentDate = initDate(date);
+    return isMillisecond ? momentDate.valueOf() : momentDate.unix();
+};
+
+/**
+ * 格式化相对时间（如：几秒前、几小时前）
+ * @param {string|number|Date|moment.Moment} date - 基准日期
+ * @returns {string} 相对时间字符串（中文）
+ */
+const formatFromNow = (date) => {
+    return initDate(date).fromNow();
+};
+
+/**
+ * 获取当月的第一天/最后一天
+ * @param {string|number|Date|moment.Moment} date - 基准日期
+ * @param {boolean} isFirst - true: 第一天；false: 最后一天
+ * @param {string} format - 输出格式
+ * @returns {string} 对应日期
+ */
+const getMonthEdgeDate = (date, isFirst = true, format = 'YYYY-MM-DD') => {
+    const momentDate = initDate(date);
+    return isFirst
+        ? momentDate.startOf('month').format(format)
+        : momentDate.endOf('month').format(format);
+};
+
 /**
  * 某个时间在当前时间的多久前
  * @param time 需要语义化的时间
@@ -7,28 +143,30 @@
 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();
+    let arr = [ [], [] ];
+    let timestamp = 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());
+    if (timestamp > 1000 * 60 * 60 * 24 * 31) {
+        let date = new Date(time);
+        arr[0][0] = setNumAddZero(date.getFullYear(), 4);
+        arr[0][1] = setNumAddZero(date.getMonth() + 1);
+        arr[0][2] = setNumAddZero(date.getDate());
+        // 是否输出时间
+        if (!onlyDate) {
+            arr[1][0] = setNumAddZero(date.getHours());
+            arr[1][1] = setNumAddZero(date.getMinutes());
+            arr[1][2] = setNumAddZero(date.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) {
+    if (timestamp >= 1000 * 60 * 60 * 24) {
+        return ((timestamp / 1000 / 60 / 60 / 24) | 0) + '天前';
+    } else if (timestamp >= 1000 * 60 * 60) {
+        return ((timestamp / 1000 / 60 / 60) | 0) + '小时前';
+    } else if (timestamp >= 1000 * 60 * 3) {  // 3分钟以内为：刚刚
+        return ((timestamp / 1000 / 60) | 0) + '分钟前';
+    } else if (timestamp < 0) {
         return '未来';
     } else {
         return '刚刚';
@@ -36,6 +174,18 @@ const getTimeAgoString = (time, onlyDate) => {
 }
 
 export {
+    formatDate,
+    getNow,
+    addSubtractDate,
+    compareDate,
+    diffDate,
+    isValidDate,
+    getDatePart,
+    toDateTimestamp,
+    formatFromNow,
+    getMonthEdgeDate,
+
+
     getTimeAgoString,
 
 }

package/lib/utils/ssoUtils.ts

@@ -79,26 +79,6 @@ const getSsoLogoutUrl = (ssoRedirectUrl = '') => {
     }
     return ssoLogoutUrl;
 }
-//
-// /**
-//  * 获取sso认证路由路径
-//  * @param ssoRedirectRoutePath
-//  */
-// const getSsoAuthRoutePath = (ssoRedirectRoutePath = '') => {
-//     if(getIsDebug()) {
-//         debugger;
-//     }
-//     let ssoAuthRoutePath = '/sso/client/sso-auth/index';
-//     if (!ssoRedirectRoutePath) {
-//         ssoAuthRoutePath += `?ssoRedirectRoutePath=${encodeURIComponent('/sso/client/sso-auth/auth-success')}`;
-//     } else {
-//         ssoAuthRoutePath += `?ssoRedirectRoutePath=${encodeURIComponent(ssoRedirectRoutePath)}`;
-//     }
-//     if(getIsDebug()) {
-//         console.log('ssoAuthRoutePath', ssoAuthRoutePath);
-//     }
-//     return ssoAuthRoutePath;
-// }
 
 /**
  * 处理sso认证
@@ -247,6 +227,24 @@ const clearSsoAccessToken = () => {
 
 }
 
+const setSsoIdentity = (ssoIdentity) => {
+    if(!ssoIdentity) {
+        console.error('参数[ssoIdentity]为null');
+        return;
+    }
+    localStorage.setItem('ssoIdentity', JSON.stringify(ssoIdentity));
+}
+
+const getSsoIdentity = () => {
+   let object = localStorage.getItem('ssoIdentity');
+   if(!object){
+       return null;
+   }
+   let ssoIdentity = JSON.parse(object);
+   return ssoIdentity;
+}
+
+
 const logoutSso = () => {
     clearSsoAccessToken();
     window.location.href = getSsoLogoutUrl() || '';
@@ -257,7 +255,6 @@ export {
     getSsoLoginUrl,
     getSsoAuthUrl,
     getSsoLogoutUrl,
-    // getSsoAuthRoutePath,
     handleSsoAuth,
 
     getSsoEncrypt,
@@ -271,5 +268,8 @@ export {
 
     clearSsoAccessToken,
 
+    setSsoIdentity,
+    getSsoIdentity,
+
     logoutSso,
 }

package/package.json

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

package/src/router/index.ts

@@ -7,13 +7,6 @@ import { handleSsoAuth } from '../../lib/utils/ssoUtils';
 const router = createRouter({
     history: createWebHistory(import.meta.env.BASE_URL),
     routes: [
-        {
-            path: '/sso/client/sso-auth/auth-success',
-            component: () => import('@/views/sso/client/sso-auth/auth-success.vue'),
-            meta: {
-                title: '认证成功',
-            }
-        },
         {
             path: '/gateway/gateway-config',
             component: () => import('@/views/gateway/gateway-config.vue')

package/src/views/sso/client/sso-auth/auth-success.vue

@@ -1,46 +0,0 @@
-<template>
-  <h1>认证成功！ {{ ssoData?.ssoTokenUser?.account }}</h1>
-
-  <h3 @click="getSsoTokenUser">获取ssoTokenUser</h3>
-  <h3 @click="getSsoIdentity">获取SsoIdentity</h3>
-
-  <a @click="logout">注销登录</a>
-</template>
-
-<script setup lang="ts">
-  import { onMounted, reactive } from 'vue';
-  import { ElMessage } from 'element-plus/es';
-
-  import { getSsoAccessToken, logoutSso } from '../../../../lib/utils/ssoUtils';
-  import { http } from '../../../../lib/config/httpConfig';
-
-  let ssoData = reactive({
-    ssoTokenUser: {},
-    ssoIdentity: {}
-  });
-  onMounted(() => {
-    let ssoAccessToken = getSsoAccessToken();
-    console.log('ssoAccessToken', ssoAccessToken);
-    getSsoTokenUser();
-  });
-  const getSsoTokenUser = () => {
-    http.get(`/sso-api/client/sso-user/getSsoTokenUser`).then((res: any) => {
-      ssoData.ssoTokenUser = res.data.data;
-      console.log('ssoTokenUser', ssoData.ssoTokenUser);
-      ElMessage.success('获取成功');
-    });
-  };
-  const getSsoIdentity = () => {
-    http.get(`/sso-api/client/sso-user/getSsoIdentity`).then((res: any) => {
-      ssoData.ssoIdentity = res.data.data;
-      console.log('ssoIdentity', ssoData.ssoIdentity);
-      ElMessage.success('获取成功');
-    });
-  };
-
-  const logout = () => {
-    logoutSso();
-  };
-</script>
-
-<style scoped></style>