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

package/src/components/udp/utils.ts

@@ -1,26 +1,24 @@
 /*
- * @Author: levi7754 levi7754@163.com
- * @Date: 2025-07-14 17:38:38
+ * @Author: wei.li
+ * @Date: 2022-06-23 17:29:11
  * @LastEditors: levi7754 levi7754@163.com
- * @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
+ * @LastEditTime: 2025-12-02 18:32:18
+ * @Description: file content
  */
-import { clone, isString, isEmpty, toDateString, isObject, isFunction, merge } from 'xe-utils';
-import { cookies, storageLocal, useRender } from '@utogether/utils';
+// @ts-nocheck
+
+import { clone, isString, orderBy, isEmpty, toDateString, isObject, isFunction } from 'xe-utils';
+import { cookies, storageLocal } from '@utogether/utils';
 /** 系统配置的key */
 const kSYSCONFIG = 'kSysConfig';
 const kCOOKIES = 'kCookies_param';
 
 const sysConfig = storageLocal.getItem(kSYSCONFIG);
 
-const renderHook = useRender();
-
 /** 工具栏按钮标准化 */
 export const formatButton = (buttons, auth?) => {
   buttons.forEach(btn => {
     btn.auth = auth ? auth[btn.code] || btn.auth : btn.auth;
-    debugger;
     if (!btn.name) {
       btn.name = `message.btn.${btn.code}`;
     } else if (sysConfig?.i18nEnabled === 'Y' && !btn.name.startsWith('message.')) {
@@ -44,7 +42,8 @@ export const queryAll = (props, http, form) => {
   const params = { pageNum: 1, pageSize: 100000 };
   const commonParam = getCookieParam();
   Object.assign(params, form, commonParam, props.defaultParams || {});
-  const query = formatDateRange(params, props.items);
+  let query = formatMultipleParams(params, props.items);
+  query = formatDateRange(query, props.items);
 
   const { url } = props;
   if (!url) return null;
@@ -71,7 +70,7 @@ export const queryAll = (props, http, form) => {
  * @param isDoc doc文档
  * @returns Promise
  */
-export const query = (props, form, page, http, isDoc) => {
+export const query = (props, form, page, http, code, isDoc) => {
   if (isDoc) return getDocData();
   for (const key in form) {
     if (form[key] && isString(form[key])) {
@@ -81,9 +80,10 @@ export const query = (props, form, page, http, isDoc) => {
   const params = { pageNum: page.currentPage, pageSize: page.pageSize };
   const commonParam = getCookieParam();
   Object.assign(params, commonParam, props.defaultParams || {}, form);
-  const query = formatDateRange(params, props.items);
+
+  let query = formatMultipleParams(params, props.items);
+  query = formatDateRange(query, props.items);
   const { url } = props;
-  console.log(query);
   if (!url) return null;
   const requestURL = isString(url) ? url : url.fetch || url.restful;
   const method = url.fetch ? 'post' : 'get';
@@ -133,28 +133,46 @@ export const save = (http, body, props) => {
   return allService;
 };
 
+/**
+ * 多选数据优化
+ * @param listQuery
+ * @param items
+ * @returns
+ */
+const formatMultipleParams = (listQuery: any, items) => {
+  const multipleItems = items.filter(f => f.itemRender?.props?.multiple || f.multiple);
+  if (isEmpty(multipleItems)) return listQuery;
+  const query = clone(listQuery, true);
+  multipleItems.forEach((element: any) => {
+    if (element.itemRender.name === '#select' && element.itemRender.props.multiple) {
+      if (query[`_${element.field}`]?.length === 0) {
+        // 重置后
+        query[`${element.field}`] = null;
+      }
+      delete listQuery[`_${element.field}`];
+      delete query[`_${element.field}`];
+    }
+  });
+  return query;
+};
+
 const startFormatter = 'yyyy-MM-dd 00:00:00';
 const endFormatter = 'yyyy-MM-dd 23:59:59';
+// 时间范围优化
 const formatDateRange = (listQuery: any, items) => {
-  const dateRanges = items.filter(
-    f => f.itemRender?.name === '#SuDateRange' || f.itemRender?.props?.multiple || f.multiple
-  );
+  const dateRanges = items.filter(f => ['#SuDateRange', 'VxeDateRangePicker'].includes(f.itemRender?.name));
   if (isEmpty(dateRanges)) return listQuery;
   const query = clone(listQuery, true);
   dateRanges.forEach((element: any) => {
-    if (element.multiple || element.itemRender?.props?.multiple) {
-      query[element.field] = query[element.field]?.join(',');
-    } else {
-      const val = query[element.field];
-      if (val && element.toField) {
-        query[element.fromField] = toDateString(val[0], startFormatter);
-        query[element.toField] = toDateString(val[1], endFormatter);
-      } else if (val) {
-        query[`${element.field}From`] = toDateString(val[0], startFormatter);
-        query[`${element.field}To`] = toDateString(val[1], endFormatter);
-      }
-      delete query[element.field];
+    const val = query[element.field];
+    if (val && element.itemRender.startField) {
+      query[element.itemRender.startField] = toDateString(query[element.itemRender.startField], startFormatter);
+      query[element.itemRender.endField] = toDateString(query[element.itemRender.endField], endFormatter);
+    } else if (val) {
+      query[`${element.field}From`] = toDateString(val[0], startFormatter);
+      query[`${element.field}To`] = toDateString(val[1], endFormatter);
     }
+    delete query[element.field];
   });
   return query;
 };
@@ -170,19 +188,22 @@ export const inlineButtons = [
     name: 'add',
     status: 'u-cyan',
     icon: 'vxe-icon-add',
-    auth: 'add'
+    auth: 'add',
+    sort: 1
   },
   {
     code: 'delete',
     status: 'danger',
     icon: 'vxe-icon-delete',
-    auth: 'del'
+    auth: 'del',
+    sort: 2
   },
   {
     code: 'save',
     status: 'primary',
     icon: 'vxe-icon-save',
-    auth: 'edit'
+    auth: 'edit',
+    sort: 3
   }
 ];
 // form 模式按钮
@@ -191,13 +212,15 @@ export const dialogButtons = [
     code: 'add',
     status: 'u-cyan',
     icon: 'vxe-icon-add',
-    auth: 'add'
+    auth: 'add',
+    sort: 1
   },
   {
-    code: 'delete',
+    code: 'del',
     status: 'danger',
     icon: 'vxe-icon-delete',
-    auth: 'del'
+    auth: 'del',
+    sort: 2
   }
 ];
 
@@ -228,10 +251,8 @@ export const getExportConfig = attrs => {
 export const getToolBarConfig = (data, props, attrs, hasAuthority) => {
   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;
@@ -255,13 +276,17 @@ export const getToolBarConfig = (data, props, attrs, hasAuthority) => {
   // 先设置传入的按钮
   let buttons = clone(attrs.buttons || [], true);
 
+  buttons.forEach((button, idx) => {
+    button.sort = button.sort || idx + 10;
+  });
+
   // 获取默认的按钮
   const toolButtons = attrs.mode !== 'form' ? clone(inlineButtons, true) : clone(dialogButtons, true);
   // 判断传入的按钮是否有默认按钮的auth,有就不加入按钮组中,相当于重写了默认的按钮
   // reverse的原因是: 保持现有按钮顺序， 新增，保存，删除
   toolButtons.reverse().forEach(btn => {
     !buttons.some(s => s.code === btn.code) && buttons.unshift(btn);
-    if (attrs.authPrefix && !['print', 'export'].includes(btn.auth)) {
+    if (attrs.authPrefix && !['printer', 'export'].includes(btn.auth)) {
       btn.auth = attrs.authPrefix + btn.auth.slice(0, 1).toLocaleUpperCase() + btn.auth.slice(1).toLocaleLowerCase();
     }
   });
@@ -284,11 +309,12 @@ export const getToolBarConfig = (data, props, attrs, hasAuthority) => {
     exportBtn = { icon: 'ri-download-2-line', code: 'export' };
   }
   data.toolbarConfig = {
-    buttons,
+    buttons: orderBy(buttons, 'sort'),
     enabled: true,
     refreshOptions,
-    custom: !!attrs.gridId,
+    customOptions: attrs.gridId ? {} : null,
     exportOptions: exportBtn,
+    custom: !!attrs.gridId,
     export: hasExport,
     refresh: true,
     perfect: true
@@ -380,68 +406,3 @@ export const getAttrs = attrs => {
   });
   return data;
 };
-
-export const formatItems = (items, status, span = 24) => {
-  if (!items.length) return items;
-  return items.map(item => {
-    if (item.children?.length) {
-      item.children = formatItems(item.children, status, span);
-      return item;
-    } else {
-      item.title = item.title || `message.${item.field}`;
-      item.span = item.span || span;
-      if (item.type === 'collapseNode') {
-        // 折叠项目，title和宽度不需要
-        item.title = '';
-        item.titleWidth = 0;
-      }
-      let disabled = false;
-      if (status === 'detail') {
-        disabled = true;
-        item.placeholder = null;
-      } else {
-        disabled = item.disabled === false ? item.disabled : item.disabled || item.itemRender?.props?.disabled;
-      }
-      let itemRender = {
-        name: 'VxeInput',
-        props: { disabled, placeholder: disabled ? '' : item.placeholder }
-      };
-      if (item.code && !item.itemRender) {
-        itemRender = renderHook.renderDict(item.code);
-      }
-      item.itemRender = item.itemRender || itemRender;
-      item.itemRender['props'] = Object.assign(item.itemRender.props || {}, {
-        disabled
-      });
-      return item;
-    }
-  });
-};
-
-/**
- * @description: 标准化必填数据
- * @param {*} records 数据列表
- * @param {*} t i18n对象
- * @return {*} rule数据
- */
-export const formatRules = (records, t) => {
-  const rule = {};
-  records.forEach(item => {
-    if (item.children?.length) {
-      const subRuls = formatRules(item.children, t);
-      merge(rule, subRuls);
-    } else {
-      if (item.required) {
-        const { field, title } = item;
-        const i18n = title?.startsWith('message.');
-        rule[field] = [
-          {
-            required: true,
-            message: `${t('message.required')}${title && i18n ? t(title) : title || t(`message.${field}`)}`
-          }
-        ];
-      }
-    }
-  });
-  return rule;
-};

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

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2021-11-17 16:02:30
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-04-16 16:20:09
+ * @LastEditTime: 2025-08-29 08:57:37
  * @Description: file content
 -->
 <template>
@@ -20,16 +20,14 @@
 
     <div v-if="layout === 'vertical'" class="vertical-header-right">
       <!-- 业务单元选择 -->
-      <OrgSelect />
+      <OrgSelect v-if="sysConfig['orgTaggle'] === 'Y'" />
       <!-- 菜单搜索 -->
       <Search />
       <!-- 通知 -->
       <!-- <Notice id="header-notice" /> -->
       <!-- 国际化 -->
       <el-dropdown id="header-translation" trigge·r="click">
-        <globalization
-          class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-hidden"
-        />
+        <globalization class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-hidden" />
         <template #dropdown>
           <el-dropdown-menu class="translation">
             <el-dropdown-item
@@ -98,7 +96,7 @@ export default { name: 'NavBar' };
 </script>
 <script setup lang="ts">
 import { ref } from 'vue';
-// import { useRouter } from 'vue-router';
+import { storageLocal } from '@utogether/utils';
 import Hamburger from '../lay-sidebar/hamBurger.vue';
 import Breadcrumb from '../lay-sidebar/breadCrumb.vue';
 // import Notice from './lay-notice/index.vue';
@@ -109,6 +107,7 @@ import OrgSelect from '../lay-select-org/index.vue';
 import { useTranslationLang } from '../../hooks/useTranslationLang';
 import globalization from '../../../assets/svg/globalization.svg?component';
 import avatars from '../../../assets/images/avatars.jpg';
+import { kSYSCONFIG } from '../../../contant';
 
 // const router = useRouter();
 // const route = useRoute();
@@ -131,6 +130,9 @@ const {
 const { locale, translationCh, translationEn } = useTranslationLang();
 
 const record: IRecord = {};
+
+const sysConfig = storageLocal.getItem(kSYSCONFIG) || {};
+
 /**
  * @description: 重置密码
  */

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

@@ -1,150 +1,150 @@
-<!--
- * @Author: wei.li
- * @Date: 2021-12-23 17:33:20
- * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-07-31 10:15:40
- * @Description: 个性化设置页面
--->
-<script setup lang="ts">
-import { ref, computed, onMounted, onBeforeUnmount } from 'vue';
-import { useDataThemeChange } from '../../hooks/useDataThemeChange';
-import { onClickOutside } from '@vueuse/core';
-import { emitter } from '../../../utils/mitt';
-
-const target = ref(null);
-const show = ref<Boolean>(false);
-
-const iconClass = computed(() => {
-  return [
-    'w-[22px]',
-    'h-[22px]',
-    'flex',
-    'justify-center',
-    'items-center',
-    'outline-hidden',
-    'rounded-[4px]',
-    'cursor-pointer',
-    'transition-colors',
-    'hover:bg-[#0000000f]',
-    'dark:hover:bg-[#ffffff1f]',
-    'dark:hover:text-[#ffffffd9]'
-  ];
-});
-
-const { onReset } = useDataThemeChange();
-onClickOutside(target, (event: any) => {
-  if (event.clientX > target.value.offsetLeft) return;
-  show.value = false;
-});
-
-onMounted(() => {
-  emitter.on('openPanel', () => {
-    show.value = true;
-  });
-});
-
-onBeforeUnmount(() => {
-  // 解绑`openPanel`公共事件，防止多次触发
-  emitter.off('openPanel');
-});
-</script>
-
-<template>
-  <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)]"
-      >
-        <h4 class="dark:text-white">{{ $t('message.tip.projectConfig') }}</h4>
-        <span
-          v-tippy="{
-            content: $t('message.tip.closeConfig'),
-            placement: 'bottom-start',
-            zIndex: 41000
-          }"
-          :class="iconClass"
-        >
-          <IconifyIconOffline
-            class="dark:text-white"
-            width="18px"
-            height="18px"
-            icon="ri:close-line"
-            @click="show = !show"
-          />
-        </span>
-      </div>
-      <el-scrollbar>
-        <slot />
-      </el-scrollbar>
-
-      <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'),
-            placement: 'left-start',
-            zIndex: 41000
-          }"
-          type="danger"
-          text
-          bg
-          @click="onReset"
-        >
-          {{ $t('message.tip.clearCache') }}
-        </el-button>
-      </div>
-    </div>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-scrollbar) {
-  height: calc(100vh - 110px);
-}
-
-.right-panel-background {
-  position: fixed;
-  top: 0;
-  left: 0;
-  z-index: -1;
-  background: rgb(0 0 0 / 20%);
-  opacity: 0;
-  transition: opacity 0.3s cubic-bezier(0.7, 0.3, 0.1, 1);
-}
-
-.right-panel {
-  position: fixed;
-  top: 0;
-  right: 0;
-  z-index: 400000;
-  width: 100%;
-  max-width: 300px;
-  box-shadow: 0 0 15px 0 rgb(0 0 0 / 5%);
-  transform: translate(100%);
-  transition: all 0.25s cubic-bezier(0.7, 0.3, 0.1, 1);
-}
-
-.show {
-  transition: all 0.3s cubic-bezier(0.7, 0.3, 0.1, 1);
-
-  .right-panel-background {
-    z-index: 20000;
-    width: 100%;
-    height: 100%;
-    opacity: 1;
-  }
-
-  .right-panel {
-    transform: translate(0);
-  }
-}
-
-.project-configuration {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 14px 20px;
-}
-</style>
+<!--
+ * @Author: wei.li
+ * @Date: 2021-12-23 17:33:20
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-07-31 10:15:40
+ * @Description: 个性化设置页面
+-->
+<script setup lang="ts">
+import { ref, computed, onMounted, onBeforeUnmount } from 'vue';
+import { useDataThemeChange } from '../../hooks/useDataThemeChange';
+import { onClickOutside } from '@vueuse/core';
+import { emitter } from '../../../utils/mitt';
+
+const target = ref(null);
+const show = ref<Boolean>(false);
+
+const iconClass = computed(() => {
+  return [
+    'w-[22px]',
+    'h-[22px]',
+    'flex',
+    'justify-center',
+    'items-center',
+    'outline-hidden',
+    'rounded-[4px]',
+    'cursor-pointer',
+    'transition-colors',
+    'hover:bg-[#0000000f]',
+    'dark:hover:bg-[#ffffff1f]',
+    'dark:hover:text-[#ffffffd9]'
+  ];
+});
+
+const { onReset } = useDataThemeChange();
+onClickOutside(target, (event: any) => {
+  if (event.clientX > target.value.offsetLeft) return;
+  show.value = false;
+});
+
+onMounted(() => {
+  emitter.on('openPanel', () => {
+    show.value = true;
+  });
+});
+
+onBeforeUnmount(() => {
+  // 解绑`openPanel`公共事件，防止多次触发
+  emitter.off('openPanel');
+});
+</script>
+
+<template>
+  <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)]"
+      >
+        <h4 class="dark:text-white">{{ $t('message.tip.projectConfig') }}</h4>
+        <span
+          v-tippy="{
+            content: $t('message.tip.closeConfig'),
+            placement: 'bottom-start',
+            zIndex: 41000
+          }"
+          :class="iconClass"
+        >
+          <IconifyIconOffline
+            class="dark:text-white"
+            width="18px"
+            height="18px"
+            icon="ri:close-line"
+            @click="show = !show"
+          />
+        </span>
+      </div>
+      <el-scrollbar>
+        <slot />
+      </el-scrollbar>
+
+      <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'),
+            placement: 'left-start',
+            zIndex: 41000
+          }"
+          type="danger"
+          text
+          bg
+          @click="onReset"
+        >
+          {{ $t('message.tip.clearCache') }}
+        </el-button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-scrollbar) {
+  height: calc(100vh - 110px);
+}
+
+.right-panel-background {
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: -1;
+  background: rgb(0 0 0 / 20%);
+  opacity: 0;
+  transition: opacity 0.3s cubic-bezier(0.7, 0.3, 0.1, 1);
+}
+
+.right-panel {
+  position: fixed;
+  top: 0;
+  right: 0;
+  z-index: 400000;
+  width: 100%;
+  max-width: 300px;
+  box-shadow: 0 0 15px 0 rgb(0 0 0 / 5%);
+  transform: translate(100%);
+  transition: all 0.25s cubic-bezier(0.7, 0.3, 0.1, 1);
+}
+
+.show {
+  transition: all 0.3s cubic-bezier(0.7, 0.3, 0.1, 1);
+
+  .right-panel-background {
+    z-index: 20000;
+    width: 100%;
+    height: 100%;
+    opacity: 1;
+  }
+
+  .right-panel {
+    transform: translate(0);
+  }
+}
+
+.project-configuration {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 14px 20px;
+}
+</style>