@utogether/udp-core 1.0.1-beta.2 → 1.0.1-beta.21

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

@@ -1,106 +1,100 @@
-<!--
- * @Author: wei.li
- * @Date: 2021-12-23 11:22:51
- * @LastEditors: wei.li
- * @LastEditTime: 2024-07-04 09:39:31
- * @Description: 入站接口日志
--->
-
-<template>
-  <div>
-    <ut-grid
-      ref="xgrid"
-      :items="formItems"
-      :columns="columns"
-      url="/upms/v1/invokeInbound"
-      :editable="false"
-    />
-    <ut-modal-form
-      v-if="data.showModal"
-      ref="suModalRef"
-      :record="data.record"
-      :items="items"
-      :width="640"
-      :height="480"
-      :title="data.title"
-      @close="data.showModal = false"
-    />
-  </div>
-</template>
-<script lang="tsx">
-export default {
-  name: 'LoginLog'
-};
-</script>
-<script setup lang="tsx">
-import { ref, reactive } from 'vue';
-// import { useRouter } from 'vue-router';
-// import to from 'await-to-js';
-// import { clone } from 'xe-utils';
-import { useRender } from '@utogether/utils';
-
-const renderHook = useRender();
-// const renderOption = renderOptions();
-
-// const router = useRouter();
-
-const data = reactive({
-  showModal: false,
-  record: {},
-  title: ''
-});
-
-const formItems = [
-  { field: 'interfaceName' },
-  { field: 'interfaceUrl' },
-  { field: 'requestBodyParameter', title: 'message.requestParameter' },
-  { field: 'responseContent' },
-  { field: 'ip' },
-  { field: 'requestDate', itemRender: { name: '#SuDateRange', props: { type: 'daterange' } } },
-  { field: 'requestStatus', itemRender: renderHook.renderDict('SU.REQUEST.STATUS') }
-];
-
-const items = [
-  {
-    field: 'requestBodyParameter',
-    title: 'message.requestParameter',
-    itemRender: renderHook.renderTextarea({ rows: 8 })
-  },
-  { field: 'responseContent', itemRender: renderHook.renderTextarea({ rows: 6 }) },
-  { field: 'stacktrace', itemRender: renderHook.renderTextarea({ rows: 3 }) }
-];
-
-// 列字段
-const xgrid = ref(null);
-const columns = [
-  { field: 'interfaceName', minWidth: 120 },
-  { field: 'interfaceUrl', minWidth: 150 },
-  { field: 'ip', width: 120 },
-  { field: 'requestDate', width: 160 },
-  { field: 'responseTimeConsume', width: 120 },
-  { field: 'requestStatus', width: 90, formatter: ['formatDict', 'SU.REQUEST.STATUS'] },
-  {
-    field: 'operate',
-    width: 70,
-    slots: {
-      default: ({ row }) => {
-        if (!row.id) return null;
-        return [
-          <>
-            <ut-button content="detail" icon="ri-eye-line" onTap={() => handleShowDetail(row)} />
-          </>
-        ];
-      }
-    }
-  }
-];
-// 详情
-const handleShowDetail = record => {
-  const resContent = JSON.parse(record.responseContent);
-  record.resContent = resContent?.data?.list || resContent?.data;
-  record.resContent = record.resContent ? JSON.stringify(record.resContent) : '';
-  data.record = record;
-  data.showModal = true;
-  data.title = `【${record.interfaceName}】接口明细`;
-};
-</script>
+<!--
+ * @Author: wei.li
+ * @Date: 2021-12-23 11:22:51
+ * @LastEditors: wei.li
+ * @LastEditTime: 2024-07-04 09:39:31
+ * @Description: 入站接口日志
+-->
+
+<template>
+  <div>
+    <ut-grid ref="xgrid" :items="formItems" :columns="columns" url="/upms/v1/invokeInbound" :editable="false" />
+    <ut-modal-form
+      v-if="data.showModal"
+      ref="suModalRef"
+      :record="data.record"
+      :items="items"
+      :width="640"
+      :height="480"
+      :title="data.title"
+      @close="data.showModal = false"
+    />
+  </div>
+</template>
+<script lang="tsx">
+export default {
+  name: 'LoginLog'
+};
+</script>
+<script setup lang="tsx">
+import { ref, reactive } from 'vue';
+// import { useRouter } from 'vue-router';
+// import to from 'await-to-js';
+// import { clone } from 'xe-utils';
+import { useRender } from '@utogether/utils';
+
+const renderHook = useRender();
+// const renderOption = renderOptions();
+
+// const router = useRouter();
+
+const data = reactive({
+  showModal: false,
+  record: {},
+  title: ''
+});
+
+const formItems = [
+  { field: 'interfaceName' },
+  { field: 'interfaceUrl' },
+  { field: 'requestBodyParameter', title: 'message.requestParameter' },
+  { field: 'responseContent' },
+  { field: 'ip', title: 'message.udp.ip' },
+  { field: 'requestDate', itemRender: { name: '#SuDateRange', props: { type: 'daterange' } } },
+  { field: 'requestStatus', itemRender: renderHook.renderDict('SU.REQUEST.STATUS') }
+];
+
+const items = [
+  {
+    field: 'requestBodyParameter',
+    title: 'message.requestParameter',
+    itemRender: renderHook.renderTextarea({ rows: 8 })
+  },
+  { field: 'responseContent', itemRender: renderHook.renderTextarea({ rows: 6 }) },
+  { field: 'stacktrace', itemRender: renderHook.renderTextarea({ rows: 3 }) }
+];
+
+// 列字段
+const xgrid = ref(null);
+const columns = [
+  { field: 'interfaceName', minWidth: 120 },
+  { field: 'interfaceUrl', minWidth: 150 },
+  { field: 'ip', width: 120 },
+  { field: 'requestDate', width: 160 },
+  { field: 'responseTimeConsume', width: 120 },
+  { field: 'requestStatus', width: 90, formatter: ['formatDict', 'SU.REQUEST.STATUS'] },
+  {
+    field: 'operate',
+    width: 70,
+    slots: {
+      default: ({ row }) => {
+        if (!row.id) return null;
+        return [
+          <>
+            <ut-button content="detail" icon="ri-eye-line" onTap={() => handleShowDetail(row)} />
+          </>
+        ];
+      }
+    }
+  }
+];
+// 详情
+const handleShowDetail = record => {
+  const resContent = JSON.parse(record.responseContent);
+  record.resContent = resContent?.data?.list || resContent?.data;
+  record.resContent = record.resContent ? JSON.stringify(record.resContent) : '';
+  data.record = record;
+  data.showModal = true;
+  data.title = `【${record.interfaceName}】接口明细`;
+};
+</script>

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

