@utogether/udp-core 1.0.1 → 1.0.3

package/src/store/modules/app.ts

@@ -14,13 +14,11 @@ import { responsiveStorageNameSpace, getConfig } from '../../config';
 export const useAppStore = defineStore('udp-app', {
   state: (): appType => ({
     sidebar: {
-      opened:
-        storageLocal.getItem(`${responsiveStorageNameSpace()}layout`)?.sidebarStatus ??
-        getConfig().SidebarStatus,
+      opened: storageLocal.getItem(`${responsiveStorageNameSpace()}layout`)?.sidebarStatus ?? getConfig().SidebarStatus,
       withoutAnimation: false,
       isClickCollapse: false
     },
-    // 这里的layout用于监听容器拖拉后恢复对应的导航模式
+    // 这里的layout用于监听容器拖拉后恢复对应的菜单布局
     layout: storageLocal.getItem(`${responsiveStorageNameSpace()}layout`)?.layout ?? getConfig().Layout,
     device: deviceDetection() ? 'mobile' : 'desktop'
   }),

package/src/store/modules/epTheme.ts

@@ -1,49 +1,48 @@
-/*
- * @Author: wei.li
- * @Date: 2021-12-23 17:33:20
- * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2024-12-17 18:53:00
- * @Description: file content
- */
-import { store } from '../index';
-import { defineStore } from 'pinia';
-import { getConfig, responsiveStorageNameSpace } from '../../config';
-import { storageLocal } from '@utogether/utils';
-
-export const useEpThemeStore = defineStore('udp-epTheme', {
-  state: () => ({
-    epThemeColor:
-      storageLocal.getItem(`${responsiveStorageNameSpace()}-layout`)?.epThemeColor ??
-      getConfig().EpThemeColor,
-    epTheme: storageLocal.getItem(`${responsiveStorageNameSpace()}-layout`)?.theme ?? getConfig().Theme
-  }),
-  getters: {
-    getEpThemeColor() {
-      return this.epThemeColor;
-    },
-    // 用于mix导航模式下hamburger-svg的fill属性
-    fill() {
-      if (this.epTheme === 'light') {
-        return '#409eff';
-      } else if (this.epTheme === 'yellow') {
-        return '#d25f00';
-      } else {
-        return '#fff';
-      }
-    }
-  },
-  actions: {
-    setEpThemeColor(newColor: string): void {
-      const layout = storageLocal.getItem(`${responsiveStorageNameSpace()}layout`);
-      this.epTheme = layout?.theme;
-      this.epThemeColor = newColor;
-      if (!layout) return;
-      layout.epThemeColor = newColor;
-      storageLocal.setItem(`${responsiveStorageNameSpace()}layout`, layout);
-    }
-  }
-});
-
-export function useEpThemeStoreHook() {
-  return useEpThemeStore(store);
-}
+/*
+ * @Author: wei.li
+ * @Date: 2021-12-23 17:33:20
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2024-12-17 18:53:00
+ * @Description: file content
+ */
+import { store } from '../index';
+import { defineStore } from 'pinia';
+import { getConfig, responsiveStorageNameSpace } from '../../config';
+import { storageLocal } from '@utogether/utils';
+
+export const useEpThemeStore = defineStore('udp-epTheme', {
+  state: () => ({
+    epThemeColor:
+      storageLocal.getItem(`${responsiveStorageNameSpace()}-layout`)?.epThemeColor ?? getConfig().EpThemeColor,
+    epTheme: storageLocal.getItem(`${responsiveStorageNameSpace()}-layout`)?.theme ?? getConfig().Theme
+  }),
+  getters: {
+    getEpThemeColor() {
+      return this.epThemeColor;
+    },
+    // 用于mix菜单布局下hamburger-svg的fill属性
+    fill() {
+      if (this.epTheme === 'light') {
+        return '#409eff';
+      } else if (this.epTheme === 'yellow') {
+        return '#d25f00';
+      } else {
+        return '#fff';
+      }
+    }
+  },
+  actions: {
+    setEpThemeColor(newColor: string): void {
+      const layout = storageLocal.getItem(`${responsiveStorageNameSpace()}layout`);
+      this.epTheme = layout?.theme;
+      this.epThemeColor = newColor;
+      if (!layout) return;
+      layout.epThemeColor = newColor;
+      storageLocal.setItem(`${responsiveStorageNameSpace()}layout`, layout);
+    }
+  }
+});
+
+export function useEpThemeStoreHook() {
+  return useEpThemeStore(store);
+}

package/src/store/modules/multiTags.ts

@@ -1,12 +1,12 @@
 /*
  * @Author: wei.li
  * @Date: 2021-12-23 17:33:20
- * @LastEditors: wei.li
- * @LastEditTime: 2024-07-03 10:27:36
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-11-06 17:48:20
  * @Description: file content
  */
 import { defineStore } from 'pinia';
-import { isEqual, isBoolean } from 'xe-utils';
+import { isEqual } from 'xe-utils';
 import { storageLocal, isUrl } from '@utogether/utils';
 import { store } from '../index';
 import { routerArrays } from '../../layout/types';
@@ -54,25 +54,26 @@ export const useMultiTagsStore = defineStore('udp-multiTags', {
             if (isUrl(tagVal?.name)) return;
             // 如果title为空拒绝添加空信息到标签页
             if (tagVal?.meta?.title?.length === 0) return;
-            // showLink:false 不添加到标签页
-            if (isBoolean(tagVal?.meta?.showLink) && !tagVal?.meta?.showLink) return;
+            // showLink:false 不添加到标签页 -- 因审批流注释2025/11/6
+            // if (isBoolean(tagVal?.meta?.showLink) && !tagVal?.meta?.showLink) return;
             const tagPath = tagVal.path;
             // 判断tag是否已存在
             const tagHasExits = this.multiTags.some(tag => {
-              return tag.path === tagPath;
+              return tag.path === tagPath && isEqual(tag?.query, tagVal?.query) && isEqual(tag?.params, tagVal?.params);
             });
 
             // 判断tag中的query键值是否相等
-            const tagQueryHasExits = this.multiTags.some(tag => {
-              return isEqual(tag?.query, tagVal?.query);
-            });
+            // const tagQueryHasExits = this.multiTags.some(tag => {
+            //   return isEqual(tag?.query, tagVal?.query);
+            // });
 
-            // 判断tag中的params键值是否相等
-            const tagParamsHasExits = this.multiTags.some(tag => {
-              return isEqual(tag?.params, tagVal?.params);
-            });
+            // // 判断tag中的params键值是否相等
+            // const tagParamsHasExits = this.multiTags.some(tag => {
+            //   return isEqual(tag?.params, tagVal?.params);
+            // });
 
-            if (tagHasExits && tagQueryHasExits && tagParamsHasExits) return;
+            // if (tagHasExits && tagQueryHasExits && tagParamsHasExits) return;
+            if (tagHasExits) return;
 
             // 动态路由可打开的最大数量
             const dynamicLevel = tagVal?.meta?.dynamicLevel ?? -1;

package/src/store/modules/permission.ts

@@ -1,15 +1,15 @@
 /*
  * @Author: wei.li
  * @Date: 2021-11-17 16:02:30
- * @LastEditors: wei.li
- * @LastEditTime: 2024-07-03 10:20:58
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-10-19 11:58:29
  * @Description: file content
  */
 import { defineStore } from 'pinia';
 import { store } from '../index';
 import type { cacheType } from './types';
 import { constantMenus } from '../../router';
-import { clone, debounce, findLastIndexOf } from 'xe-utils';
+import { clone, findLastIndexOf } from 'xe-utils';
 import { getKeyList } from '../../utils';
 import { ascending, filterTree, formatFlatteningRoutes } from '../../router/utils';
 import { useMultiTagsStoreHook } from './multiTags';
@@ -58,35 +58,45 @@ export const usePermissionStore = defineStore('udp-permission', {
     setWholeMenus(wholeMenus) {
       this.wholeMenus = wholeMenus;
     },
+
+    /** 监听缓存页面是否存在于标签页，不存在则删除 */
+    clearCache() {
+      let cacheLength = this.cachePageList.length;
+      const nameList = getKeyList(useMultiTagsStoreHook().multiTags, 'name');
+      while (cacheLength > 0) {
+        nameList.findIndex(v => v === this.cachePageList[cacheLength - 1]) === -1 &&
+          this.cachePageList.splice(this.cachePageList.indexOf(this.cachePageList[cacheLength - 1]), 1);
+        cacheLength--;
+      }
+    },
     cacheOperate({ mode, name }: cacheType) {
       const delIndex = this.cachePageList.findIndex(v => v === name);
       switch (mode) {
         case 'refresh':
           this.cachePageList = this.cachePageList.filter(v => v !== name);
+          this.clearCache();
           break;
         case 'add':
           this.cachePageList.push(name);
           break;
         case 'delete':
           delIndex !== -1 && this.cachePageList.splice(delIndex, 1);
+          this.clearCache();
           break;
         case 'reset':
           this.cachePageList = [];
           break;
       }
       /** 监听缓存页面是否存在于标签页，不存在则删除 */
-      debounce(() => {
-        let cacheLength = this.cachePageList.length;
-        const nameList = getKeyList(useMultiTagsStoreHook().multiTags, 'name');
-        while (cacheLength > 0) {
-          nameList.findIndex(v => v === this.cachePageList[cacheLength - 1]) === -1 &&
-            this.cachePageList.splice(
-              this.cachePageList.indexOf(this.cachePageList[cacheLength - 1]),
-              1
-            );
-          cacheLength--;
-        }
-      }, 500)();
+      // debounce(() => {
+      //   let cacheLength = this.cachePageList.length;
+      //   const nameList = getKeyList(useMultiTagsStoreHook().multiTags, 'name');
+      //   while (cacheLength > 0) {
+      //     nameList.findIndex(v => v === this.cachePageList[cacheLength - 1]) === -1 &&
+      //       this.cachePageList.splice(this.cachePageList.indexOf(this.cachePageList[cacheLength - 1]), 1);
+      //     cacheLength--;
+      //   }
+      // }, 500)();
     },
     /** 清空缓存页面 */
     clearAllCachePage() {

package/src/store/modules/system.ts

@@ -166,9 +166,7 @@ export const useSystemStore = defineStore('udp-system', {
         organizationId: systemInfo.organizationId
       };
       cookies.set('kCookies_param', JSON.stringify(query));
-      this.isAdminRole = this.employee.sysRoles.some(
-        s => s.roleCode === 'admin' || ['管理员'].includes(s.roleName)
-      );
+      this.isAdminRole = this.employee.sysRoles.some(s => s.roleCode === 'admin' || ['管理员'].includes(s.roleName));
       // 缓存按钮数据权限
       usePermissionStoreHook().setAuthButton(systemInfo.dataMenus);
     }

package/src/style/button.scss

@@ -8,7 +8,7 @@
 
 .vxe-button.type--button.theme--u-cyan,
 .vxe-button.type--button.theme--u-cyan:hover {
-  color: #fff;
+  color: #fff !important;
 }
 
 .vxe-button.type--button.theme--u-cyan {
@@ -44,10 +44,17 @@
 }
 
 .vxe-button.type--button:not(.is--disabled):hover {
-  color: #fff !important;
+  color: inherit;
+
+  .vxe-button--icon,
+  .vxe-button--item {
+    color: inherit;
+  }
+}
 
-  .vxe-button--icon {
-    color: #4169e1;
+.vxe-button[name='favorite'].type--button:not(.is--disabled):hover {
+  .vxe-button--item {
+    color: var(--udp-theme-vxeColor);
   }
 }
 

package/src/style/login.css

@@ -11,7 +11,7 @@
   height: 100vh;
   display: flex;
   justify-content: flex-end;
-  background-color: #36419d;
+  background-color: #2a5f97;
   /* background: url('../assets/login/default-bg.png') no-repeat center; */
   background-repeat: no-repeat;
   background-position: center;

package/src/style/tailwind.css

@@ -1,68 +1 @@
-/* @tailwind base;
-@tailwind components;
-@tailwind utilities;
-
-@layer components {
-  .flex-c {
-    @apply flex justify-center items-center;
-  }
-
-  .flex-ac {
-    @apply flex justify-around items-center;
-  }
-
-  .flex-bc {
-    @apply flex justify-between items-center;
-  }
-
-  .navbar-bg-hover {
-    @apply dark:text-white dark:hover:!bg-[#242424];
-  }
-} */
-
-@layer theme, base, components, utilities;
-@import 'tailwindcss/theme.css' layer(theme);
-@import 'tailwindcss/utilities.css' layer(utilities);
-
-@custom-variant dark (&:is(.dark *));
-
-@theme {
-  --color-bg_color: var(--el-bg-color);
-  --color-primary: var(--el-color-primary);
-  --color-text_color_primary: var(--el-text-color-primary);
-  --color-text_color_regular: var(--el-text-color-regular);
-}
-
-/*
-  The default border color has changed to `currentColor` in Tailwind CSS v4,
-  so we've added these compatibility styles to make sure everything still
-  looks the same as it did with Tailwind CSS v3.
-
-  If we ever want to remove these styles, we need to add an explicit border
-  color utility to any element that depends on these defaults.
-*/
-@layer base {
-  *,
-  ::after,
-  ::before,
-  ::backdrop,
-  ::file-selector-button {
-    border-color: var(--color-gray-200, currentColor);
-  }
-}
-
-@utility flex-c {
-  @apply flex justify-center items-center;
-}
-
-@utility flex-ac {
-  @apply flex justify-around items-center;
-}
-
-@utility flex-bc {
-  @apply flex justify-between items-center;
-}
-
-@utility navbar-bg-hover {
-  @apply dark:text-white dark:hover:bg-[#242424]!;
-}
+@import 'tailwindcss';

package/src/style/vxetable.scss

@@ -10,6 +10,7 @@ html[data-vxe-ui-theme='light'] {
   --vxe-ui-input-disabled-background-color: #fafafa;
   --el-disabled-bg-color: #fafafa;
   --vxe-ui-button-height-mini: 24px;
+  --vxe-ui-table-row-current-background-color: #00b789;
 }
 
 /** 重写table的背景 */
@@ -32,17 +33,58 @@ html[data-vxe-ui-theme='light'] {
 
 /** 必填录入框颜色 */
 .vxe-form--item.is--required {
-  .vxe-input > .vxe-input--inner:not(:disabled) {
+  // 输入框必填
+  .vxe-input > .vxe-input--wrapper > .vxe-input--inner:not(:disabled) {
     background-color: #fffbdf;
   }
 
+  // 数字框框必填
+  .vxe-input:not(.is--disabled) > .vxe-input--wrapper {
+    .vxe-input--control-icon {
+      background-color: #fffbdf;
+    }
+  }
+
+  // 输入框必填
+  .vxe-input:not(.is--disabled) > .vxe-input--suffix {
+    background-color: #fffbdf;
+  }
+
+  // 下拉选择必填
+  .el-select__wrapper:not(.is-disabled) {
+    background-color: #fffbdf;
+  }
+
+  // 输入框必填
   .el-input:not(.is-disabled) > .el-input__wrapper {
     background-color: #fffbdf;
   }
 
+  // 文本域必填
   .vxe-textarea:not(.is--disabled) > .vxe-textarea--inner {
     background-color: #fffbdf;
   }
+
+  // 日期必填
+  .vxe-date-picker:not(.is--disabled) {
+    .vxe-date-picker--inner,
+    .vxe-input--suffix {
+      background-color: #fffbdf;
+    }
+
+    .vxe-date-picker--prefix,
+    .vxe-date-picker--suffix {
+      background-color: #fffbdf;
+    }
+  }
+
+  .vxe-number-input:not(.is--disabled) {
+    .vxe-number-input--input-inner {
+      .vxe-number-input--input {
+        background-color: #fffbdf;
+      }
+    }
+  }
 }
 
 /** 分页组件：当前页颜色 */
@@ -123,9 +165,9 @@ html[data-vxe-ui-theme='light'] {
 
 /************* button *******************/
 
-.vxe-button + .vxe-button:not(.type--text) {
-  margin-left: 6px;
-}
+// .vxe-button + .vxe-button:not(.type--text) {
+//   margin-left: 6px;
+// }
 
 .vxe-button {
   padding: 0 0.5em !important;
@@ -148,6 +190,23 @@ html[data-vxe-ui-theme='light'] {
   .vxe-form--item-trigger-node {
     min-width: 60px;
   }
+
+  // 表单分组标题
+  .vxe-form--group-title {
+    border-bottom: 1px solid #eee;
+
+    .vxe-form--item-title-content {
+      font-size: 13px;
+    }
+  }
+
+  .vxe-form--group-title::before {
+    position: relative;
+    top: 2px;
+    padding-right: 5px;
+    color: var(--udp-theme-project-text);
+    content: '▉';
+  }
 }
 
 .vxe-form.size--mini .vxe-form--item-inner {
@@ -182,8 +241,6 @@ html[data-vxe-ui-theme='light'] {
 // 点击高亮
 .vxe-table--render-default {
   .vxe-body--row.row--current {
-    background-color: #00b789;
-
     .vxe-cell--label {
       font-weight: bold;
       color: #fff;
@@ -197,6 +254,11 @@ html[data-vxe-ui-theme='light'] {
     .col--checkbox {
       background: #fff !important;
     }
+
+    .vxe-body--column {
+      font-weight: bold;
+      color: #fff;
+    }
   }
 }
 
@@ -215,14 +277,20 @@ html[data-vxe-ui-theme='light'] {
   .el-switch span:first-child:not(.vxe-cell--title) {
     color: #fff !important;
   }
+
+  .udp-select-wrapper {
+    .el-tag:first-child:not(.vxe-cell--title) {
+      .el-tag__content {
+        color: inherit !important;
+      }
+    }
+  }
 }
 
 .vxe-table--header-wrapper {
-  .vxe-checkbox--icon {
-    color: #fff !important;
-
-    // color: #8347d7 !important;
-  }
+  // .vxe-checkbox--icon {
+  //   // color: #fff !important;
+  // }
 
   .vxe-icon-checkbox-checked,
   .vxe-icon-checkbox-indeterminate {
@@ -254,3 +322,27 @@ html[data-vxe-ui-theme='light'] {
   background-color: #d8e5f7;
   background-image: linear-gradient(180deg, #d8e5f7, #bcd3f5);
 }
+
+/*********************************** tabs ****************************/
+
+.vxe-tabs-header--item-name {
+  font-size: 12px;
+  font-weight: 600;
+  color: #909399;
+}
+
+.vxe-tabs-header--item.is--active {
+  .vxe-tabs-header--item-name {
+    font-size: 13px;
+    color: var(--udp-theme-vxeColor);
+  }
+}
+
+/******************************** tab end *************************************/
+
+/******************************** preview start 预览图片组件 *************************************/
+.vxe-image-preview--operation-wrapper {
+  color: #c0c4cc;
+}
+
+/******************************** preview end *************************************/

package/src/utils/authority/index.ts

@@ -7,7 +7,7 @@
  */
 import { usePermissionStoreHook } from '../../store/modules/permission';
 import { isArray } from 'xe-utils';
-import router from '../../router';
+import { router } from '../../router';
 const hasAuthority = auth => {
   if (!auth) return true;
   const permissionCode = router.currentRoute.value.meta?.permissionCode;