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

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

@@ -2,16 +2,11 @@
   <!-- <img :src="bg" class="wave" /> -->
   <div :key="refreshKey" class="login-container" :style="bgStyle">
     <div v-if="!bgStyle.backgroundImage" class="img pr-24">
-      <!-- <bg /> -->
       <img :src="welcome" />
     </div>
     <div class="login-box">
       <div class="login-form">
-        <h2
-          v-motion
-          :initial="{ opacity: 0, y: 100 }"
-          :enter="{ opacity: 1, y: 0, transition: { delay: 100 } }"
-        >
+        <h2 v-motion :initial="{ opacity: 0, y: 100 }" :enter="{ opacity: 1, y: 0, transition: { delay: 100 } }">
           {{ sysConfig['title'] }}
         </h2>
         <div
@@ -73,7 +68,7 @@
         </button>
       </div>
     </div>
-    <div class="absolute flex justify-center w-full font-bold bottom-1">
+    <div v-if="sysConfig.techSupport === 'Y'" class="absolute flex justify-center w-full font-bold bottom-1">
       <img :src="utogether" class="!h-10" style="height: 40px" />
       <span class="flex flex-row justify-center" style="width: 300px">
         <span style="font-size: 0; text-align: center">
@@ -81,7 +76,8 @@
             href="http://www.u-together.cn/"
             target="_blank"
             class="!inline-block"
-            style="margin-bottom: -5px; font-size: 17px; color: #59d8d8"
+            style="margin-bottom: -5px; font-size: 17px; color: #fff; mix-blend-mode: difference"
+            :style="{ color: sysConfig.baseColor || '#FFF' }"
           >
             深圳友聚信息技术有限公司
           </a>
@@ -89,7 +85,8 @@
             href="http://www.u-together.cn/"
             target="_blank"
             class="!inline-block"
-            style="font-size: 12px; color: #d9d9d9"
+            style="font-size: 12px; color: #fff; mix-blend-mode: difference"
+            :style="{ color: sysConfig.baseColor || '#FFF' }"
           >
             SHENZHEN U-TOGETHER CO. LTD
           </a>
@@ -113,6 +110,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';
@@ -162,7 +160,7 @@ const bgStyle = ref({
 });
 const refreshKey = ref(0);
 
-const sysConfig = ref({});
+const sysConfig = ref<IRecord>({});
 const router = useRouter();
 const { t } = useI18n();
 const serviceApi = getServiceApi();
