@utogether/udp-core 1.0.1-beta.4 → 1.0.1-beta.6

package/src/plugins/vxe-table/render.tsx

@@ -445,7 +445,7 @@ export const VxetableRender = (VXETable, { serviceApi, i18n }) => {
           }, '');
           Object.assign(data, obj);
         }
-        const parm = { row: data, property: field, item: record, field };
+        const parm = { data, options: record, field };
         events?.change && events.change(parm);
       }
 
@@ -483,7 +483,8 @@ export const VxetableRender = (VXETable, { serviceApi, i18n }) => {
           }
           Object.assign(row, obj);
         }
-        events?.change && events.change(params, record, row[column.field]);
+        const params = { row, options: record, field: column.field, column };
+        events?.change && events.change(params);
       }
 
       function onClear() {
@@ -517,7 +518,8 @@ export const VxetableRender = (VXETable, { serviceApi, i18n }) => {
           }
           Object.assign(row, obj);
         }
-        events?.change && events.change(params, record, row[column.field]);
+        const params = { row, options: record, field: column.field, column };
+        events?.change && events.change(params);
       }
       /**
        * @description 清空数据

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;
   }
 
@@ -152,10 +160,24 @@ html[data-vxe-ui-theme='light'] {
 
   // 表单label加粗
   .vxe-form--item-title-content {
-    font-size: 13px;
     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/{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

@@ -1,6 +1,6 @@
 <template>
   <div class="select-none">
-    <div class="absolute flex-c right-5 top-3">
+    <div class="absolute flex justify-center items-center right-5 top-3">
       <!-- 主题 -->
       <!-- <el-switch
         v-model="dataTheme"
@@ -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-28 14:09:34
+ * @LastEditTime: 2025-08-01 17:38:53
  * @Description: file content
 -->
 

package/src/views/system/role-assign/RoleAssign.vue

@@ -1,57 +1,57 @@
-<!--
- * @Author: wei.li
- * @Date: 2021-11-26 14:37:07
- * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2024-06-24 20:20:57
- * @Description: 角色分配业务单元
--->
-<template>
-  <div class="u-content-panel">
-    <div class="u-left-panel">
-      <ScrollPane
-        :title="$t('SuOrg')"
-        :tree-otions="{ children: 'children', label: 'orgName' }"
-        extParam="{ pageSize: 500 }"
-        url="/uums/org"
-      />
-    </div>
-    <div class="content">
-      <role-panel />
-    </div>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { ref, provide } from 'vue';
-import ScrollPane from '../../../components/SuScrollTree/ScrollPanel.vue';
-import RolePanel from './RolePanel.vue';
-const active: any = ref({});
-const scrollPanelChange: any = ref(false);
-const treeList: any = ref([]);
-provide('active', active);
-
-provide('scrollPanelChange', scrollPanelChange);
-
-provide('treeList', treeList);
-</script>
-
-<style lang="scss" scoped>
-.u-content-panel {
-  box-sizing: border-box;
-  display: flex;
-  width: 100%;
-  height: 84vh;
-  padding: 5px;
-
-  .u-left-panel {
-    width: 250px;
-  }
-
-  .content {
-    flex: 1;
-    width: calc(100% - 250px);
-    height: 82vh;
-    margin: 0 10px;
-  }
-}
-</style>
+<!--
+ * @Author: wei.li
+ * @Date: 2021-11-26 14:37:07
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-08-06 17:55:03
+ * @Description: 角色分配业务单元
+-->
+<template>
+  <div class="u-content-panel">
+    <div class="u-left-panel">
+      <ScrollPane
+        :title="$t('SuOrg')"
+        :tree-otions="{ children: 'children', label: 'orgName' }"
+        :default-params="{ pageSize: 500 }"
+        url="/uums/org"
+      />
+    </div>
+    <div class="content">
+      <role-panel />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { ref, provide } from 'vue';
+import ScrollPane from '../../../components/SuScrollTree/ScrollPanel.vue';
+import RolePanel from './RolePanel.vue';
+const active: any = ref({});
+const scrollPanelChange: any = ref(false);
+const treeList: any = ref([]);
+provide('active', active);
+
+provide('scrollPanelChange', scrollPanelChange);
+
+provide('treeList', treeList);
+</script>
+
+<style lang="scss" scoped>
+.u-content-panel {
+  box-sizing: border-box;
+  display: flex;
+  width: 100%;
+  height: 84vh;
+  padding: 5px;
+
+  .u-left-panel {
+    width: 250px;
+  }
+
+  .content {
+    flex: 1;
+    width: calc(100% - 250px);
+    height: 82vh;
+    margin: 0 10px;
+  }
+}
+</style>

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/system/sysUser/SysUserPanel.vue

@@ -5,7 +5,9 @@
       :columns="columns"
       :items="formItems"
       :url="url"
-      :default-params="paramExt"
+      :auto-load="false"
+      :default-params="defaultParams"
+      :default-value="defaultParams"
       :events="onGridEvents"
     />
     <!-- 编辑用户信息 -->
@@ -80,7 +82,7 @@
 import { useI18n } from 'vue-i18n';
 import { ref, reactive, inject, nextTick, onMounted } from 'vue';
 import to from 'await-to-js';
-import { useRender, errorMessage, warnMessage } from '@utogether/utils';
+import { useRender, errorMessage, warnMessage, delay } from '@utogether/utils';
 import { VxeUI, VxeFormPropTypes } from 'vxe-pc-ui';
 import { isEmpty } from 'xe-utils';
 import { getServiceApi } from '../../../api';
@@ -127,7 +129,7 @@ const rules: VxeFormPropTypes.Rules = {
   ]
 };
 const renderHook = useRender();
-const paramExt = ref({});
+const defaultParams = ref({});
 const treeList: IRecord[] = inject('treeList');
 
 const url = '/uums/user';
@@ -264,8 +266,10 @@ const handleClose = () => {
 const getUnitList = () => {
   serviceApi
     .get('/uums/unit', { pageSize: 10 })
-    .then(res => {
-      paramExt.value = { unitId: res[0].id, enabled: '1' };
+    .then(async res => {
+      defaultParams.value = { unitId: res[0].id, enabled: '1' };
+      await delay(100);
+      xgrid.value.refreshData();
     })
     .catch(() => {
       errorMessage('获取租户失败,刷新后重试');

package/src/views/uapp/pda/pda-app.vue

@@ -139,12 +139,18 @@ const onButtonClick = code => {
 };
 
 const items = [
-  { field: 'appVersion', required: true },
-  { field: 'buildNo', required: true },
-  { field: 'versionInfo', required: true, itemRender: renderHook.renderTextarea() },
+  { field: 'appVersion', title: 'mesage.udp.appVersion', required: true },
+  { field: 'buildNo', title: 'mesage.udp.buildNo', required: true },
+  {
+    field: 'versionInfo',
+    title: 'mesage.udp.versionInfo',
+    required: true,
+    itemRender: renderHook.renderTextarea()
+  },
   {
     field: 'downloadUrl',
     required: false,
+    title: 'mesage.udp.downloadUrl',
     itemRender: { name: '#upload', props: { baseUrl: baseURL } }
   }
 ];

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/ufile/aggregation/File.vue

@@ -24,17 +24,17 @@ const xgrid = ref(null);
 const url = '/ufil/v1/attachment';
 
 const formItems = [
-  { field: 'fileName', title: 'message.file.fileName' },
+  { field: 'fileName', title: 'message.urpt.fileName' },
   { field: 'creationDate', itemRender: { name: '#SuDateRange', props: { type: 'daterange' } } },
   { field: 'createdByName' }
 ];
 
 // 列字段
 const columns = [
-  { field: 'fileName', title: 'message.file.fileName', width: 240 },
-  { field: 'fileSize', title: 'message.file.fileSize', width: 110 },
-  { field: 'fileExtend', title: 'message.file.fileExtend', width: 100 },
-  { field: 'realpath', title: 'message.file.filePath' },
+  { field: 'fileName', title: 'message.urpt.fileName', width: 240 },
+  { field: 'fileSize', title: 'message.urpt.fileSize', width: 110 },
+  { field: 'fileExtend', title: 'message.urpt.fileExtend', width: 100 },
+  { field: 'realpath', title: 'message.urpt.filePath' },
   { field: 'createdByName', width: 120 },
   { field: 'creationDate', width: 160 },
   {

package/src/views/ufile/file/water-mark.vue

@@ -25,15 +25,15 @@ const renderHook = useRender();
 const url = '/ufil/v1/watermark';
 
 const formItems = [
-  { field: 'watermarkCode', title: 'message.file.watermarkContent' },
+  { field: 'watermarkCode', title: 'message.urpt.watermarkContent' },
   {
     field: 'watermarkType',
-    title: 'message.file.watermarkType',
+    title: 'message.urpt.watermarkType',
     itemRender: renderHook.renderDict('SU.WATERMARK.TYPE')
   },
   {
     field: 'textAlign',
-    title: 'message.file.textAlign',
+    title: 'message.urpt.textAlign',
     itemRender: renderHook.renderDict('SU.ALIGN.TYPE')
   }
 ];
@@ -43,14 +43,14 @@ const columns = [
   { type: 'checkbox', width: 40, align: 'center' },
   {
     field: 'watermarkCode',
-    title: 'message.file.watermarkContent',
+    title: 'message.urpt.watermarkContent',
     required: true,
     minWidth: 110,
     editRender: renderHook.renderInput()
   },
   {
     field: 'watermarkType',
-    title: 'message.file.watermarkType',
+    title: 'message.urpt.watermarkType',
     width: 120,
     required: true,
     editRender: renderHook.renderDict({ code: 'SU.WATERMARK.TYPE', defaultValue: 'text' }),
@@ -58,13 +58,13 @@ const columns = [
   },
   {
     field: 'content',
-    title: 'message.file.watermarkContent',
+    title: 'message.urpt.watermarkContent',
     width: 110,
     editRender: renderHook.renderInput()
   },
   {
     field: 'textAlign',
-    title: 'message.file.textAlign',
+    title: 'message.urpt.textAlign',
     width: 120,
     required: true,
     editRender: renderHook.renderDict('SU.ALIGN.TYPE'),
@@ -72,32 +72,32 @@ const columns = [
   },
   {
     field: 'watermarkTrigger',
-    title: 'message.file.watermarkTrigger',
+    title: 'message.urpt.watermarkTrigger',
     width: 120,
     required: true,
     editRender: renderHook.renderDict('SU.WATERMARK.TRIGGER'),
     formatter: ['formatDict', 'SU.WATERMARK.TRIGGER']
   },
-  { field: 'color', title: 'message.file.color', width: 90, editRender: renderHook.renderInput() },
+  { field: 'color', title: 'message.urpt.color', width: 90, editRender: renderHook.renderInput() },
   {
     field: 'fillOpacity',
-    title: 'message.file.fillOpacity',
+    title: 'message.urpt.fillOpacity',
     width: 100,
     editRender: renderHook.renderNumber()
   },
   {
     field: 'fontSize',
-    title: 'message.file.fontSize',
+    title: 'message.urpt.fontSize',
     width: 110,
     editRender: renderHook.renderNumber()
   },
   {
     field: 'rotation',
-    title: 'message.file.rotation',
+    title: 'message.urpt.rotation',
     width: 110,
     editRender: renderHook.renderNumber()
   },
-  { field: 'xAxis', title: 'message.file.xAxis', width: 100, editRender: renderHook.renderNumber() },
-  { field: 'yAxis', title: 'message.file.yAxis', width: 100, editRender: renderHook.renderNumber() }
+  { field: 'xAxis', title: 'message.urpt.xAxis', width: 100, editRender: renderHook.renderNumber() },
+  { field: 'yAxis', title: 'message.urpt.yAxis', width: 100, editRender: renderHook.renderNumber() }
 ];
 </script>

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

@@ -2,7 +2,7 @@
  * @Author: levi7754 levi7754@163.com
  * @Date: 2023-11-02 10:04:05
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-04-29 17:04:36
+ * @LastEditTime: 2025-08-06 14:47:34
  * @FilePath: /front-web-mes/src/views/uhome/su-welcome.vue
  * @Description: 欢迎页面
 -->
@@ -38,7 +38,7 @@
       </div>
       <div class="flex flex-col">
         <span class="text-4xl">
-          <ut-countdown :show-days="false" :show-labels="false" />
+          <ut-flip-down :show-days="false" :show-labels="false" />
         </span>
         <div class="mt-1 ml-3">{{ getLunarDay() }}</div>
       </div>
@@ -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

@@ -113,6 +113,7 @@ import { useFavicon } from '@vueuse/core';
 import { isEmpty, toDateString } from 'xe-utils';
 import { removeClass, storageLocal, errorMessage, cookies, delay } from '@utogether/utils';
 import to from 'await-to-js';
+// import JSEencrypt from 'jsencrypt';
 import { useSystemStoreHook } from '../../store/modules/system';
 import { useLayout } from '../../layout/hooks/useLayout';
 import { useDataThemeChange } from '../../layout/hooks/useDataThemeChange';
@@ -187,6 +188,13 @@ const onLogin = async () => {
   const rsakeypair = new RSAKeyPair(publicRSA.publicKeyExponent, '', publicRSA.publicKeyModulus);
   // @ts-ignore
   const password = encryptedString(rsakeypair, passWord.split('').reverse().join(''));
+  // const key = new JSEencrypt();
+  // key.setPublicKey(
+  //   '-----BEGIN PUBLIC KEY-----MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQChJwirJjZ+FxG9dn9rsfKa+9hTgBhXI9e0kiMOJWfJXPVxjsp0XaBkNADKYZ++7Ikt9hq+H3GtO4ItB27YMQgMU3gu34wGJ+6VxX4r7hL+VdorPK3sWZR6dczMu/Nvs7eByTtL9RSJeJ8cCEn5AjoW7HC+9BpQR4XhCCtvE1iOKQIDAQAB-----END PUBLIC KEY-----'
+  // );
+  // const password = key.encrypt(passWord);
+  // // console.log('password1 ===', password1);
+  // console.log('password ===', password);
   const param = {
     username,
     password,
@@ -233,7 +241,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 +284,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>