@utogether/udp-core 2.0.0-beta.26 → 2.0.0-beta.27

package/src/components/SuQrcode/src/index.tsx

@@ -1,236 +1,231 @@
-import { ref, unref, watch, nextTick, computed, type PropType, defineComponent } from 'vue';
-import './index.scss';
-import { isString, clone } from 'xe-utils';
-import propTypes from '@/utils/propTypes';
-import { IconifyIconOffline } from '../../ReIcon';
-import QRCode, { type QRCodeRenderersOptions } from 'qrcode';
-
-interface QrcodeLogo {
-  src?: string;
-  logoSize?: number;
-  bgColor?: string;
-  borderSize?: number;
-  crossOrigin?: string;
-  borderRadius?: number;
-  logoRadius?: number;
-}
-
-const props = {
-  // img 或者 canvas,img不支持logo嵌套
-  tag: propTypes.string.validate((v: string) => ['canvas', 'img'].includes(v)).def('canvas'),
-  // 二维码内容
-  text: {
-    type: [String, Array] as PropType<string | Recordable[]>,
-    default: null
-  },
-  // qrcode.js配置项
-  options: {
-    type: Object as PropType<QRCodeRenderersOptions>,
-    default: (): QRCodeRenderersOptions => ({})
-  },
-  // 宽度
-  width: propTypes.number.def(200),
-  // logo
-  logo: {
-    type: [String, Object] as PropType<Partial<QrcodeLogo> | string>,
-    default: (): QrcodeLogo | string => ''
-  },
-  // 是否过期
-  disabled: propTypes.bool.def(false),
-  // 过期提示内容
-  disabledText: propTypes.string.def('')
-};
-
-export default defineComponent({
-  name: 'SuQrcode',
-  props,
-  emits: ['done', 'click', 'disabled-click'],
-  setup(props, { emit }) {
-    const { toCanvas, toDataURL } = QRCode;
-    const loading = ref(true);
-    const wrapRef = ref<Nullable<HTMLCanvasElement | HTMLImageElement>>(null);
-    const renderText = computed(() => String(props.text));
-    const wrapStyle = computed(() => {
-      return {
-        width: props.width + 'px',
-        height: props.width + 'px'
-      };
-    });
-    const initQrcode = async () => {
-      await nextTick();
-      const options = clone(props.options || {}, true);
-      if (props.tag === 'canvas') {
-        // 容错率，默认对内容少的二维码采用高容错率，内容多的二维码采用低容错率
-        options.errorCorrectionLevel =
-          options.errorCorrectionLevel || getErrorCorrectionLevel(unref(renderText));
-        const _width: number = await getOriginWidth(unref(renderText), options);
-        options.scale = props.width === 0 ? undefined : (props.width / _width) * 4;
-        const canvasRef: any = await toCanvas(
-          unref(wrapRef) as HTMLCanvasElement,
-          unref(renderText),
-          options
-        );
-        if (props.logo) {
-          const url = await createLogoCode(canvasRef);
-          emit('done', url);
-          loading.value = false;
-        } else {
-          emit('done', canvasRef.toDataURL());
-          loading.value = false;
-        }
-      } else {
-        const url = await toDataURL(renderText.value, {
-          errorCorrectionLevel: 'H',
-          width: props.width,
-          ...options
-        });
-        (unref(wrapRef) as HTMLImageElement).src = url;
-        emit('done', url);
-        loading.value = false;
-      }
-    };
-    watch(
-      () => renderText.value,
-      val => {
-        if (!val) return;
-        initQrcode();
-      },
-      {
-        deep: true,
-        immediate: true
-      }
-    );
-    const createLogoCode = (canvasRef: HTMLCanvasElement) => {
-      const canvasWidth = canvasRef.width;
-      const logoOptions: QrcodeLogo = Object.assign(
-        {
-          logoSize: 0.15,
-          bgColor: '#ffffff',
-          borderSize: 0.05,
-          crossOrigin: 'anonymous',
-          borderRadius: 8,
-          logoRadius: 0
-        },
-        isString(props.logo) ? {} : props.logo
-      );
-      const {
-        logoSize = 0.15,
-        bgColor = '#ffffff',
-        borderSize = 0.05,
-        crossOrigin = 'anonymous',
-        borderRadius = 8,
-        logoRadius = 0
-      } = logoOptions;
-      const logoSrc = isString(props.logo) ? props.logo : props.logo.src;
-      const logoWidth = canvasWidth * logoSize;
-      const logoXY = (canvasWidth * (1 - logoSize)) / 2;
-      const logoBgWidth = canvasWidth * (logoSize + borderSize);
-      const logoBgXY = (canvasWidth * (1 - logoSize - borderSize)) / 2;
-      const ctx = canvasRef.getContext('2d');
-      if (!ctx) return;
-      // logo 底色
-      canvasRoundRect(ctx)(logoBgXY, logoBgXY, logoBgWidth, logoBgWidth, borderRadius);
-      ctx.fillStyle = bgColor;
-      ctx.fill();
-      // logo
-      const image = new Image();
-      if (crossOrigin || logoRadius) {
-        image.setAttribute('crossOrigin', crossOrigin);
-      }
-      (image as any).src = logoSrc;
-      // 使用image绘制可以避免某些跨域情况
-      const drawLogoWithImage = (image: HTMLImageElement) => {
-        ctx.drawImage(image, logoXY, logoXY, logoWidth, logoWidth);
-      };
-      // 使用canvas绘制以获得更多的功能
-      const drawLogoWithCanvas = (image: HTMLImageElement) => {
-        const canvasImage = document.createElement('canvas');
-        canvasImage.width = logoXY + logoWidth;
-        canvasImage.height = logoXY + logoWidth;
-        const imageCanvas = canvasImage.getContext('2d');
-        if (!imageCanvas || !ctx) return;
-        imageCanvas.drawImage(image, logoXY, logoXY, logoWidth, logoWidth);
-        canvasRoundRect(ctx)(logoXY, logoXY, logoWidth, logoWidth, logoRadius);
-        if (!ctx) return;
-        const fillStyle = ctx.createPattern(canvasImage, 'no-repeat');
-        if (fillStyle) {
-          ctx.fillStyle = fillStyle;
-          ctx.fill();
-        }
-      };
-      // 将 logo绘制到 canvas上
-      return new Promise((resolve: any) => {
-        image.onload = () => {
-          logoRadius ? drawLogoWithCanvas(image) : drawLogoWithImage(image);
-          resolve(canvasRef.toDataURL());
-        };
-      });
-    };
-    // 得到原QrCode的大小，以便缩放得到正确的QrCode大小
-    const getOriginWidth = async (content: string, options: QRCodeRenderersOptions) => {
-      const _canvas = document.createElement('canvas');
-      await toCanvas(_canvas, content, options);
-      return _canvas.width;
-    };
-    // 对于内容少的QrCode，增大容错率
-    const getErrorCorrectionLevel = (content: string) => {
-      if (content.length > 36) {
-        return 'M';
-      } else if (content.length > 16) {
-        return 'Q';
-      } else {
-        return 'H';
-      }
-    };
-    // 用于绘制圆角
-    const canvasRoundRect = (ctx: CanvasRenderingContext2D) => {
-      return (x: number, y: number, w: number, h: number, r: number) => {
-        const minSize = Math.min(w, h);
-        if (r > minSize / 2) {
-          r = minSize / 2;
-        }
-        ctx.beginPath();
-        ctx.moveTo(x + r, y);
-        ctx.arcTo(x + w, y, x + w, y + h, r);
-        ctx.arcTo(x + w, y + h, x, y + h, r);
-        ctx.arcTo(x, y + h, x, y, r);
-        ctx.arcTo(x, y, x + w, y, r);
-        ctx.closePath();
-        return ctx;
-      };
-    };
-    const clickCode = () => {
-      emit('click');
-    };
-    const disabledClick = () => {
-      emit('disabled-click');
-    };
-    return () => (
-      <>
-        <div v-loading={unref(loading)} class="qrcode relative inline-block" style={unref(wrapStyle)}>
-          {props.tag === 'canvas' ? (
-            <canvas ref={wrapRef} onClick={clickCode}></canvas>
-          ) : (
-            <img ref={wrapRef} onClick={clickCode}></img>
-          )}
-          {props.disabled && (
-            <div
-              class="qrcode--disabled absolute top-0 left-0 flex w-full h-full items-center justify-center"
-              onClick={disabledClick}
-            >
-              <div class="absolute top-[50%] left-[50%] font-bold">
-                <IconifyIconOffline
-                  class="cursor-pointer"
-                  icon="refresh-right"
-                  width="30"
-                  color="var(--el-color-primary)"
-                />
-                <div>{props.disabledText}</div>
-              </div>
-            </div>
-          )}
-        </div>
-      </>
-    );
-  }
-});
+import { ref, unref, watch, nextTick, computed, type PropType, defineComponent } from 'vue';
+import './index.scss';
+import { isString, clone } from 'xe-utils';
+import propTypes from '@/utils/propTypes';
+import { IconifyIconOffline } from '../../ReIcon';
+import QRCode, { type QRCodeRenderersOptions } from 'qrcode';
+
+interface QrcodeLogo {
+  src?: string;
+  logoSize?: number;
+  bgColor?: string;
+  borderSize?: number;
+  crossOrigin?: string;
+  borderRadius?: number;
+  logoRadius?: number;
+}
+
+const props = {
+  // img 或者 canvas,img不支持logo嵌套
+  tag: propTypes.string.validate((v: string) => ['canvas', 'img'].includes(v)).def('canvas'),
+  // 二维码内容
+  text: {
+    type: [String, Array] as PropType<string | Recordable[]>,
+    default: null
+  },
+  // qrcode.js配置项
+  options: {
+    type: Object as PropType<QRCodeRenderersOptions>,
+    default: (): QRCodeRenderersOptions => ({})
+  },
+  // 宽度
+  width: propTypes.number.def(200),
+  // logo
+  logo: {
+    type: [String, Object] as PropType<Partial<QrcodeLogo> | string>,
+    default: (): QrcodeLogo | string => ''
+  },
+  // 是否过期
+  disabled: propTypes.bool.def(false),
+  // 过期提示内容
+  disabledText: propTypes.string.def('')
+};
+
+export default defineComponent({
+  name: 'SuQrcode',
+  props,
+  emits: ['done', 'click', 'disabled-click'],
+  setup(props, { emit }) {
+    const { toCanvas, toDataURL } = QRCode;
+    const loading = ref(true);
+    const wrapRef = ref<Nullable<HTMLCanvasElement | HTMLImageElement>>(null);
+    const renderText = computed(() => String(props.text));
+    const wrapStyle = computed(() => {
+      return {
+        width: props.width + 'px',
+        height: props.width + 'px'
+      };
+    });
+    const initQrcode = async () => {
+      await nextTick();
+      const options = clone(props.options || {}, true);
+      if (props.tag === 'canvas') {
+        // 容错率，默认对内容少的二维码采用高容错率，内容多的二维码采用低容错率
+        options.errorCorrectionLevel = options.errorCorrectionLevel || getErrorCorrectionLevel(unref(renderText));
+        const _width: number = await getOriginWidth(unref(renderText), options);
+        options.scale = props.width === 0 ? undefined : (props.width / _width) * 4;
+        const canvasRef: any = await toCanvas(unref(wrapRef) as HTMLCanvasElement, unref(renderText), options);
+        if (props.logo) {
+          const url = await createLogoCode(canvasRef);
+          emit('done', url);
+          loading.value = false;
+        } else {
+          emit('done', canvasRef.toDataURL());
+          loading.value = false;
+        }
+      } else {
+        const url = await toDataURL(renderText.value, {
+          errorCorrectionLevel: 'H',
+          width: props.width,
+          ...options
+        });
+        (unref(wrapRef) as HTMLImageElement).src = url;
+        emit('done', url);
+        loading.value = false;
+      }
+    };
+    watch(
+      () => renderText.value,
+      val => {
+        if (!val) return;
+        initQrcode();
+      },
+      {
+        deep: true,
+        immediate: true
+      }
+    );
+    const createLogoCode = (canvasRef: HTMLCanvasElement) => {
+      const canvasWidth = canvasRef.width;
+      const logoOptions: QrcodeLogo = Object.assign(
+        {
+          logoSize: 0.15,
+          bgColor: '#ffffff',
+          borderSize: 0.05,
+          crossOrigin: 'anonymous',
+          borderRadius: 8,
+          logoRadius: 0
+        },
+        isString(props.logo) ? {} : props.logo
+      );
+      const {
+        logoSize = 0.15,
+        bgColor = '#ffffff',
+        borderSize = 0.05,
+        crossOrigin = 'anonymous',
+        borderRadius = 8,
+        logoRadius = 0
+      } = logoOptions;
+      const logoSrc = isString(props.logo) ? props.logo : props.logo.src;
+      const logoWidth = canvasWidth * logoSize;
+      const logoXY = (canvasWidth * (1 - logoSize)) / 2;
+      const logoBgWidth = canvasWidth * (logoSize + borderSize);
+      const logoBgXY = (canvasWidth * (1 - logoSize - borderSize)) / 2;
+      const ctx = canvasRef.getContext('2d');
+      if (!ctx) return;
+      // logo 底色
+      canvasRoundRect(ctx)(logoBgXY, logoBgXY, logoBgWidth, logoBgWidth, borderRadius);
+      ctx.fillStyle = bgColor;
+      ctx.fill();
+      // logo
+      const image = new Image();
+      if (crossOrigin || logoRadius) {
+        image.setAttribute('crossOrigin', crossOrigin);
+      }
+      (image as any).src = logoSrc;
+      // 使用image绘制可以避免某些跨域情况
+      const drawLogoWithImage = (image: HTMLImageElement) => {
+        ctx.drawImage(image, logoXY, logoXY, logoWidth, logoWidth);
+      };
+      // 使用canvas绘制以获得更多的功能
+      const drawLogoWithCanvas = (image: HTMLImageElement) => {
+        const canvasImage = document.createElement('canvas');
+        canvasImage.width = logoXY + logoWidth;
+        canvasImage.height = logoXY + logoWidth;
+        const imageCanvas = canvasImage.getContext('2d');
+        if (!imageCanvas || !ctx) return;
+        imageCanvas.drawImage(image, logoXY, logoXY, logoWidth, logoWidth);
+        canvasRoundRect(ctx)(logoXY, logoXY, logoWidth, logoWidth, logoRadius);
+        if (!ctx) return;
+        const fillStyle = ctx.createPattern(canvasImage, 'no-repeat');
+        if (fillStyle) {
+          ctx.fillStyle = fillStyle;
+          ctx.fill();
+        }
+      };
+      // 将 logo绘制到 canvas上
+      return new Promise((resolve: any) => {
+        image.onload = () => {
+          logoRadius ? drawLogoWithCanvas(image) : drawLogoWithImage(image);
+          resolve(canvasRef.toDataURL());
+        };
+      });
+    };
+    // 得到原QrCode的大小，以便缩放得到正确的QrCode大小
+    const getOriginWidth = async (content: string, options: QRCodeRenderersOptions) => {
+      const _canvas = document.createElement('canvas');
+      await toCanvas(_canvas, content, options);
+      return _canvas.width;
+    };
+    // 对于内容少的QrCode，增大容错率
+    const getErrorCorrectionLevel = (content: string) => {
+      if (content.length > 36) {
+        return 'M';
+      } else if (content.length > 16) {
+        return 'Q';
+      } else {
+        return 'H';
+      }
+    };
+    // 用于绘制圆角
+    const canvasRoundRect = (ctx: CanvasRenderingContext2D) => {
+      return (x: number, y: number, w: number, h: number, r: number) => {
+        const minSize = Math.min(w, h);
+        if (r > minSize / 2) {
+          r = minSize / 2;
+        }
+        ctx.beginPath();
+        ctx.moveTo(x + r, y);
+        ctx.arcTo(x + w, y, x + w, y + h, r);
+        ctx.arcTo(x + w, y + h, x, y + h, r);
+        ctx.arcTo(x, y + h, x, y, r);
+        ctx.arcTo(x, y, x + w, y, r);
+        ctx.closePath();
+        return ctx;
+      };
+    };
+    const clickCode = () => {
+      emit('click');
+    };
+    const disabledClick = () => {
+      emit('disabled-click');
+    };
+    return () => (
+      <>
+        <div v-loading={unref(loading)} class="qrcode relative inline-block" style={unref(wrapStyle)}>
+          {props.tag === 'canvas' ? (
+            <canvas ref={wrapRef} onClick={clickCode}></canvas>
+          ) : (
+            <img ref={wrapRef} onClick={clickCode}></img>
+          )}
+          {props.disabled && (
+            <div
+              class="qrcode--disabled absolute top-0 left-0 flex w-full h-full items-center justify-center"
+              onClick={disabledClick}
+            >
+              <div class="absolute top-[50%] left-[50%] font-bold">
+                <IconifyIconOffline
+                  class="cursor-pointer"
+                  icon="refresh-right"
+                  width="30"
+                  color="var(--el-color-primary)"
+                />
+                <div>{props.disabledText}</div>
+              </div>
+            </div>
+          )}
+        </div>
+      </>
+    );
+  }
+});