@@ -187,6 +185,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,6 +238,7 @@ const cacheToken = token => {
   const cache = {
     accessToken: access_token,
     refreshToken: refresh_token,
+    // expires: Date.now() + expires_in
     expires: Date.now() + expires_in * 1000
   };
 
@@ -275,7 +281,7 @@ const insertLoginInfo = username => {
     browserVersion,
     operatingSystem: getPlatform(userAgent)
   };
-  serviceApi.post('/upms/v1/userMonitor', obj);
+  serviceApi.post('/upfm/v1/userMonitor', obj);
 };
 
 const getSysConfig = async () => {
@@ -292,7 +298,8 @@ const getSysConfig = async () => {
     config['title'] = title || 'U-DP';
     sysConfig.value = config;
     bgStyle.value = {
-      backgroundImage: config['backgroundImg'] ? `url(${config['backgroundImg']})` : '',
+      backgroundImage: config['backgroundImg'] ? `url(${config['backgroundImg']})` : ``,
+      // backgroundImage: config['backgroundImg'] ? `url(${config['backgroundImg']})` : `url1(${welcome})`,
       backgroundRepeat: 'no-repeat',
       backgroundPosition: 'center'
     };

package/src/views/upms/interface/log-in.vue

@@ -8,13 +8,7 @@
 
 <template>
   <div>
-    <ut-grid
-      ref="xgrid"
-      :items="formItems"
-      :columns="columns"
-      url="/upms/v1/invokeInbound"
-      :editable="false"
-    />
+    <ut-grid ref="xgrid" :items="formItems" :columns="columns" url="/upms/v1/invokeInbound" :editable="false" />
     <ut-modal-form
       v-if="data.showModal"
       ref="suModalRef"
@@ -55,7 +49,7 @@ const formItems = [
   { field: 'interfaceUrl' },
   { field: 'requestBodyParameter', title: 'message.requestParameter' },
   { field: 'responseContent' },
-  { field: 'ip' },
+  { field: 'ip', title: 'message.udp.ip' },
   { field: 'requestDate', itemRender: { name: '#SuDateRange', props: { type: 'daterange' } } },
   { field: 'requestStatus', itemRender: renderHook.renderDict('SU.REQUEST.STATUS') }
 ];

package/src/views/upms/interface/log-out.vue

@@ -8,13 +8,7 @@
 
 <template>
   <div>
-    <ut-grid
-      ref="SuGridRef"
-      :items="formItems"
-      :columns="columns"
-      url="/upms/v1/invokeOutbound"
-      :editable="false"
-    />
+    <ut-grid ref="SuGridRef" :items="formItems" :columns="columns" url="/upms/v1/invokeOutbound" :editable="false" />
 
     <ut-modal-form
       v-if="data.showModal"
@@ -56,7 +50,7 @@ const formItems = [
   { field: 'interfaceUrl' },
   { field: 'requestParameter' },
   { field: 'responseContent' },
-  { field: 'ip' },
+  // { field: 'ip',  },
   { field: 'requestDate', itemRender: { name: '#SuDateRange', props: { type: 'daterange' } } },
   { field: 'requestStatus', itemRender: renderHook.renderDict('SU.REQUEST.STATUS') }
 ];

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

@@ -8,13 +8,7 @@
 
 <template>
   <div>
-    <ut-grid
-      ref="xgrid"
-      :items="formItems"
-      :columns="columns"
-      url="/upms/v1/userMonitor"
-      :editable="false"
-    />
+    <ut-grid ref="xgrid" :items="formItems" :columns="columns" url="/upfm/v1/userMonitor" :editable="false" />
   </div>
 </template>
 <script lang="tsx">
@@ -50,7 +44,7 @@ const formItems = [
 const xgrid = ref(null);
 const columns = [
   { field: 'employeeName', minWidth: 120 },
-  { field: 'userName', width: 150 },
+  { field: 'userName', title: 'message.udp.userName', width: 150 },
   { field: 'loginTime', title: 'message.udp.loginTime', width: 160 },
   { field: 'operatingSystem', title: 'message.udp.operatingSystem', width: 120 },
   { field: 'browser', title: 'message.udp.browser', width: 110 },

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

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2022-03-21 10:36:15
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-04-08 15:38:16
+ * @LastEditTime: 2025-08-12 09:57:22
  * @Description: 设计面板
 -->
 <template>
@@ -45,21 +45,12 @@
                 <div class="flex justify-center mb-1" style="width: 100%">
                   <vxe-input v-model="paperSize.width" type="number" class="w-40" placeholder="宽(mm)" />
                   <div class="flex items-center justify-center w-8">~</div>
-                  <vxe-input
-                    v-model="paperSize.height"
-                    type="number"
-                    class="w-40"
-                    placeholder="高(mm)"
-                  />
+                  <vxe-input v-model="paperSize.height" type="number" class="w-40" placeholder="高(mm)" />
                 </div>
                 <ut-button style="width: 100%" content="confirm" @tap="handleCustomSize" />
               </div>
               <template #reference>
-                <ut-button
-                  icon="ri-font-size"
-                  content="customSize"
-                  @click.stop="paperPopVisible = true"
-                />
+                <ut-button icon="ri-font-size" content="customSize" @tap.stop="paperPopVisible = true" />
               </template>
             </el-popover>
             <ut-button
@@ -69,22 +60,9 @@
               auth="import"
               @tap="handleShowImport()"
             />
-            <vxe-button
-              icon="ri-indeterminate-circle-line "
-              class="design-custom-button"
-              @click="handleScale('N')"
-            />
-            <vxe-input
-              v-model="scale.ration"
-              disabled
-              align="center"
-              style="width: 70px; margin-left: 10px"
-            />
-            <vxe-button
-              icon="ri-add-circle-fill "
-              class="design-custom-button"
-              @click="handleScale('Y')"
-            />
+            <vxe-button icon="ri-indeterminate-circle-line " class="design-custom-button" @click="handleScale('N')" />
+            <vxe-input v-model="scale.ration" disabled align="center" style="width: 70px; margin-left: 10px" />
+            <vxe-button icon="ri-add-circle-fill " class="design-custom-button" @click="handleScale('Y')" />
             <ut-button
               status="danger"
               icon="ri-delete-bin-5-fill"
@@ -99,8 +77,7 @@
           </div>
         </div>
         <div style="font-size: 12px; color: red; text-align: center">
-          温馨提示:
-          蓝色线(页眉)以下,每张纸打印都会重复打印到页面底部;红色线(页尾)以下,每张纸打印都会重复打印到页面底部
+          温馨提示: 蓝色线(页眉)以下,每张纸打印都会重复打印到页面底部;红色线(页尾)以下,每张纸打印都会重复打印到页面底部
         </div>
       </el-space>
       <el-row>
@@ -118,7 +95,7 @@
                       </a>
                     </div>
                   </el-col>
-                  <el-col :span="12" class="drag_item_box" tid="defaultModule.text">
+                  <el-col :span="12" class="drag_item_box">
                     <div>
                       <a class="ep-draggable-item" tid="defaultModule.image">
                         <span class="ri-image-line" ariel-hidden="true" />
@@ -136,7 +113,7 @@
                       </a>
                     </div>
                   </el-col>
-                  <el-col :span="12" class="drag_item_box" tid="defaultModule.text">
+                  <el-col :span="12" class="drag_item_box">
                     <div>
                       <a class="ep-draggable-item" tid="defaultModule.table">
                         <span class="ri-table-line" ariel-hidden="true" />
@@ -216,7 +193,7 @@
 
 <script setup lang="ts">
 import { onMounted, reactive, ref, nextTick, onBeforeUnmount } from 'vue';
-import { VXETable } from 'vxe-table';
+import { VxeUI } from 'vxe-pc-ui';
 import { useGlobal } from '@utogether/utils';
 import to from 'await-to-js';
 import { clone } from 'xe-utils';
@@ -320,7 +297,7 @@ const handleScale = max => {
  * @Desc: 参数设置drawer回调,将参数设置dom添加到弹出层中
  */
 const handleClearPaper = async () => {
-  const type = await VXETable.modal.confirm('重绘操作不可逆,您确定继续吗?', '温馨提示');
+  const type = await VxeUI.modal.confirm('重绘操作不可逆,您确定继续吗?', '温馨提示');
   if (type === 'confirm') {
     hiprintTemplate.clear();
   }
@@ -329,7 +306,7 @@ const handleShowImport = async () => {
   showImportView.value = true;
 };
 const handleImportJson = async () => {
-  const type = await VXETable.modal.confirm('导入后将覆盖原有的模板,您确定继续吗?', '温馨提示');
+  const type = await VxeUI.modal.confirm('导入后将覆盖原有的模板,您确定继续吗?', '温馨提示');
   if (type === 'confirm') {
     handleSave(handleClose);
     showImportView.value = false;
@@ -523,4 +500,8 @@ onBeforeUnmount(() => {
   overflow: hidden;
   overflow: auto;
 }
+
+.hiprint-printElement-image-content img {
+  content: url('/logo.png');
+}
 </style>

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

@@ -38,6 +38,7 @@ const hanldePreview = (template, data) => {
   loading.value = true;
   printerTemplate.value = template;
   printerData.value = data;
+  console.log(template);
   nextTick(() => {
     $('#preview_content').html(template.getHtml(data));
     loading.value = false;

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"
     />
@@ -22,8 +22,8 @@
       v-if="showModal"
       :record="record"
       :items="items"
-      :width="300"
-      :height="240"
+      width="40%"
+      :height="290"
       data-status="update"
       title="复制模板"
       @confirm="onConfirm"
@@ -53,8 +53,8 @@ const { copy } = useClipboard();
 // const printPlugin = $printPlugin.print;
 const serviceApi = getServiceApi();
 const formItems = [
-  { field: 'templateCode', title: 'message.file.templateCode' },
-  { field: 'templateName', title: 'message.file.templateName' }
+  { field: 'templateCode', title: 'message.urpt.templateCode' },
+  { field: 'templateName', title: 'message.urpt.templateName' }
 ];
 const url = '/urpt/v1/printTemplate';
 // 列字段
@@ -62,21 +62,21 @@ const columns = [
   { type: 'checkbox', width: 50, align: 'center' },
   {
     field: 'templateCode',
-    title: 'message.file.templateCode',
+    title: 'message.urpt.templateCode',
     required: true,
     width: 150,
     editRender: renderHook.renderInput()
   },
   {
     field: 'templateName',
-    title: 'message.file.templateName',
+    title: 'message.urpt.templateName',
     required: true,
     width: 240,
     editRender: renderHook.renderInput()
   },
   {
     field: 'paperType',
-    title: 'message.file.paperType',
+    title: 'message.urpt.paperType',
     width: 120,
     required: true,
     editRender: renderHook.renderDict({ code: 'SU.PRINT.PAPER', defaultValue: 'A4' }),
@@ -94,12 +94,7 @@ const columns = [
         return (
           <>
             <ut-button content="design" icon="ri-quill-pen-line" onTap={() => handleDesign(row)} />
-            <ut-button
-              content="copy"
-              status="warning"
-              icon="ri-file-copy-2-fill"
-              onTap={() => handleCopy(row)}
-            />
+            <ut-button content="copy" status="warning" icon="ri-file-copy-2-fill" onTap={() => handleCopy(row)} />
             <ut-button
               content="export"
               status="u-cyan"
@@ -117,25 +112,26 @@ const columns = [
 const items = [
   {
     field: 'templateCode',
-    title: 'message.templateCode',
+    title: 'message.urpt.templateCode',
     required: true,
     itemRender: { name: '$input' },
     span: 24
   },
   {
     field: 'templateName',
-    title: 'message.templateName',
+    title: 'message.urpt.templateName',
     required: true,
     itemRender: { name: '$input' },
     span: 24
   },
   {
     field: 'paperType',
+    title: 'message.urpt.paperType',
     width: 100,
     required: true,
     itemRender: renderHook.renderDict({ code: 'SU.PRINT.PAPER', defaultValue: 'A4' })
   },
-  { field: 'remarks', title: 'message.remark', required: true, itemRender: { name: '$input' }, span: 24 }
+  { field: 'remarks', title: 'message.remark', itemRender: { name: '$input' }, span: 24 }
 ];
 /*
 // 启用/禁用
@@ -230,15 +226,13 @@ const handleDesign = row => {
 };
 const onGridEvents = {
   editActived({ row }) {
-    if (row.id) {
-      columns[1].editRender.props.disabled = true;
-      xgrid.value.getInstance().refreshColumn();
-    }
+    columns[1].editRender.props.disabled = !!row.id;
+    xgrid.value.getInstance().refreshColumn();
   }
 };
 
 const onCheckMethod = ({ row }) => {
-  return row.enabled !== '1';
+  return row?.enabled !== '1';
 };
 
 const onClose = () => {

package/src/views/urpt/static-resource/resource.vue

@@ -45,9 +45,9 @@ const baseUrl = getBaseURL();
 // 列字段
 const columns = [
   { type: 'checkbox', width: 40, align: 'center' },
-  { field: 'templateCode', title: 'message.file.resourceCode', width: 140 },
-  { field: 'templateName', title: 'message.file.resourceName', width: 150 },
-  { field: 'templateUrl', title: 'message.file.resourceUrl', miWidth: 200 },
+  { field: 'templateCode', title: 'message.urpt.resourceCode', width: 140 },
+  { field: 'templateName', title: 'message.urpt.resourceName', width: 150 },
+  { field: 'templateUrl', title: 'message.urpt.resourceUrl', miWidth: 200 },
   {
     field: 'operate',
     width: 180,

package/src/views/urpt/template/ReportTemplate.vue

@@ -62,9 +62,9 @@ const record = ref<IRecord>({});
 
 const url = '/upms/v1/printTemplateConfig';
 const formItems = [
-  { field: 'templateCode', title: 'message.file.templateCode' },
-  { field: 'templateName', title: 'message.file.templateName' },
-  { field: 'printPosition', title: 'message.file.printPosition', code: 'SU.PRINT.VIEW' }
+  { field: 'templateCode', title: 'message.urpt.templateCode' },
+  { field: 'templateName', title: 'message.urpt.templateName' },
+  { field: 'printPosition', title: 'message.urpt.printPosition', code: 'SU.PRINT.VIEW' }
 ];
 
 // 列字段
@@ -72,7 +72,7 @@ const columns = [
   { type: 'checkbox', width: 40, align: 'center' },
   {
     field: 'templateCode',
-    title: 'message.file.templateCode',
+    title: 'message.urpt.templateCode',
     required: true,
     width: 120,
     editRender: renderHook.renderLov({
@@ -81,10 +81,10 @@ const columns = [
       mapField: { templateName: 'templateName' }
     })
   },
-  { field: 'templateName', title: 'message.file.templateName', width: 180 },
+  { field: 'templateName', title: 'message.urpt.templateName', width: 180 },
   {
     field: 'printPosition',
-    title: 'message.file.printPosition',
+    title: 'message.urpt.printPosition',
     required: true,
     width: 120,
     formatter: ['formatDict', 'SU.PRINT.VIEW'],
@@ -92,7 +92,7 @@ const columns = [
   },
   {
     field: 'buttonCode',
-    title: 'message.file.buttonCode',
+    title: 'message.urpt.buttonCode',
     width: 120,
     required: true,
     editRender: renderHook.renderInput()

package/src/views/utask/flow-task.vue

@@ -0,0 +1,18 @@
+<script lang="ts">
+export default { name: 'FlowTask' };
+</script>
+
+<script setup lang="ts">
+// import { useDetail } from './hooks';
+
+// const { initToDetail, getParameter } = useDetail();
+// initToDetail('query');
+</script>
+
+<template>
+  <div>
+    <!-- {{ getParameter.id }} - 详情页内容在此（query传参）
+    <p>当前页面参数为：{{ getParameter }}</p> -->
+    dhasdhkasd kasdAsdasjldj打死了电话卡手机号多久啊是的
+  </div>
+</template>

package/types/global.d.ts

@@ -27,8 +27,10 @@ declare global {
    * Window 的类型提示
    */
   interface Window {
-    // Global vue app instance
+    // Global vue app
+    __HISTORY_PATH__: string;
     __APP__: App<Element>;
+    $i18n: () => void;
     webkitCancelAnimationFrame: (handle: number) => void;
     mozCancelAnimationFrame: (handle: number) => void;
     oCancelAnimationFrame: (handle: number) => void;
@@ -72,14 +74,7 @@ declare global {
     __: unknown;
   }
 
-  type ViteCompression =
-    | 'none'
-    | 'gzip'
-    | 'brotli'
-    | 'both'
-    | 'gzip-clear'
-    | 'brotli-clear'
-    | 'both-clear';
+  type ViteCompression = 'none' | 'gzip' | 'brotli' | 'both' | 'gzip-clear' | 'brotli-clear' | 'both-clear';
 
   interface ViteEnv {
     VITE_PORT: number;

package/vite.config.ts

@@ -66,7 +66,8 @@ export default () => {
           'vue-router',
           '@iconify/vue',
           'qrcode',
-          'element-resize-detector'
+          'element-resize-detector',
+          '**/udp/**'
         ]
       },
       lib: {