@utogether/udp-core 1.0.1-beta.5 → 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/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"

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/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/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>

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,

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

@@ -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' }),

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/dist/Org-Dg9Xkd34.js

@@ -1,34 +0,0 @@
-import { defineComponent as a, ref as s, resolveComponent as u, createBlock as m, openBlock as f } from "vue";
-import { q as p, v as g } from "./index-BDE4-ZvN.js";
-import { clone as _ } from "xe-utils";
-import { useRender as h } from "@utogether/utils";
-const k = { name: "OrgUnit" }, y = /* @__PURE__ */ a({
-  ...k,
-  setup(R) {
-    const r = "/uums/org", n = s(null), i = h(), 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: t }) {
-      const o = _(t, !0), [e] = await p(g().put(r, [o]));
-      !e && n.value.refreshData();
-    }
-    return (t, o) => {
-      const e = u("ut-grid");
-      return f(), m(e, {
-        ref_key: "xgrid",
-        ref: n,
-        items: d,
-        columns: l,
-        url: r
-      }, null, 512);
-    };
-  }
-});
-export {
-  y as default
-};