@utogether/udp-core 1.0.1-beta.3 → 1.0.1-beta.5

package/src/router/modules/remaining.ts

@@ -1,83 +1,58 @@
-/*
- * @Author: wei.li
- * @Date: 2021-11-17 16:02:30
- * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2024-12-18 08:44:24
- * @Description: file content
- */
-const Layout = () => import('../../layout/layoutView.vue');
-
-const remainingRouter: Array<any> = [
-  {
-    path: '/login',
-    name: 'login',
-    component: () => import('../../views/ulogin/login.vue'),
-    meta: {
-      title: 'message.udp.login',
-      showLink: false
-    }
-  },
-  {
-    path: '/error/404',
-    name: '404',
-    component: () => import('../../views/error/404.vue'),
-    meta: {
-      title: 'message.udp.fourZeroFour',
-      showLink: false
-    }
-  },
-  {
-    path: '/error/500',
-    name: '500',
-    component: () => import('../../views/error/500.vue'),
-    meta: {
-      title: 'message.udp.five',
-      showLink: false
-    }
-  },
-  // {
-  //   path: '/print/checkcard',
-  //   name: 'checkcard',
-  //   component: () => import('../../views/print/check-card.vue'),
-  //   meta: {
-  //     title: 'message.checkCard',
-  //     showLink: false
-  //   }
-  // },
-  // {
-  //   path: '/lowcode-design-platform',
-  //   name: 'LowcodeDesigin',
-  //   component: () => import('/src/views/udev/gantt/lcd-design.vue'),
-  //   meta: {
-  //     showLink: false
-  //   }
-  // },
-  // {
-  //   path: '/ulcd-app-menu',
-  //   name: 'AppMenu',
-  //   component: () => import('/src/views/udev/gantt/app-menu.vue'),
-  //   meta: {
-  //     showLink: false
-  //   }
-  // },
-  {
-    path: '/redirect',
-    name: 'redirect',
-    component: Layout,
-    meta: {
-      icon: 'home-filled',
-      title: 'message.udp.home',
-      showLink: false,
-      rank: 104
-    },
-    children: [
-      {
-        path: '/redirect/:path(.*)',
-        // 2024-12-17
-        name: 'redirectView',
-        component: () => import('../../layout/redirect.vue')
-      }
-    ]
-  }
-];
-export default remainingRouter;
+/*
+ * @Author: wei.li
+ * @Date: 2021-11-17 16:02:30
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-07-27 11:10:39
+ * @Description: file content
+ */
+const Layout = () => import('../../layout/layoutView.vue');
+
+const remainingRouter: Array<any> = [
+  {
+    path: '/login',
+    name: 'login',
+    component: () => import('../../views/ulogin/login.vue'),
+    meta: {
+      title: 'message.udp.login',
+      showLink: false
+    }
+  },
+  {
+    path: '/error/404',
+    name: '404',
+    component: () => import('../../views/error/404.vue'),
+    meta: {
+      title: 'message.udp.fourZeroFour',
+      showLink: false
+    }
+  },
+  {
+    path: '/error/500',
+    name: '500',
+    component: () => import('../../views/error/500.vue'),
+    meta: {
+      title: 'message.udp.five',
+      showLink: false
+    }
+  },
+  {
+    path: '/redirect',
+    name: 'redirect',
+    component: Layout,
+    meta: {
+      icon: 'home-filled',
+      title: 'message.udp.home',
+      showLink: false,
+      rank: 104
+    },
+    children: [
+      {
+        path: '/redirect/:path(.*)',
+        // 2024-12-17
+        name: 'redirectView',
+        component: () => import('../../layout/redirect.vue')
+      }
+    ]
+  }
+];
+export default remainingRouter;

package/src/style/vxetable.scss

@@ -33,7 +33,15 @@ 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--control-icon:not(:disabled) {
+    background-color: #fffbdf;
+  }
+
+  .el-select__wrapper:not(:disabled) {
     background-color: #fffbdf;
   }
 