package/src/layout/components/lay-panel/index.vue

@@ -53,9 +53,7 @@ onBeforeUnmount(() => {
   <div :class="{ show }">
     <div class="right-panel-background" />
     <div ref="target" class="right-panel bg-bg_color bg-white">
-      <div
-        class="project-configuration border-0 border-b-[1px] border-solid border-[var(--pure-border-color)]"
-      >
+      <div class="project-configuration border-0 border-b-[1px] border-solid border-[var(--pure-border-color)]">
         <h4 class="dark:text-white">{{ $t('message.tip.projectConfig') }}</h4>
         <span
           v-tippy="{
@@ -78,9 +76,7 @@ onBeforeUnmount(() => {
         <slot />
       </el-scrollbar>
 
-      <div
-        class="flex justify-end p-3 border-0 border-t-[1px] border-solid border-[var(--pure-border-color)]"
-      >
+      <div class="flex justify-end p-3 border-0 border-t-[1px] border-solid border-[var(--pure-border-color)]">
         <el-button
           v-tippy="{
             content: $t('message.tip.toLogin'),

package/src/layout/components/lay-search/components/SearchModal.vue

@@ -96,10 +96,14 @@ watch(show, async val => {
 /** 将菜单树形结构扁平化为一维数组，用于菜单查询 */
 function flatTree(arr) {
   const res = [];
-  function deep(arr) {
+  function deep(arr, parentIcon?) {
     arr.forEach(item => {
-      res.push(item);
-      item.children && deep(item.children);
+      if (!item.children || item.children.length === 0) {
+        const menuItem = !item.meta?.icon && parentIcon ? { ...item, meta: { ...item.meta, icon: parentIcon } } : item;
+        res.push(menuItem);
+      } else {
+        deep(item.children, item.meta?.icon);
+      }
     });
   }
   deep(arr);

package/src/main.ts

@@ -2,7 +2,7 @@
  * @Author: levi7754 levi7754@163.com
  * @Date: 2025-07-25 13:38:20
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2026-04-16 10:12:13
+ * @LastEditTime: 2026-05-18 15:34:06
  * @FilePath: \udp-front\packages\udp-core\src\main.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -15,7 +15,7 @@ import { setConfig, setSystemEnv } from './config';
 import { useI18n, transformI18n } from '../src/plugins/i18n';
 import { setTableConfig } from '../src/plugins/vxe-table';
 import { injectResponsiveStorage } from './utils/storage';
-import hasAuthority from './utils/authority';
+import { hasAuthority, isViewonly } from './utils/authority';
 import { getServiceApi, getBaseURL, setRouter, setBaseUrl, getDebugBaseURL } from './api';
 
 import 'nprogress/nprogress.css';
@@ -26,30 +26,31 @@ import './style/reset.scss';
 // 导入公共样式
 import './style/index.scss';
 
-import {
-  UtLov2,
-  //   UtDivider,
-  // UtModalForm2
-  FormUpload2,
-  // UtForm2,
-  UtGrid2,
-  UtContent2,
-  UtStampBadge2,
-  // UtModalGrid2
-  UtUpload2
-  //   UtIconSelect,
-  //   UtCalendar
-  // uAttachment
-} from './components/udp';
+// import {
+// UtLov2,
+//   UtDivider,
+// UtModalForm2
+// FormUpload2,
+// UtForm2,
+// UtGrid2,
+// UtContent2,
+// UtStampBadge2,
+// UtModalGrid2
+// UtUpload2
+//   UtIconSelect,
+//   UtCalendar
+// uAttachment
+// } from './components/udp';
 
 const app = createApp(App);
 
 // 全局注册`@iconify/vue`图标库
 import { IconifyIconOffline, FontIcon } from './components/ReIcon';
+
 // 全局注册`vue-tippy`
+import VueTippy from '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' }
@@ -60,6 +61,7 @@ import * as directives from './directives';
 
 const setGlobal = app => {
   app.config.globalProperties.$hasAuthority = hasAuthority;
+  app.config.globalProperties.$isViewonly = isViewonly;
   app.config.globalProperties.$serviceApi = getServiceApi();
   app.config.globalProperties.$debuggerApi = getDebugBaseURL();
   app.config.globalProperties.$url = getBaseURL();
@@ -86,13 +88,13 @@ const init = ({ router, config, lang, views, env, tableConfig }) => {
     // app.component('uAttachment', uAttachment).component('UGrid', UGrid);
     //   .component('UtDivider', UtDivider)
     // app.component('UtModalForm2', UtModalForm2);
-    app.component('UtGrid2', UtGrid2);
-    app.component('UtUpload2', UtUpload2);
+    // app.component('UtGrid2', UtGrid2);
+    // app.component('UtUpload2', UtUpload2);
     // app.component('UtModalGrid2', UtModalGrid2);
     //   .component('UtIconSelect', UtIconSelect)
-    app.component('FormUpload2', FormUpload2).component('UtLov2', UtLov2);
-    app.component('UtContent2', UtContent2);
-    app.component('UtStampBadge2', UtStampBadge2);
+    // app.component('FormUpload2', FormUpload2).component('UtLov2', UtLov2);
+    // app.component('UtContent2', UtContent2);
+    // app.component('UtStampBadge2', UtStampBadge2);
     //   .component('UtModalGrid', UtModalGrid);
     // app.use(VueViewer, { defaultOptions: { zIndex: 9999 } });
     setGlobal(app);