@utogether/udp-core 1.0.1-beta.17 → 1.0.1-beta.18

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@utogether/udp-core",
   "private": false,
-  "version": "1.0.1-beta.17",
+  "version": "1.0.1-beta.18",
   "description": "",
   "type": "module",
   "main1": "index.ts",

package/src/components/udp/grid/index.vue

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2021-11-17 16:33:37
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-10-18 15:18:16
+ * @LastEditTime: 2025-10-29 17:55:12
  * @Description: file content
 -->
 <template>
@@ -17,6 +17,7 @@
       @cell-click="cellClick"
       @cell-dblclick="cellDbclick"
       @edit-activated="editEctivated"
+      @form-reset="onReset"
     />
     <!-- <SearchScheme
       v-if="showModal && props.url"
@@ -174,7 +175,7 @@ const data = reactive<VxeGridProps>({
     // 接收 Promise
     ajax: {
       queryAll: ({ form }) => queryAll(props, serviceApi, form),
-      query: ({ page, form }) => query(props, form, page, serviceApi, $mode),
+      query: ({ page, form, code }) => query(props, form, page, serviceApi, code, $mode),
       delete: ({ body: { removeRecords } }) => del(serviceApi, removeRecords, props),
       save: ({ body }) => Promise.all(save(serviceApi, body, props)),
       querySuccess: ({ response }) => callback('querySuccess', response),
@@ -316,6 +317,16 @@ const callback = (cb, response) => {
   attrs?.callback && attrs?.callback[cb] && attrs?.callback[cb](response);
 };
 
+const onReset = ({ data }) => {
+  console.log(data);
+  const items = props.items.filter(f => f.itemRender?.props?.multiple);
+  console.log(items);
+  items.forEach(item => {
+    data[`_${item.field}`] = [];
+  });
+  refreshData();
+};
+
 let sortable2: any;
 const columnDrop = () => {
   const $grid = xgrid.value;

package/src/components/udp/utils.ts

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2022-06-23 17:29:11
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-10-18 11:53:47
+ * @LastEditTime: 2025-10-29 18:04:53
  * @Description: file content
  */
 // @ts-nocheck
@@ -70,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])) {
@@ -80,7 +80,8 @@ 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);
-  let query = formatMultipleParams(params, props.items);
+
+  let query = formatMultipleParams(params, props.items, form);
   query = formatDateRange(query, props.items);
   const { url } = props;
   if (!url) return null;
@@ -140,12 +141,13 @@ export const save = (http, body, props) => {
  */
 const formatMultipleParams = (listQuery: any, items) => {
   const multipleItems = items.filter(f => f.itemRender?.props?.multiple || f.multiple);
+  debugger;
   if (isEmpty(multipleItems)) return listQuery;
   const query = clone(listQuery, true);
   multipleItems.forEach((element: any) => {
     if (element.itemRender.name === '#select') {
-      const data = query[`_${element.field}`] || query[`${element.field}`];
-      query[element.field] = !isString(data) ? data?.join(',') : data;
+      // const data = query[`_${element.field}`] || query[`${element.field}`];
+      // query[element.field] = !isString(data) ? data?.join(',') : data;
       delete query[`_${element.field}`];
     }
   });

package/src/layout/components/lay-sidebar/sidebar-logo.vue

@@ -1,92 +1,93 @@
-<!--
- * @Author: wei.li
- * @Date: 2021-11-17 16:02:30
- * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-04-17 17:15:15
- * @Description: file content
--->
-<script setup lang="ts">
-import { ref } from 'vue';
-import { storageLocal } from '@utogether/utils';
-import { kSYSCONFIG } from '../../../contant';
-import utogether from '../../../assets/images/utogether.png';
-
-const props = defineProps({
-  collapse: Boolean
-});
-
-const sysConfig = storageLocal.getItem(kSYSCONFIG) || {};
-
-const title = sysConfig['title'];
-const logo = ref(sysConfig['logo'] || utogether);
-// console.log(logo);
-</script>
-
-<template>
-  <div class="sidebar-logo-container" :class="{ collapses: props.collapse }">
-    <transition name="sidebarLogoFade">
-      <router-link v-if="props.collapse" key="props.collapse" :title="title" class="sidebar-logo-link" to="/">
-        <img :src="logo" class="ut-collapse-img ut-sidebar-logo" />
-      </router-link>
-      <router-link v-else key="expand" :title="title" class="sidebar-logo-link" to="/">
-        <img :src="logo" class="ut-sidebar-logo h-10" />
-        <span class="sidebar-title">{{ title }}</span>
-      </router-link>
-    </transition>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.sidebar-logo-container {
-  position: relative;
-  width: 100%;
-  height: 48px;
-  overflow: hidden;
-  text-align: center;
-  background-color: var(--udp-theme-sidebar-logo);
-
-  .sidebar-logo-link {
-    // margin-top: 5px;
-    display: flex;
-    flex-direction: column;
-    height: 100%;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-
-    .ut-sidebar-logo {
-      height: 100%;
-    }
-
-    .ut-collapse-img {
-      width: 100%;
-    }
-
-    .sidebar-title {
-      display: block;
-      // width: 140px;
-      // margin-top: 10px;
-      margin-left: 10px;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      font-family: Avenir, 'Helvetica Neue', Arial, Helvetica, sans-serif;
-      font-size: 24px;
-      font-weight: 600;
-      color: var(--udp-theme-project-text);
-      text-align: left;
-      white-space: nowrap;
-    }
-  }
-
-  .collapses {
-    .sidebar-logo {
-      margin-right: 0;
-    }
-  }
-
-  svg {
-    width: 50px;
-    height: 50px;
-  }
-}
-</style>
+<!--
+ * @Author: wei.li
+ * @Date: 2021-11-17 16:02:30
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-04-17 17:15:15
+ * @Description: file content
+-->
+<script setup lang="ts">
+import { ref } from 'vue';
+import { storageLocal } from '@utogether/utils';
+import { kSYSCONFIG } from '../../../contant';
+import utogether from '../../../assets/images/utogether.png';
+
+const props = defineProps({
+  collapse: Boolean
+});
+
+const sysConfig = storageLocal.getItem(kSYSCONFIG) || {};
+
+const title = sysConfig['title'];
+const logo = ref(sysConfig['logo'] || utogether);
+// console.log(logo);
+</script>
+
+<template>
+  <div class="sidebar-logo-container" :class="{ collapses: props.collapse }">
+    <transition name="sidebarLogoFade">
+      <router-link v-if="props.collapse" key="props.collapse" :title="title" class="sidebar-logo-link" to="/">
+        <img :src="logo" class="ut-collapse-img ut-sidebar-logo" />
+      </router-link>
+      <router-link v-else key="expand" :title="title" class="sidebar-logo-link" to="/">
+        <img :src="logo" class="ut-sidebar-logo h-10" />
+        <span class="sidebar-title">{{ title }}</span>
+      </router-link>
+    </transition>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.sidebar-logo-container {
+  position: relative;
+  width: 100%;
+  height: 48px;
+  overflow: hidden;
+  text-align: center;
+  background-color: var(--udp-theme-sidebar-logo);
+
+  .sidebar-logo-link {
+    // margin-top: 5px;
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+
+    .ut-sidebar-logo {
+      height: 100%;
+      max-width: 67%;
+    }
+
+    .ut-collapse-img {
+      width: 100%;
+    }
+
+    .sidebar-title {
+      display: block;
+      // width: 140px;
+      // margin-top: 10px;
+      margin-left: 10px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      font-family: Avenir, 'Helvetica Neue', Arial, Helvetica, sans-serif;
+      font-size: 24px;
+      font-weight: 600;
+      color: var(--udp-theme-project-text);
+      text-align: left;
+      white-space: nowrap;
+    }
+  }
+
+  .collapses {
+    .sidebar-logo {
+      margin-right: 0;
+    }
+  }
+
+  svg {
+    width: 50px;
+    height: 50px;
+  }
+}
+</style>

package/src/main.ts

@@ -32,23 +32,23 @@ import './style/index.scss';
 
 // import SuTable from './components/SuTable/SuTable.vue';
 
-// import {
-// UtButton,
-// utLov2,
-// UGrid,
-//   UtDivider,
-// UtModalForm2
-// FormUpload2,
-// UtForm2
-// UtGrid2
-// UtContent2,
-// UtStampBadge2
-// UtModalGrid2
-// UtUpload2
-//   UtIconSelect,
-//   UtCalendar
-// uAttachment
-// } from './components/udp';
+import {
+  // UtButton,
+  // utLov2,
+  // UGrid,
+  //   UtDivider,
+  // UtModalForm2
+  // FormUpload2,
+  // UtForm2
+  UtGrid2
+  // UtContent2,
+  // UtStampBadge2
+  // UtModalGrid2
+  // UtUpload2
+  //   UtIconSelect,
+  //   UtCalendar
+  // uAttachment
+} from './components/udp';
 
 const app = createApp(App);
 
@@ -93,7 +93,7 @@ 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('UtGrid2', UtGrid2);
     // app.component('UtForm2', UtForm2);
     // app.component('UtModalGrid2', UtModalGrid2);
     //   .component('UtIconSelect', UtIconSelect)

package/src/plugins/vxe-table/index.ts

@@ -1,116 +1,116 @@
-/*
- * @Author: levi7754 levi7754@163.com
- * @Date: 2024-06-05 14:32:03
- * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-09-17 18:45:35
- * @FilePath: /udp-front/packages/udp-core/src/plugins/vxe-table/index.ts
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
-import 'xe-utils';
-import { merge, toDateString, getWhatDay } from 'xe-utils';
-import { geti18n, transformI18n } from '../i18n/index';
-// import { storageLocal } from '@utogether/utils';
-import { VxetableRender } from '@utogether/utils';
-// import { VxetableRender } from './render';
-import { getServiceApi } from '../../api';
-
-import VXETable, { VxeUI } from 'vxe-table';
-// import './render.tsx';
-
-// const dict = storageLocal.getItem('kLov');
-VxetableRender(VXETable, { serviceApi: getServiceApi(), i18n: transformI18n });
-setCommands();
-
-// 全局默认参数
-const defaultConfig = {
-  // 对组件内置的提示语进行国际化翻译
-  // @ts-ignore
-  i18n: (key, args) => geti18n().global.t(key, args),
-  // 可选，对参数中的列头、校验提示..等进行自动翻译（只对支持国际化的有效）
-  translate(key) {
-    // 例如，只翻译 "message." 开头的键值
-    const NAMESPACED = ['message.', 'el.'];
-    if (key && NAMESPACED.findIndex(v => key.includes(v)) !== -1) {
-      return geti18n().global.t.call(geti18n().global.locale, key);
-    }
-    return key;
-  }
-};
-
-export function setTableConfig(config = {}) {
-  VXETable.setConfig(merge(defaultConfig, config));
-
-  VxeUI.interceptor.add('event.clearEdit', {
-    tableInterceptorMethod(params) {
-      const { $event } = params;
-      if ($event.target.className.indexOf('vxe-table--ignore-clear') > -1) return false;
-    }
-  });
-}
-
-export function setTheme(theme) {
-  // 切换为暗黑主题
-  VxeUI.setTheme(theme);
-}
-
-function setCommands() {
-  // 定义选中日期今天指令
-  VxeUI.commands.add('utTodyay', {
-    dateRangePickerCommandMethod({ $dateRangePicker }) {
-      const startDate = toDateString(new Date(), 'yyyy-MM-dd 00:00:00');
-      const endDate = toDateString(new Date(), 'yyyy-MM-dd 23:59:59');
-      $dateRangePicker.setModelValue(startDate, endDate);
-    }
-  });
-  // 定义选中日期昨天指令
-  VxeUI.commands.add('utYesterDay', {
-    dateRangePickerCommandMethod({ $dateRangePicker }) {
-      const startDate = toDateString(getWhatDay(new Date(), -1), 'yyyy-MM-dd 00:00:00');
-      const endDate = toDateString(getWhatDay(new Date(), -1), 'yyyy-MM-dd 23:59:59');
-      $dateRangePicker.setModelValue(startDate, endDate);
-    }
-  });
-  // 定义选中日期最近一周指令
-  VxeUI.commands.add('utRecentWeek', {
-    dateRangePickerCommandMethod({ $dateRangePicker }) {
-      const startDate = toDateString(getWhatDay(new Date(), -7), 'yyyy-MM-dd 00:00:00');
-      const endDate = toDateString(new Date(), 'yyyy-MM-dd 23:59:59');
-      $dateRangePicker.setModelValue(startDate, endDate);
-    }
-  });
-
-  // 定义选中日期最近一个月指令
-  VxeUI.commands.add('utRecentMonth', {
-    dateRangePickerCommandMethod({ $dateRangePicker }) {
-      const startDate = toDateString(getWhatDay(new Date(), -30), 'yyyy-MM-dd 00:00:00');
-      const endDate = toDateString(new Date(), 'yyyy-MM-dd 23:59:59');
-      $dateRangePicker.setModelValue(startDate, endDate);
-    }
-  });
-
-  // 定义选中日期最近三个月指令
-  VxeUI.commands.add('utRecentThreeMonth', {
-    dateRangePickerCommandMethod({ $dateRangePicker }) {
-      const startDate = toDateString(getWhatDay(new Date(), -90), 'yyyy-MM-dd 00:00:00');
-      const endDate = toDateString(new Date(), 'yyyy-MM-dd 23:59:59');
-      $dateRangePicker.setModelValue(startDate, endDate);
-    }
-  });
-
-  // 定义选中日期最近半年指令
-  VxeUI.commands.add('utRecentHalfYear', {
-    dateRangePickerCommandMethod({ $dateRangePicker }) {
-      const startDate = toDateString(getWhatDay(new Date(), -180), 'yyyy-MM-dd 00:00:00');
-      const endDate = toDateString(new Date(), 'yyyy-MM-dd 23:59:59');
-      $dateRangePicker.setModelValue(startDate, endDate);
-    }
-  });
-  // 定义选中日期最近半年指令
-  VxeUI.commands.add('utRecentYear', {
-    dateRangePickerCommandMethod({ $dateRangePicker }) {
-      const startDate = toDateString(getWhatDay(new Date(), -365), 'yyyy-MM-dd 00:00:00');
-      const endDate = toDateString(new Date(), 'yyyy-MM-dd 23:59:59');
-      $dateRangePicker.setModelValue(startDate, endDate);
-    }
-  });
-}
+/*
+ * @Author: levi7754 levi7754@163.com
+ * @Date: 2024-06-05 14:32:03
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-10-29 16:32:37
+ * @FilePath: /udp-front/packages/udp-core/src/plugins/vxe-table/index.ts
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+import 'xe-utils';
+import { merge, toDateString, getWhatDay } from 'xe-utils';
+import { geti18n, transformI18n } from '../i18n/index';
+// import { storageLocal } from '@utogether/utils';
+// import { VxetableRender } from '@utogether/utils';
+import { VxetableRender } from './render';
+import { getServiceApi } from '../../api';
+
+import VXETable, { VxeUI } from 'vxe-table';
+// import './render.tsx';
+
+// const dict = storageLocal.getItem('kLov');
+VxetableRender(VXETable, { serviceApi: getServiceApi(), i18n: transformI18n });
+setCommands();
+
+// 全局默认参数
+const defaultConfig = {
+  // 对组件内置的提示语进行国际化翻译
+  // @ts-ignore
+  i18n: (key, args) => geti18n().global.t(key, args),
+  // 可选，对参数中的列头、校验提示..等进行自动翻译（只对支持国际化的有效）
+  translate(key) {
+    // 例如，只翻译 "message." 开头的键值
+    const NAMESPACED = ['message.', 'el.'];
+    if (key && NAMESPACED.findIndex(v => key.includes(v)) !== -1) {
+      return geti18n().global.t.call(geti18n().global.locale, key);
+    }
+    return key;
+  }
+};
+
+export function setTableConfig(config = {}) {
+  VXETable.setConfig(merge(defaultConfig, config));
+
+  VxeUI.interceptor.add('event.clearEdit', {
+    tableInterceptorMethod(params) {
+      const { $event } = params;
+      if ($event.target.className.indexOf('vxe-table--ignore-clear') > -1) return false;
+    }
+  });
+}
+
+export function setTheme(theme) {
+  // 切换为暗黑主题
+  VxeUI.setTheme(theme);
+}
+
+function setCommands() {
+  // 定义选中日期今天指令
+  VxeUI.commands.add('utTodyay', {
+    dateRangePickerCommandMethod({ $dateRangePicker }) {
+      const startDate = toDateString(new Date(), 'yyyy-MM-dd 00:00:00');
+      const endDate = toDateString(new Date(), 'yyyy-MM-dd 23:59:59');
+      $dateRangePicker.setModelValue(startDate, endDate);
+    }
+  });
+  // 定义选中日期昨天指令
+  VxeUI.commands.add('utYesterDay', {
+    dateRangePickerCommandMethod({ $dateRangePicker }) {
+      const startDate = toDateString(getWhatDay(new Date(), -1), 'yyyy-MM-dd 00:00:00');
+      const endDate = toDateString(getWhatDay(new Date(), -1), 'yyyy-MM-dd 23:59:59');
+      $dateRangePicker.setModelValue(startDate, endDate);
+    }
+  });
+  // 定义选中日期最近一周指令
+  VxeUI.commands.add('utRecentWeek', {
+    dateRangePickerCommandMethod({ $dateRangePicker }) {
+      const startDate = toDateString(getWhatDay(new Date(), -7), 'yyyy-MM-dd 00:00:00');
+      const endDate = toDateString(new Date(), 'yyyy-MM-dd 23:59:59');
+      $dateRangePicker.setModelValue(startDate, endDate);
+    }
+  });
+
+  // 定义选中日期最近一个月指令
+  VxeUI.commands.add('utRecentMonth', {
+    dateRangePickerCommandMethod({ $dateRangePicker }) {
+      const startDate = toDateString(getWhatDay(new Date(), -30), 'yyyy-MM-dd 00:00:00');
+      const endDate = toDateString(new Date(), 'yyyy-MM-dd 23:59:59');
+      $dateRangePicker.setModelValue(startDate, endDate);
+    }
+  });
+
+  // 定义选中日期最近三个月指令
+  VxeUI.commands.add('utRecentThreeMonth', {
+    dateRangePickerCommandMethod({ $dateRangePicker }) {
+      const startDate = toDateString(getWhatDay(new Date(), -90), 'yyyy-MM-dd 00:00:00');
+      const endDate = toDateString(new Date(), 'yyyy-MM-dd 23:59:59');
+      $dateRangePicker.setModelValue(startDate, endDate);
+    }
+  });
+
+  // 定义选中日期最近半年指令
+  VxeUI.commands.add('utRecentHalfYear', {
+    dateRangePickerCommandMethod({ $dateRangePicker }) {
+      const startDate = toDateString(getWhatDay(new Date(), -180), 'yyyy-MM-dd 00:00:00');
+      const endDate = toDateString(new Date(), 'yyyy-MM-dd 23:59:59');
+      $dateRangePicker.setModelValue(startDate, endDate);
+    }
+  });
+  // 定义选中日期最近半年指令
+  VxeUI.commands.add('utRecentYear', {
+    dateRangePickerCommandMethod({ $dateRangePicker }) {
+      const startDate = toDateString(getWhatDay(new Date(), -365), 'yyyy-MM-dd 00:00:00');
+      const endDate = toDateString(new Date(), 'yyyy-MM-dd 23:59:59');
+      $dateRangePicker.setModelValue(startDate, endDate);
+    }
+  });
+}