@utogether/udp-core 1.0.0 → 1.0.1-beta.10

package/src/style/button.scss

@@ -1,78 +1,85 @@
-.vxe-button.size--mini.type--button {
-  height: 25px;
-}
-
-.vxe-button.size--small.type--button {
-  height: 25px;
-}
-
-.vxe-button.type--button.theme--u-cyan,
-.vxe-button.type--button.theme--u-cyan:hover {
-  color: #fff;
-}
-
-.vxe-button.type--button.theme--u-cyan {
-  background-color: #1cbbb4;
-}
-
-.vxe-button.type--button.theme--u-cyan:active {
-  background-color: #39b54a;
-}
-
-// 禁用状态
-.vxe-button.type--button.theme--u-cyan.is--disabled {
-  background-color: #69e4de;
-  border-color: #69e4de;
-}
-
-.vxe-button.type--button.theme--u-color-shallow,
-.vxe-button.type--button.theme--u-color-shallow:hover {
-  color: #fff;
-}
-
-.vxe-button.type--button.theme--u-color-shallow {
-  background-color: #fbbd08;
-}
-
-.vxe-button.type--button.theme--u-color-shallow:active {
-  background-color: #fff;
-}
-
-.layout-theme-default .vxe-button.type--button.theme--u-cyan:not(.is--disabled):hover {
-  background-color: #40e0d0;
-  border-color: #40e0d0;
-}
-
-.vxe-button.type--button:not(.is--disabled):hover {
-  color: #fff !important;
-
-  .vxe-button--icon {
-    color: #4169e1;
-  }
-}
-
-.u-color-royalBlue {
-  color: #4169e1;
-}
-
-.u-color-turquoise {
-  color: #40e0d0;
-}
-
-.el-dropdown {
-  .el-dropdown__caret-button {
-    margin-left: 0;
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
-  }
-
-  .el-button-group + .el-button {
-    border-top-right-radius: 0 !important;
-    border-bottom-right-radius: 0 !important;
-  }
-
-  .el-button:first-child {
-    border-top-right-radius: 0 !important;
-    border-bottom-right-radius: 0 !important;
-  }
-}
+.vxe-button.size--mini.type--button {
+  height: 25px;
+}
+
+.vxe-button.size--small.type--button {
+  height: 25px;
+}
+
+.vxe-button.type--button.theme--u-cyan,
+.vxe-button.type--button.theme--u-cyan:hover {
+  color: #fff;
+}
+
+.vxe-button.type--button.theme--u-cyan {
+  background-color: #1cbbb4;
+}
+
+.vxe-button.type--button.theme--u-cyan:active {
+  background-color: #39b54a;
+}
+
+// 禁用状态
+.vxe-button.type--button.theme--u-cyan.is--disabled {
+  background-color: #69e4de;
+  border-color: #69e4de;
+}
+
+.vxe-button.type--button.theme--u-color-shallow,
+.vxe-button.type--button.theme--u-color-shallow:hover {
+  color: #fff;
+}
+
+.vxe-button.type--button.theme--u-color-shallow {
+  background-color: #fbbd08;
+}
+
+.vxe-button.type--button.theme--u-color-shallow:active {
+  background-color: #fff;
+}
+
+.layout-theme-default .vxe-button.type--button.theme--u-cyan:not(.is--disabled):hover {
+  background-color: #40e0d0;
+  border-color: #40e0d0;
+}
+
+.vxe-button.type--button:not(.is--disabled):hover {
+  color: #fff;
+
+  .vxe-button--icon,
+  .vxe-button--item {
+    color: inherit;
+  }
+}
+
+.vxe-button[name='favorite'].type--button:not(.is--disabled):hover {
+  .vxe-button--item {
+    color: var(--udp-theme-vxeColor);
+  }
+}
+
+.u-color-royalBlue {
+  color: #4169e1;
+}
+
+.u-color-turquoise {
+  color: #40e0d0;
+}
+
+.el-dropdown {
+  .el-dropdown__caret-button {
+    margin-left: 0;
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+  }
+
+  .el-button-group + .el-button {
+    border-top-right-radius: 0 !important;
+    border-bottom-right-radius: 0 !important;
+  }
+
+  .el-button:first-child {
+    border-top-right-radius: 0 !important;
+    border-bottom-right-radius: 0 !important;
+  }
+}

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,7 +33,21 @@ 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--suffix {
+    background-color: #fffbdf;
+  }
+
+  .el-select__wrapper:not(:disabled) {
     background-color: #fffbdf;
   }
 
@@ -123,9 +138,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 +163,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 +214,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 +227,11 @@ html[data-vxe-ui-theme='light'] {
     .col--checkbox {
       background: #fff !important;
     }
+
+    .vxe-body--column {
+      font-weight: bold;
+      color: #fff;
+    }
   }
 }
 