@@ -1,60 +1,54 @@
-<!--
- * @Author: wei.li
- * @Date: 2021-12-23 11:22:51
- * @LastEditors: wei.li
- * @LastEditTime: 2024-06-28 10:13:13
- * @Description: 用户登录日志
--->
-
-<template>
-  <div>
-    <ut-grid
-      ref="xgrid"
-      :items="formItems"
-      :columns="columns"
-      url="/upms/v1/userMonitor"
-      :editable="false"
-    />
-  </div>
-</template>
-<script lang="tsx">
-export default {
-  name: 'LoginLog'
-};
-</script>
-<script setup lang="tsx">
-import { ref } from 'vue';
-// import { useRouter } from 'vue-router';
-// import to from 'await-to-js';
-// import { clone } from 'xe-utils';
-// import { useRender } from '@utogether/utils';
-
-// const renderHook = useRender();
-// const renderOption = renderOptions();
-
-// const router = useRouter();
-
-const formItems = [
-  { field: 'employeeName' },
-  { field: 'userName' },
-  { field: 'operatingSystem', title: 'message.udp.operatingSystem' },
-  { field: 'browserVersion', title: 'message.udp.browserVersion' },
-  {
-    field: 'loginTime',
-    title: 'message.udp.loginTime',
-    itemRender: { name: '#SuDateRange', props: { type: 'daterange' } }
-  }
-];
-
-// 列字段
-const xgrid = ref(null);
-const columns = [
-  { field: 'employeeName', minWidth: 120 },
-  { field: '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 },
-  { field: 'browserVersion', title: 'message.udp.browserVersion', width: 110 },
-  { field: 'ip', title: 'message.udp.ip', width: 150 }
-];
-</script>
+<!--
+ * @Author: wei.li
+ * @Date: 2021-12-23 11:22:51
+ * @LastEditors: wei.li
+ * @LastEditTime: 2024-06-28 10:13:13
+ * @Description: 用户登录日志
+-->
+
+<template>
+  <div>
+    <ut-grid ref="xgrid" :items="formItems" :columns="columns" url="/upfm/v1/userMonitor" :editable="false" />
+  </div>
+</template>
+<script lang="tsx">
+export default {
+  name: 'LoginLog'
+};
+</script>
+<script setup lang="tsx">
+import { ref } from 'vue';
+// import { useRouter } from 'vue-router';
+// import to from 'await-to-js';
+// import { clone } from 'xe-utils';
+// import { useRender } from '@utogether/utils';
+
+// const renderHook = useRender();
+// const renderOption = renderOptions();
+
+// const router = useRouter();
+
+const formItems = [
+  { field: 'employeeName' },
+  { field: 'userName' },
+  { field: 'operatingSystem', title: 'message.udp.operatingSystem' },
+  { field: 'browserVersion', title: 'message.udp.browserVersion' },
+  {
+    field: 'loginTime',
+    title: 'message.udp.loginTime',
+    itemRender: { name: '#SuDateRange', props: { type: 'daterange' } }
+  }
+];
+
+// 列字段
+const xgrid = ref(null);
+const columns = [
+  { field: 'employeeName', minWidth: 120 },
+  { 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 },
+  { field: 'browserVersion', title: 'message.udp.browserVersion', width: 110 },
+  { field: 'ip', title: 'message.udp.ip', width: 150 }
+];
+</script>

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;