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

package/src/components/udp/utils.ts

@@ -217,8 +217,7 @@ export const getExportConfig = attrs => {
     types: ['xlsx', 'csv'],
     modes: ['current', 'selected', 'all'],
     useStyle: true,
-    sheetMethod: ({ worksheet }) =>
-      attrs.onSheetMethod ? attrs.onSheetMethod(worksheet) : onSheetMethod(worksheet),
+    sheetMethod: ({ worksheet }) => (attrs.onSheetMethod ? attrs.onSheetMethod(worksheet) : onSheetMethod(worksheet)),
     columnFilterMethod: ({ column }) =>
       attrs.columnFilter
         ? !!attrs.columnFilter(column)
@@ -227,7 +226,7 @@ export const getExportConfig = attrs => {
 };
 
 export const getToolBarConfig = (data, props, attrs, hasAuthority) => {
-  const refresh = {
+  const refreshOptions = {
     icon: 'ri-refresh-line',
     iconLoading: 'vxe-icon-spinner roll vxe-loading--default-icon'
   };
@@ -241,9 +240,9 @@ export const getToolBarConfig = (data, props, attrs, hasAuthority) => {
     data.toolbarConfig = {
       buttons: [],
       enabled: hasExport,
-      refresh,
-      export: { icon: 'ri-download-2-line', code: 'export' },
-      custom: !!attrs.gridId,
+      refreshOptions,
+      exportOptions: { icon: 'ri-download-2-line', code: 'export' },
+      customOptions: !!attrs.gridId,
       perfect: true
     };
     return data;
@@ -259,19 +258,14 @@ export const getToolBarConfig = (data, props, attrs, hasAuthority) => {
   toolButtons.reverse().forEach(btn => {
     !buttons.some(s => s.code === btn.code) && buttons.unshift(btn);
     if (attrs.authPrefix && !['print', 'export'].includes(btn.auth)) {
-      btn.auth =
-        attrs.authPrefix +
-        btn.auth.slice(0, 1).toLocaleUpperCase() +
-        btn.auth.slice(1).toLocaleLowerCase();
+      btn.auth = attrs.authPrefix + btn.auth.slice(0, 1).toLocaleUpperCase() + btn.auth.slice(1).toLocaleLowerCase();
     }
   });
 
   buttons = formatButton(buttons, props.auth).filter(button => {
     const flag = button.auth ? hasAuthority(button.auth) : true;
     if (button.dropdowns?.length) {
-      button.dropdowns = button.dropdowns.filter(
-        btn => !btn.auth || (btn.auth && hasAuthority(btn.auth))
-      );
+      button.dropdowns = button.dropdowns.filter(btn => !btn.auth || (btn.auth && hasAuthority(btn.auth)));
     }
     return flag;
   });
@@ -288,9 +282,9 @@ export const getToolBarConfig = (data, props, attrs, hasAuthority) => {
   data.toolbarConfig = {
     buttons,
     enabled: true,
-    refresh,
-    custom: !!attrs.gridId,
-    export: exportBtn,
+    refreshOptions,
+    customOptions: !!attrs.gridId,
+    exportOptions: exportBtn,
     perfect: true
   };
   return data;
@@ -400,8 +394,7 @@ export const formatItems = (items, status, span = 24) => {
         disabled = true;
         item.placeholder = null;
       } else {
-        disabled =
-          item.disabled === false ? item.disabled : item.disabled || item.itemRender?.props?.disabled;
+        disabled = item.disabled === false ? item.disabled : item.disabled || item.itemRender?.props?.disabled;
       }
       let itemRender = {
         name: 'VxeInput',

package/src/main.ts

@@ -1,3 +1,11 @@
+/*
+ * @Author: levi7754 levi7754@163.com
+ * @Date: 2025-07-25 13:38:20
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-08-11 16:55:33
+ * @FilePath: \udp-front\packages\udp-core\src\main.ts
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
 /*
  * @Author: wei.li
  * @Date: 2022-10-18 18:13:54
@@ -41,7 +49,7 @@ import {
   // UtForm2,
   // UtGrid2,
   //   UtContent,
-  UtCountdown2
+  UtModalGrid2
   // UtUpload2
   //   UtIconSelect,
   //   UtCalendar
@@ -92,7 +100,7 @@ const init = ({ router, config, lang, views, env, tableConfig }) => {
     // app.component('UtModalForm2', UtModalForm2);
     // app.component('UtGrid2', UtGrid2);
     // app.component('UtForm2', UtForm2);
-    app.component('UtCountdown2', UtCountdown2);
+    app.component('UtModalGrid2', UtModalGrid2);
     //   .component('UtIconSelect', UtIconSelect)
     // app.component('UtUpload2', UtUpload2);
     //   .component('UtCalendar', UtCalendar)

package/src/plugins/i18n/en.ts

@@ -13,7 +13,6 @@ export default {
     login: 'Login',
     home: 'Home',
     logout: 'Logout',
-    userName: 'User Name',
     password: 'Password',
     passwordReset: 'Password Reset',
     oldPwd: 'Old Password',
@@ -78,7 +77,30 @@ export default {
     lastMonth: 'Last Month',
     threeMonth: 'Three Month',
     halfYear: 'Half Year',
-    anniversary: 'Anniversary'
+    anniversary: 'Anniversary',
+
+    newVersion: '检测到新版本',
+    updatenow: '立即更新',
+    updateLater: '稍后更新',
+    appVersion: '版本号',
+    buildNo: '构建号',
+    versionInfo: '版本信息',
+    isForceUpdate: '安装方式',
+    downloadUrl: 'APK文件',
+    forceUpdate: '强制更新',
+    freeUpdate: '自主更新',
+
+    userName: 'User Name',
+    userCode: 'user Code',
+    sysType: 'User Type',
+
+    orgCode: 'Business Unit Code',
+    orgName: 'Business Unit Name',
+    orgAlias: 'Business Unit Alias',
+    orgDesc: 'Business Unit Descript',
+
+    organizationName: 'Organization Name',
+    organizationCode: 'Organization Code'
   },
   btn: {
     add: 'Add',
@@ -243,13 +265,10 @@ export default {
   responseContent: 'Response Content',
   stacktrace: 'Stacktrace',
 
-  userName: 'User Name',
-  userCode: 'user Code',
   status: 'Status',
   email: 'Email',
   userPassword: 'Password',
   remarks: 'Remarks',
-  sysType: 'User Type',
   userPwd: 'Password',
   unitName: 'Department',
 
@@ -269,14 +288,6 @@ export default {
   deptType: 'Department Type',
   deletePartment: 'There are child levels in the department, please delete the child level first',
 
-  orgCode: 'Business Unit Code',
-  orgName: 'Business Unit Name',
-  orgAlias: 'Business Unit Alias',
-  orgDesc: 'Business Unit Descript',
-
-  organizationName: 'Organization Name',
-  organizationCode: 'Organization Code',
-
   lovCode: 'LovCode',
   lovName: 'lovName',
   valueField: 'valueField',