@@ -218,11 +253,9 @@ html[data-vxe-ui-theme='light'] {
 }
 
 .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 {

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;

package/src/utils/{http → udp/http}/index.ts

@@ -1,8 +1,9 @@
 import Axios, { type AxiosInstance, type AxiosRequestConfig } from 'axios';
 import type { SuHttpError, RequestMethods, SuHttpResponse, SuHttpRequestConfig } from './types.d';
-import { has } from 'xe-utils';
-import { NProgress, cookies, errorMessage } from '@utogether/utils';
+
+import { errorMessage, cookies, NProgress } from '@utogether/utils';
 import { isRef } from 'vue';
+import { has } from 'xe-utils';
 
 const kTOKENKEY = 'authorized-token';
 const defaultConfig: AxiosRequestConfig = {
@@ -18,8 +19,8 @@ class SuHttp {
     this.httpInterceptorsRequest();
     this.httpInterceptorsResponse();
   }
+  router = undefined;
   baseUrl = null;
-  router = null;
   /** token过期后，暂存待执行的请求 */
   private static requests = [];
 
@@ -81,8 +82,7 @@ class SuHttp {
               if (!SuHttp.isRefreshing) {
                 SuHttp.isRefreshing = true;
                 // requests.push(() => SuHttp.axiosInstance(config));
-
-                this.get(this.baseUrl + '/uath/refreshToken', {
+                this.get((this.baseUrl || '') + '/uath/refreshToken', {
                   refreshToken: data.refreshToken
                 })
                   .then((res: any) => {
@@ -153,12 +153,12 @@ class SuHttp {
         return response.data;
       },
       (error: SuHttpError) => {
+        const $error = error;
         // @ts-ignore
-        if (has(error.config, 'loading') && isRef(error.config.loading)) {
+        if (has(error.config, 'loading') && isRef(error?.config?.loading)) {
           // @ts-ignore
           error.config.loading.value = false;
         }
-        const $error = error;
         $error.isCancelRequest = Axios.isCancel($error);
         // 关闭进度条动画
         NProgress.done();
@@ -210,27 +210,11 @@ class SuHttp {
           } else {
             const msg = res?.msg || '服务异常';
             errorMessage(msg, { duration: 8000 });
-            // const code = res.code;
-            // if (
-            //   code === "000001" ||
-            //   (code === "-1" && msg.includes("请重新登陆"))
-            // ) {
-            //   // session过期
-            //   cookies.remove("kCookies_token");
-            //   // @ts-ignore
-            //   this.router?.push({
-            //     path: "/login",
-            //     query: { tokenExpire: "Y" },
-            //   });
-            // }
             reject(msg);
           }
         })
         .catch(e => {
-          debugger;
-          if (e?.response?.data?.path === '/refreshToken') {
-            this.router?.push('/login');
-          } else if (e?.code) {
+          if (e?.code) {
             if (e?.response?.status === 401) {
               // @ts-ignore
               return this.router?.push({ path: '/login' });

package/src/utils/{http → udp/http}/types.d.ts

@@ -2,10 +2,10 @@
  * @Author: wei.li
  * @Date: 2022-03-08 15:17:39
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2023-12-01 11:59:12
+ * @LastEditTime: 2023-12-01 13:55:46
  * @Description: SuHttp Axios 类型定义文件
  */
-import type { Method, AxiosError, AxiosResponse, AxiosRequestConfig } from 'axios';
+import { Method, AxiosError, AxiosResponse, AxiosRequestConfig } from "axios";
 
 export type resultType = {
   access_token: string;
@@ -15,12 +15,11 @@ export type resultType = {
 
 export type RequestMethods = Extract<
   Method,
-  'get' | 'post' | 'put' | 'delete' | 'patch' | 'option' | 'head'
+  "get" | "post" | "put" | "delete" | "patch" | "option" | "head"
 >;
 
 export interface SuHttpError extends AxiosError {
   isCancelRequest?: boolean;
-  loading?: boolean;
 }
 
 export interface SuHttpResponse extends AxiosResponse {
@@ -41,6 +40,10 @@ export default class SuHttp {
     axiosConfig?: SuHttpRequestConfig
   ): Promise<T>;
   post<T, P>(url: string, params?: T, config?: SuHttpRequestConfig): Promise<P>;
-  postRouter<T, P>(url: string, params?: T, config?: SuHttpRequestConfig): Promise<P>;
+  postRouter<T, P>(
+    url: string,
+    params?: T,
+    config?: SuHttpRequestConfig
+  ): Promise<P>;
   get<T, P>(url: string, params?: T, config?: SuHttpRequestConfig): Promise<P>;
 }