@@ -149,6 +157,27 @@ html[data-vxe-ui-theme='light'] {
   .vxe-form--item-trigger-node {
     min-width: 60px;
   }
+
+  // 表单label加粗
+  .vxe-form--item-title-content {
+    font-weight: 700;
+    color: #192847;
+  }
+
+  .vxe-form--group-title {
+    border-bottom: 1px solid #eee;
+
+    .vxe-form--item-title-content {
+      font-size: 15px;
+    }
+  }
+
+  .vxe-form--group-title::before {
+    position: relative;
+    top: 2px;
+    color: var(--udp-theme-project-text);
+    content: '▉';
+  }
 }
 
 .vxe-form.size--mini .vxe-form--item-inner {

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>;
 }

package/src/views/login/login-view.vue

@@ -229,7 +229,7 @@ const insertLoginInfo = username => {
     browserVersion,
     operatingSystem: getPlatform(userAgent)
   };
-  serviceApi.post('/upms/v1/userMonitor', obj);
+  serviceApi.post('/upfm/v1/userMonitor', obj);
 };
 
 /** 使用公共函数，避免`removeEventListener`失效 */

package/src/views/system/menu/menuInfo.vue

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2021-11-17 16:44:08
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-07-24 09:42:27
+ * @LastEditTime: 2025-08-01 17:38:53
  * @Description: file content
 -->
 
@@ -24,6 +24,7 @@
         title-colon
         title-align="right"
         title-width="110"
+        transfer
       >
         <vxe-form-item
           v-if="record.menuType === '0'"
@@ -32,8 +33,11 @@
           span="24"
         >
           <template #default="{ data }">
-            <vxe-select v-model="data.menuCategory" :disabled="data.menuCategory === '0'">
-              <!-- v-for="dict in dictData['SU.MENU.TYPE']?.children" -->
+            <vxe-select
+              v-model="data.menuCategory"
+              :disabled="data.menuCategory === '0'"
+              :transfer="false"
+            >
               <vxe-option
                 v-for="dict in getLovList('SU.MENU.TYPE')"
                 :key="dict.dictCode"

package/src/views/system/sys/sys-config.vue

