@utogether/udp-core 1.0.1-beta.7 → 1.0.1-beta.9

package/src/components/udp/utils.ts

@@ -2,7 +2,7 @@
  * @Author: levi7754 levi7754@163.com
  * @Date: 2025-07-14 17:38:38
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-07-30 15:00:49
+ * @LastEditTime: 2025-08-21 10:57:00
  * @FilePath: \udp-front\packages\udp-core\src\components\udp\utils.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -226,10 +226,12 @@ export const getExportConfig = attrs => {
 };
 
 export const getToolBarConfig = (data, props, attrs, hasAuthority) => {
-  const refresh = {
+  const refreshOptions = {
     icon: 'ri-refresh-line',
+    code: 'query',
     iconLoading: 'vxe-icon-spinner roll vxe-loading--default-icon'
   };
+  debugger;
   // 不可编辑时
   if (!props.editable) {
     data.editConfig.editable = props.editable;
@@ -240,9 +242,11 @@ export const getToolBarConfig = (data, props, attrs, hasAuthority) => {
     data.toolbarConfig = {
       buttons: [],
       enabled: hasExport,
-      refresh,
-      export: { icon: 'ri-download-2-line', code: 'export' },
+      refreshOptions,
+      exportOptions: { icon: 'ri-download-2-line', code: 'export' },
+      export: hasExport,
       custom: !!attrs.gridId,
+      refresh: true,
       perfect: true
     };
     return data;
@@ -282,9 +286,11 @@ export const getToolBarConfig = (data, props, attrs, hasAuthority) => {
   data.toolbarConfig = {
     buttons,
     enabled: true,
-    refresh,
+    refreshOptions,
     custom: !!attrs.gridId,
-    export: exportBtn,
+    exportOptions: exportBtn,
+    export: hasExport,
+    refresh: true,
     perfect: true
   };
   return data;

package/src/main.ts

@@ -1,119 +1,119 @@
-/*
- * @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
- * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-07-31 17:17:32
- * @Description: file content
- */
-import { createApp, type Directive } from 'vue';
-import App from './App.vue';
-// import router from './router';
-import { setViews } from './router';
-import { setupStore } from './store';
-import { setConfig, setSystemEnv } from './config';
-import { useI18n } from '../src/plugins/i18n';
-import { setTableConfig } from '../src/plugins/vxe-table';
-import { injectResponsiveStorage } from './utils/storage';
-import hasAuthority from './utils/authority';
-import { getServiceApi, getBaseURL, setRouter } from './api';
-
-import 'nprogress/nprogress.css';
-// 一定要在main.ts中导入tailwind.css，防止vite每次hmr都会请求src/style/index.scss整体css文件导致热更新慢的问题
-import './style/tailwind.css';
-// // 引入重置样式
-import './style/reset.scss';
-// 导入公共样式
-import './style/index.scss';
-
-import 'viewerjs/dist/viewer.css';
-
-import VueViewer from 'v-viewer';
-
-// import SuTable from './components/SuTable/SuTable.vue';
-
-import {
-  //   UtButton,
-  // utLov2,
-  // UGrid,
-  //   UtDivider,
-  // UtModalForm2,
-  // FormUpload2
-  // UtForm2,
-  // UtGrid2,
-  //   UtContent,
-  UtModalGrid2
-  // UtUpload2
-  //   UtIconSelect,
-  //   UtCalendar
-  // uAttachment
-} from './components/udp';
-
-const app = createApp(App);
-
-// 全局注册`@iconify/vue`图标库
-import { IconifyIconOffline, FontIcon } from './components/ReIcon';
-// 全局注册`vue-tippy`
-import 'tippy.js/dist/tippy.css';
-import 'tippy.js/animations/perspective.css';
-import VueTippy from 'vue-tippy';
-
-app.use(VueTippy, {
-  defaultProps: { animation: 'perspective' }
-});
-
-// 自定义指令
-import * as directives from './directives';
-
-const setGlobal = app => {
-  app.config.globalProperties.$hasAuthority = hasAuthority;
-  app.config.globalProperties.$serviceApi = getServiceApi();
-  app.config.globalProperties.$url = getBaseURL();
-};
-
-const setGlobalDirective = app => {
-  Object.keys(directives).forEach(key => {
-    app.directive(key, (directives as { [key: string]: Directive })[key]);
-  });
-};
-
-const init = ({ router, config, lang, views, env, tableConfig }) => {
-  setViews(views, router);
-  app.use(router);
-  setRouter(router);
-  setConfig(app, config);
-  setSystemEnv(env);
-  setTableConfig(tableConfig);
-  return new Promise(resolve => {
-    useI18n(app, lang);
-    app.component('IconifyIconOffline', IconifyIconOffline);
-    app.component('FontIcon', FontIcon);
-    // app.component('uAttachment', uAttachment).component('UGrid', UGrid);
-    //   .component('UtDivider', UtDivider)
-    // app.component('UtModalForm2', UtModalForm2);
-    // app.component('UtGrid2', UtGrid2);
-    // app.component('UtForm2', UtForm2);
-    app.component('UtModalGrid2', UtModalGrid2);
-    //   .component('UtIconSelect', UtIconSelect)
-    // app.component('UtUpload2', UtUpload2);
-    //   .component('UtCalendar', UtCalendar)
-    //   .component('UtModalGrid', UtModalGrid);
-    app.use(VueViewer, { defaultOptions: { zIndex: 9999 } });
-    setGlobal(app);
-    setGlobalDirective(app);
-    // 全局组件
-    setupStore(app);
-    injectResponsiveStorage(app, config);
-    const result = { app, router };
-    resolve(result);
-  });
-};
-
-export default init;
+/*
+ * @Author: levi7754 levi7754@163.com
+ * @Date: 2025-07-25 13:38:20
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-08-21 17:15:41
+ * @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
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-07-31 17:17:32
+ * @Description: file content
+ */
+import { createApp, type Directive } from 'vue';
+import App from './App.vue';
+// import router from './router';
+import { setViews } from './router';
+import { setupStore } from './store';
+import { setConfig, setSystemEnv } from './config';
+import { useI18n } from '../src/plugins/i18n';
+import { setTableConfig } from '../src/plugins/vxe-table';
+import { injectResponsiveStorage } from './utils/storage';
+import hasAuthority from './utils/authority';
+import { getServiceApi, getBaseURL, setRouter } from './api';
+
+import 'nprogress/nprogress.css';
+// 一定要在main.ts中导入tailwind.css，防止vite每次hmr都会请求src/style/index.scss整体css文件导致热更新慢的问题
+import './style/tailwind.css';
+// // 引入重置样式
+import './style/reset.scss';
+// 导入公共样式
+import './style/index.scss';
+
+import 'viewerjs/dist/viewer.css';
+
+import VueViewer from 'v-viewer';
+
+// import SuTable from './components/SuTable/SuTable.vue';
+
+// import {
+//   UtButton,
+// utLov2,
+// UGrid,
+//   UtDivider,
+// UtModalForm2,
+// FormUpload2,
+// UtForm2
+// UtGrid2
+//   UtContent,
+// UtModalGrid2
+// UtUpload2
+//   UtIconSelect,
+//   UtCalendar
+// uAttachment
+// } from './components/udp';
+
+const app = createApp(App);
+
+// 全局注册`@iconify/vue`图标库
+import { IconifyIconOffline, FontIcon } from './components/ReIcon';
+// 全局注册`vue-tippy`
+import 'tippy.js/dist/tippy.css';
+import 'tippy.js/animations/perspective.css';
+import VueTippy from 'vue-tippy';
+
+app.use(VueTippy, {
+  defaultProps: { animation: 'perspective' }
+});
+
+// 自定义指令
+import * as directives from './directives';
+
+const setGlobal = app => {
+  app.config.globalProperties.$hasAuthority = hasAuthority;
+  app.config.globalProperties.$serviceApi = getServiceApi();
+  app.config.globalProperties.$url = getBaseURL();
+};
+
+const setGlobalDirective = app => {
+  Object.keys(directives).forEach(key => {
+    app.directive(key, (directives as { [key: string]: Directive })[key]);
+  });
+};
+
+const init = ({ router, config, lang, views, env, tableConfig }) => {
+  setViews(views, router);
+  app.use(router);
+  setRouter(router);
+  setConfig(app, config);
+  setSystemEnv(env);
+  setTableConfig(tableConfig);
+  return new Promise(resolve => {
+    useI18n(app, lang);
+    app.component('IconifyIconOffline', IconifyIconOffline);
+    app.component('FontIcon', FontIcon);
+    // app.component('uAttachment', uAttachment).component('UGrid', UGrid);
+    //   .component('UtDivider', UtDivider)
+    // app.component('UtModalForm2', UtModalForm2);
+    // app.component('UtGrid2', UtGrid2);
+    // app.component('UtForm2', UtForm2);
+    // app.component('UtModalGrid2', UtModalGrid2);
+    //   .component('UtIconSelect', UtIconSelect)
+    // app.component('FormUpload2', FormUpload2);
+    //   .component('UtCalendar', UtCalendar)
+    //   .component('UtModalGrid', UtModalGrid);
+    app.use(VueViewer, { defaultOptions: { zIndex: 9999 } });
+    setGlobal(app);
+    setGlobalDirective(app);
+    // 全局组件
+    setupStore(app);
+    injectResponsiveStorage(app, config);
+    const result = { app, router };
+    resolve(result);
+  });
+};
+
+export default init;

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',