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

package/src/views/udev/lov/lov-view.vue

@@ -1,91 +1,91 @@
-<!--
- * @Author: wei.li
- * @Date: 2022-08-10 09:10:39
- * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-04-08 15:31:20
- * @Description: 值集视图
--->
-<template>
-  <div>
-    <ut-grid ref="xgrid" :items="formItems" :columns="columns" :url="url" :events="onEvents" />
-    <child-view v-if="shouDrawer" :show="shouDrawer" :record="record" @onClose="handleClose" />
-  </div>
-</template>
-
-<script setup lang="tsx">
-import { ref, nextTick } from 'vue';
-// import { VxeGridInstance } from 'vxe-table';
-import to from 'await-to-js';
-import { getServiceApi } from '../../../api';
-import childView from './childView.vue';
-import { useRender } from '@utogether/utils';
-
-defineOptions({ name: 'LovView' });
-
-const xgrid = ref(null);
-
-const formItems = [{ field: 'lovCode' }, { field: 'lovName' }];
-
-const renderHook = useRender();
-
-const url = '/upfm/v1/lovViewHeader';
-
-// 列字段
-const columns = [
-  { type: 'checkbox', width: 50, align: 'center' },
-  {
-    field: 'lovCode',
-    required: true,
-    editRender: renderHook.renderInput()
-  },
-  { field: 'lovName', required: true, editRender: renderHook.renderInput() },
-  { field: 'valueField', required: true, editRender: renderHook.renderInput() },
-  { field: 'lovTitle', editRender: renderHook.renderInput() },
-  {
-    field: 'lovType',
-    editRender: renderHook.renderDict('SU.LOV.TYPE'),
-    required: true,
-    formatter: ['formatDict', 'SU.LOV.TYPE']
-  },
-  { field: 'remarks', title: 'message.remark', editRender: renderHook.renderInput() },
-  { field: 'enabled', width: 80, cellRender: renderHook.renderEnabled(handleClick) },
-  {
-    field: 'operate',
-    width: 100,
-    fixed: 'right',
-    slots: {
-      default: ({ row }) => {
-        if (!row.id) return null;
-        return [<ut-button content="config" icon="ri-edit-box-line" onTap={() => hanldeDipose(row)} />];
-      }
-    }
-  }
-];
-
-const shouDrawer = ref(false);
-const record = ref(null);
-const hanldeDipose = row => {
-  nextTick(() => {
-    shouDrawer.value = true;
-    record.value = row;
-    // record.value.total = row.children.length;
-  });
-};
-const handleClose = () => {
-  xgrid.value.refreshData();
-  shouDrawer.value = false;
-};
-
-// 启用/禁用
-async function handleClick(row) {
-  const [err] = await to(getServiceApi().put(url, [row]));
-  !err && xgrid.value.refreshData();
-}
-
-const onEvents = {
-  editActived({ row }) {
-    columns[1].editRender.props.disabled = !!row.id;
-    xgrid.value.refreshColumn();
-  }
-};
-</script>
+<!--
+ * @Author: wei.li
+ * @Date: 2022-08-10 09:10:39
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-04-08 15:31:20
+ * @Description: 值集视图
+-->
+<template>
+  <div>
+    <ut-grid ref="xgrid" :items="formItems" :columns="columns" :url="url" :events="onEvents" />
+    <child-view v-if="shouDrawer" :show="shouDrawer" :record="record" @onClose="handleClose" />
+  </div>
+</template>
+
+<script setup lang="tsx">
+import { ref, nextTick } from 'vue';
+// import { VxeGridInstance } from 'vxe-table';
+import to from 'await-to-js';
+import { getServiceApi } from '../../../api';
+import childView from './childView.vue';
+import { useRender } from '@utogether/utils';
+
+defineOptions({ name: 'LovView' });
+
+const xgrid = ref(null);
+
+const formItems = [{ field: 'lovCode' }, { field: 'lovName' }];
+
+const renderHook = useRender();
+
+const url = '/upfm/v1/lovViewHeader';
+
+// 列字段
+const columns = [
+  { type: 'checkbox', width: 50, align: 'center' },
+  {
+    field: 'lovCode',
+    required: true,
+    editRender: renderHook.renderInput()
+  },
+  { field: 'lovName', required: true, editRender: renderHook.renderInput() },
+  { field: 'valueField', required: true, editRender: renderHook.renderInput() },
+  { field: 'lovTitle', editRender: renderHook.renderInput() },
+  {
+    field: 'lovType',
+    editRender: renderHook.renderDict('SU.LOV.TYPE'),
+    required: true,
+    formatter: ['formatDict', 'SU.LOV.TYPE']
+  },
+  { field: 'remarks', title: 'message.remark', editRender: renderHook.renderInput() },
+  { field: 'enabled', width: 80, cellRender: renderHook.renderEnabled(handleClick) },
+  {
+    field: 'operate',
+    width: 100,
+    fixed: 'right',
+    slots: {
+      default: ({ row }) => {
+        if (!row.id) return null;
+        return [<ut-button content="config" icon="ri-edit-box-line" onTap={() => hanldeDipose(row)} />];
+      }
+    }
+  }
+];
+
+const shouDrawer = ref(false);
+const record = ref(null);
+const hanldeDipose = row => {
+  nextTick(() => {
+    shouDrawer.value = true;
+    record.value = row;
+    // record.value.total = row.children.length;
+  });
+};
+const handleClose = () => {
+  xgrid.value.refreshData();
+  shouDrawer.value = false;
+};
+
+// 启用/禁用
+async function handleClick(row) {
+  const [err] = await to(getServiceApi().put(url, [row]));
+  !err && xgrid.value.refreshData();
+}
+
+const onEvents = {
+  editActived({ row }) {
+    columns[1].editRender.props.disabled = !!row.id;
+    xgrid.value.refreshColumn();
+  }
+};
+</script>

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

@@ -7,11 +7,7 @@
     </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 +69,7 @@
         </button>
       </div>
     </div>
-    <div class="absolute flex justify-center w-full font-bold bottom-1">
+    <!-- <div 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">
@@ -96,7 +92,7 @@
         </span>
         <span class="flex items-center text-white" style="width: 75px; font-size: 10px">技术支持</span>
       </span>
-    </div>
+    </div> -->
   </div>
 </template>
 
@@ -113,6 +109,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 +184,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 +237,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 +280,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>