@@ -119,7 +119,7 @@ const record = reactive({
   defaultLanguage: 'zh',
   title: 'U-DP',
   ispTitle: 'U-DP',
-  i18nEnabled: 'Y',
+  i18nEnabled: 'N',
   copyright: '深圳友聚信息技术有限公司',
   logo: [],
   backgroundImg: [],

package/src/views/udev/dict/childView.vue

@@ -110,6 +110,7 @@ const showModal = ref(false);
 const subRecord = ref<IRecord>({});
 const temp = ref<IRecord>({});
 const modalType = ref('add');
+
 const subItems = [
   { field: 'dictCode', title: 'message.udp.dictCode', required: true },
   { field: 'dictName', title: 'message.udp.dictName', required: true },
@@ -179,7 +180,11 @@ const onConfirm = async () => {
   loading.value = false;
   if (!err) {
     console.log({ res });
-    showModal.value = false;
+    if (modalType.value === 'edit') {
+      showModal.value = false;
+    } else {
+      subRecord.value = { enabled: '1' };
+    }
     successMessage();
     getDict();
   }

package/src/views/uhome/su-welcome.vue

@@ -233,7 +233,7 @@ const onClickMenu = item => {
 };
 
 const getUserLog = () => {
-  const url = '/upms/v1/userMonitor';
+  const url = '/upfm/v1/userMonitor';
   const query = { pageSize: 8, pageNum: 1, employeeName: systemHook.getUserInfo?.name };
   getServiceApi()
     .get(url, query)

package/src/views/ulogin/login.vue

@@ -233,7 +233,8 @@ const cacheToken = token => {
   const cache = {
     accessToken: access_token,
     refreshToken: refresh_token,
-    expires: Date.now() + expires_in * 1000
+    // expires: Date.now() + expires_in * 1000
+    expires: Date.now() + expires_in
   };
 
   cookies.set(kCKTOKEN, token.access_token);
@@ -275,7 +276,7 @@ const insertLoginInfo = username => {
     browserVersion,
     operatingSystem: getPlatform(userAgent)
   };
-  serviceApi.post('/upms/v1/userMonitor', obj);
+  serviceApi.post('/upfm/v1/userMonitor', obj);
 };
 
 const getSysConfig = async () => {

package/src/views/upms/user/login-log.vue

@@ -12,7 +12,7 @@
       ref="xgrid"
       :items="formItems"
       :columns="columns"
-      url="/upms/v1/userMonitor"
+      url="/upfm/v1/userMonitor"
       :editable="false"
     />
   </div>

package/src/views/urpt/design/ReportDesign.vue

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2021-11-27 20:34:11
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-04-29 11:59:40
+ * @LastEditTime: 2025-08-06 10:46:40
  * @Description: 模板设计器
 -->
 <template>
@@ -12,7 +12,7 @@
       ref="xgrid"
       :items="formItems"
       :columns="columns"
-      :checkMethod="onCheckMethod"
+      :check-method="onCheckMethod"
       :url="url"
       :events="onGridEvents"
     />
@@ -238,7 +238,7 @@ const onGridEvents = {
 };
 
 const onCheckMethod = ({ row }) => {
-  return row.enabled !== '1';
+  return row?.enabled !== '1';
 };
 
 const onClose = () => {

package/types/global.d.ts

@@ -27,7 +27,8 @@ declare global {
    * Window 的类型提示
    */
   interface Window {
-    // Global vue app instance
+    // Global vue app
+    __HISTORY_PATH__: string;
     __APP__: App<Element>;
     webkitCancelAnimationFrame: (handle: number) => void;
     mozCancelAnimationFrame: (handle: number) => void;

package/dist/Org-2oBAXN2r.js

@@ -1,35 +0,0 @@
-import { defineComponent as a, ref as m, resolveComponent as s, createBlock as u, openBlock as f } from "vue";
-import { t as p } from "./await-to-js.es5-BtRbN2QH.js";
-import { clone as g } from "xe-utils";
-import { useRender as _ } from "@utogether/utils";
-import { q as h } from "./index-ZdgOD7cF.js";
-const k = { name: "OrgUnit" }, q = /* @__PURE__ */ a({
-  ...k,
-  setup(R) {
-    const r = "/uums/org", t = m(null), i = _(), d = [{ field: "orgCode" }, { field: "orgName" }, { field: "orgAlias" }], l = [
-      { type: "checkbox", width: 50, align: "center" },
-      { field: "orgCode", required: !0, editRender: { name: "$input" } },
-      { field: "orgName", required: !0, minWidth: 200, editRender: { name: "$input" } },
-      { field: "orgAlias", editRender: { name: "$input" } },
-      { field: "orgDesc", editRender: { name: "$input" } },
-      { field: "enabled", width: 80, cellRender: i.renderEnabled(c) }
-    ];
-    async function c({ row: n }) {
-      const o = g(n, !0), [e] = await p(h().put(r, [o]));
-      !e && t.value.refreshData();
-    }
-    return (n, o) => {
-      const e = s("ut-grid");
-      return f(), u(e, {
-        ref_key: "xgrid",
-        ref: t,
-        items: d,
-        columns: l,
-        url: r
-      }, null, 512);
-    };
-  }
-});
-export {
-  q as default
-};

package/dist/await-to-js.es5-BtRbN2QH.js

@@ -1,10 +0,0 @@
-function e(t, r) {
-  return t.then(function(n) {
-    return [null, n];
-  }).catch(function(n) {
-    return [n, void 0];
-  });
-}
-export {
-  e as t
-};