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

package/src/utils/authority/index.ts

@@ -1,46 +1,46 @@
-/*
- * @Author: wei.li
- * @Date: 2021-11-17 16:26:34
- * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2026-07-01 13:55:44
- * @Description: file content
- */
-import { usePermissionStoreHook } from '../../store/modules/permission';
-import { isArray } from 'xe-utils';
-import { router } from '../../router';
-export const hasAuthority = auth => {
-  if (!auth) return true;
-  const permissionCode = router.currentRoute.value.meta?.permissionCode;
-  if (!permissionCode) return true;
-  if (!isArray(auth)) {
-    auth = [auth];
-  }
-  const buttonAuth = usePermissionStoreHook().getButtonAuth;
-  if (!buttonAuth) return true;
-  let hasAuth = false;
-  auth.forEach(item => {
-    if (!hasAuth) {
-      const authRoles = `${permissionCode}.${item}`;
-      hasAuth = buttonAuth.includes(authRoles);
-    }
-  });
-  return hasAuth;
-};
-/**
- * @description: 只能查看权限
- * @param {*} queryAuth 查询权限
- * @param {*} editAuth 编辑权限
- * @return {*} 是否仅有查询权限
- */
-export const isViewonly = (queryAuth = 'fetch', editAuth = 'edit') => {
-  if (!queryAuth) return true;
-  const permissionCode = router.currentRoute.value.meta?.permissionCode;
-  if (!permissionCode) return true;
-  const buttonAuth = usePermissionStoreHook().getButtonAuth;
-  if (!buttonAuth) return true;
-
-  const fetchAuth = `${permissionCode}.${queryAuth}`;
-  const hasAuth = buttonAuth.includes(fetchAuth) && !buttonAuth.includes(`${permissionCode}.${editAuth}`);
-  return hasAuth;
-};
-export default hasAuthority;
+/*
+ * @Author: wei.li
+ * @Date: 2021-11-17 16:26:34
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2026-07-01 13:55:44
+ * @Description: file content
+ */
+import { usePermissionStoreHook } from '../../store/modules/permission';
+import { isArray } from 'xe-utils';
+import { router } from '../../router';
+export const hasAuthority = auth => {
+  if (!auth) return true;
+  const permissionCode = router.currentRoute.value.meta?.permissionCode;
+  if (!permissionCode) return true;
+  if (!isArray(auth)) {
+    auth = [auth];
+  }
+  const buttonAuth = usePermissionStoreHook().getButtonAuth;
+  if (!buttonAuth) return true;
+  let hasAuth = false;
+  auth.forEach(item => {
+    if (!hasAuth) {
+      const authRoles = `${permissionCode}.${item}`;
+      hasAuth = buttonAuth.includes(authRoles);
+    }
+  });
+  return hasAuth;
+};
+/**
+ * @description: 只能查看权限
+ * @param {*} queryAuth 查询权限
+ * @param {*} editAuth 编辑权限
+ * @return {*} 是否仅有查询权限
+ */
+export const isViewonly = (queryAuth = 'fetch', editAuth = 'edit') => {
+  if (!queryAuth) return true;
+  const permissionCode = router.currentRoute.value.meta?.permissionCode;
+  if (!permissionCode) return true;
+  const buttonAuth = usePermissionStoreHook().getButtonAuth;
+  if (!buttonAuth) return true;
+
+  const fetchAuth = `${permissionCode}.${queryAuth}`;
+  const hasAuth = buttonAuth.includes(fetchAuth) && !buttonAuth.includes(`${permissionCode}.${editAuth}`);
+  return hasAuth;
+};
+export default hasAuthority;

package/src/utils/dataFormat/index.ts

@@ -1,222 +1,309 @@
-/*
- * @Author: wei.li
- * @Date: 2022-06-23 17:29:11
- * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-12-04 13:34:40
- * @Description: file content
- */
-
-import { clone, isArray, isString, isEmpty, toDateString } from 'xe-utils';
-import { useRender } from '@utogether/utils';
-
-const renderHook = useRender();
-
-export const rulesFormat = (records, rule, t) => {
-  records
-    .filter(colunm => colunm.required)
-    .forEach(colunm => {
-      const { field, title } = colunm;
-      rule[field] = [
-        {
-          required: true,
-          message: `${t('message.required')}${title ? t(title) : t(`message.${field}`)}`
-        }
-      ];
-    });
-  return rule;
-};
-
-export const columnFormat = columns => {
-  return columns.map(m => {
-    if (m.type) return m;
-    m.title = m.title || `message.${m.field}`;
-    return m;
-  });
-};
-
-const searchBtn: IFormItemProps = {
-  span: 6,
-  align: 'right',
-  collapseNode: false,
-  itemRender: {
-    name: 'VxeButtonGroup',
-    options: [
-      {
-        type: 'submit',
-        submit: 'submit',
-        content: 'message.btn.search',
-        status: 'primary',
-        icon: 'ri-search-line'
-      },
-      {
-        type: 'reset',
-        name: 'reset',
-        content: 'message.btn.reset',
-        status: 'info',
-        icon: 'ri-refresh-line'
-      }
-    ],
-    events: null
-  }
-};
-
-export const formatGridItems = (records, favorite) => {
-  const formItems = records.filter(f => f.visible !== false);
-  const len = formItems.length;
-  // 前3个存在时间范围 或者 存在span = 12
-  const isDateRange = len > 2 && formItems.some((f, idx) => idx < 3 && (f.span > 6 || getDateRange(f)));
-  // 需要展示折叠按钮
-  const isCollapse = isDateRange || len > 3;
-  const defaultCollapse = { collapseTags: true, collapseTagsTooltip: true, multiple: true };
-  const items = formItems.map((item, idx) => {
-    item.folding = isDateRange ? isCollapse && idx > 1 : isCollapse && idx > 2;
-    item.span = getDateRange(item) ? 12 : item.span || 6;
-    if (item.code && !item.itemRender) {
-      item.itemRender = renderHook.renderDict(item.code);
-    }
-    item.itemRender = item.itemRender || { name: '$input' };
-    item.title = item.title || `message.${item.field}`;
-    if (item.multiple || item.itemRender?.props?.multiple) {
-      item.itemRender.props = Object.assign(defaultCollapse, item.itemRender?.props || {});
-    }
-    return item;
-  });
-  const btn = clone(searchBtn, true);
-  btn.collapseNode = isCollapse;
-  favorite && btn.itemRender.options.length < 3 && btn.itemRender.options.push(favorite);
-
-  if (isCollapse) {
-    // 按钮设置为	折叠节点
-    // 折叠时将搜索按钮插入到第一列的最后
-    const idx = isDateRange ? 2 : 3;
-    items.splice(idx, 0, btn);
-  } else {
-    items.push(btn);
-  }
-  return items;
-};
-
-const getDateRange = item => {
-  if (item.itemRender?.name === '#SuDateRange') {
-    return item.itemRender?.props?.type === 'daterange' || !item.itemRender?.props?.type;
-  }
-  return false;
-};
-export const formatButton = (buttons, auth?) => {
-  buttons.forEach(btn => {
-    btn.auth = auth ? auth[btn.code] || btn.auth : btn.auth;
-    if (!btn.name) {
-      btn.name = `message.${btn.name || btn.code}`;
-    } else if (!btn.name.includes('message.')) {
-      btn.name = `message.${btn.name}`;
-    }
-  });
-  return buttons;
-};
-
-export const queryAll = (props, http, form, fetchParam) => {
-  const params = { pageNum: 1, pageSize: 100000 };
-  Object.assign(params, form, fetchParam || {});
-  const query = formatDateRange(params, props.formItems);
-  const ajax = props.version === 'v2' ? http.get : http.post;
-  return new Promise((resolve, reject) => {
-    ajax(props.serviceCode.fetch, query)
-      .then((response: IResponseData) => {
-        resolve(response.list);
-      })
-      .catch((e: any) => {
-        reject(e);
-      });
-  });
-};
-
-/** 查询服务 */
-export const query = (props, form, page, http, fetchParam) => {
-  for (const i in form) {
-    if (form[i] && isString(form[i])) {
-      form[i] = form[i].trim();
-    }
-  }
-  const params = {
-    pageNum: page.currentPage,
-    pageSize: page.pageSize
-  };
-  Object.assign(params, form, fetchParam || {});
-  const query = formatDateRange(params, props.formItems);
-  const {
-    version,
-    serviceCode: { fetch }
-  } = props;
-  if (!fetch) return null;
-  if (version === 'v2') {
-    return http.get(fetch, query);
-  }
-  return http.post(fetch, query);
-};
-/** 删除服务 */
-export const del = (http, removeRecords, props) => {
-  const { serviceCode, version, isSingleSubmit } = props;
-  const { del } = serviceCode;
-  if (!del) return null;
-  if (version === 'v2') {
-    return http.delete(del, !isSingleSubmit ? removeRecords : removeRecords[0]);
-  }
-  return http.post(del, !isSingleSubmit ? removeRecords : removeRecords[0]);
-};
-/** 更新服务 */
-export const save = (http, body, props, confirmParam) => {
-  const allService = [];
-  const { serviceCode, isSingleSubmit, version, multiField } = props;
-  const { add, update } = serviceCode;
-  const { insertRecords, updateRecords } = body;
-
-  if (!isEmpty(insertRecords) && add) {
-    insertRecords.forEach(m => {
-      !isEmpty(confirmParam) && Object.assign(m, confirmParam);
-      m = !isEmpty(multiField) ? setMultiField(props, m, confirmParam) : m;
-    });
-    const service = http.post(add, !isSingleSubmit ? insertRecords : insertRecords[0]);
-    allService.push(service);
-  }
-  if (!isEmpty(updateRecords) && update) {
-    const records = !isEmpty(multiField)
-      ? updateRecords.map(m => setMultiField(props, m, confirmParam))
-      : updateRecords;
-    let service = null;
-    if (version === 'v2') {
-      service = http.put(update, !isSingleSubmit ? records : records[0]);
-    } else {
-      service = http.post(update, !isSingleSubmit ? records : records[0]);
-    }
-    allService.push(service);
-  }
-  return allService;
-};
-
-const formatDateRange = (listQuery: any, formItems) => {
-  const dateRanges = formItems.filter(f => f.itemRender?.name === '#SuDateRange');
-  if (isEmpty(dateRanges)) return listQuery;
-  const query = clone(listQuery, true);
-  dateRanges.forEach((element: any) => {
-    const val = query[element.field];
-    if (val && element.toField) {
-      query[element.fromField] = toDateString(val[0], 'yyyy-MM-dd 00:00:00');
-      query[element.toField] = toDateString(val[1], 'yyyy-MM-dd 23:59:59');
-      delete query[element.field];
-    } else if (val) {
-      query[`${element.field}From`] = toDateString(val[0], 'yyyy-MM-dd 00:00:00');
-      query[`${element.field}To`] = toDateString(val[1], 'yyyy-MM-dd 23:59:59');
-      delete query[element.field];
-    }
-  });
-  return query;
-};
-
-const setMultiField = (props, source: any, confirmParam) => {
-  const { multiField } = props;
-  multiField.forEach(field => {
-    source[field] = isArray(source[field]) ? source[field].join(',') : source[field];
-  });
-  Object.assign(source, confirmParam || {});
-  return source;
-};
+/*
+ * @Author: wei.li
+ * @Date: 2022-06-23 17:29:11
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2026-07-28 08:39:51
+ * @Description: file content
+ */
+
+import { clone, isArray, isString, isEmpty, toDateString } from 'xe-utils';
+import { useRender } from '@utogether/utils';
+
+const renderHook = useRender();
+
+export const rulesFormat = (records, rule, t) => {
+  records
+    .filter(colunm => colunm.required)
+    .forEach(colunm => {
+      const { field, title } = colunm;
+      rule[field] = [
+        {
+          required: true,
+          message: `${t('message.required')}${title ? t(title) : t(`message.${field}`)}`
+        }
+      ];
+    });
+  return rule;
+};
+
+export const columnFormat = columns => {
+  return columns.map(m => {
+    if (m.type) return m;
+    m.title = m.title || `message.${m.field}`;
+    return m;
+  });
+};
+
+const searchBtn: IFormItemProps = {
+  span: 6,
+  align: 'right',
+  collapseNode: false,
+  itemRender: {
+    name: 'VxeButtonGroup',
+    options: [
+      {
+        type: 'submit',
+        submit: 'submit',
+        content: 'message.btn.search',
+        status: 'primary',
+        icon: 'ri-search-line'
+      },
+      {
+        type: 'reset',
+        name: 'reset',
+        content: 'message.btn.reset',
+        status: 'info',
+        icon: 'ri-refresh-line'
+      }
+    ],
+    events: null
+  }
+};
+
+/** 根据屏幕宽度获取每行可放置的表单项数量 */
+const getItemsPerRow = (): number => {
+  const width = window.innerWidth;
+  if (width >= 1800) return 6;
+  if (width >= 1400) return 4;
+  return 3;
+};
+
+export const formatGridItems1 = (records, favorite) => {
+  const formItems = records.filter(f => f.visible !== false);
+  const len = formItems.length;
+  // 前3个存在时间范围 或者 存在span = 12
+  const isDateRange = len > 2 && formItems.some((f, idx) => idx < 3 && (f.span > 6 || getDateRange(f)));
+  // 需要展示折叠按钮
+  const isCollapse = isDateRange || len > 3;
+
+  const defaultCollapse = { collapseTags: true, collapseTagsTooltip: true, multiple: true };
+  const items = formItems.map((item, idx) => {
+    item.folding = isDateRange ? isCollapse && idx > 1 : isCollapse && idx > 2;
+    item.span = getDateRange(item) ? 12 : item.span || 6;
+    if (item.code && !item.itemRender) {
+      item.itemRender = renderHook.renderDict(item.code);
+    }
+    item.itemRender = item.itemRender || { name: '$input' };
+    item.title = item.title || `message.${item.field}`;
+    if (item.multiple || item.itemRender?.props?.multiple) {
+      item.itemRender.props = Object.assign(defaultCollapse, item.itemRender?.props || {});
+    }
+    return item;
+  });
+
+  const btn = clone(searchBtn, true);
+  btn.collapseNode = isCollapse;
+  favorite && btn.itemRender.options.length < 3 && btn.itemRender.options.push(favorite);
+
+  if (isCollapse) {
+    // 按钮设置为	折叠节点
+    // 折叠时将搜索按钮插入到第一列的最后
+    const idx = isDateRange ? 2 : 3;
+    items.splice(idx, 0, btn);
+  } else {
+    items.push(btn);
+  }
+  return items;
+};
+
+/**
+ * 格式化查询表单的表单项
+ * - 根据屏幕宽度动态计算每项span，保证单行最多放置 itemsPerRow 个表单项
+ * - 日期范围组件（#SuDateRange）占2列
+ * - 搜索按钮（searchBtn）始终作为第一行末位
+ * - 超出第一行的表单项自动折叠
+ */
+export const formatGridItems = (records, options: any = {}) => {
+  const formItems = records.filter(f => f.visible !== false);
+  // 根据屏幕宽度计算每行项数
+  const itemsPerRow = getItemsPerRow();
+  // 每项默认span（24栅格 / 每行项数）
+  const span = Math.floor(24 / itemsPerRow);
+  const defaultCollapse = { collapseTags: true, collapseTagsTooltip: true, multiple: true };
+
+  const items = formItems.map(item => {
+    // 日期范围占2列，普通项占1列
+    item.span = getDateRange(item) ? span * 2 : item.span || span;
+    if (item.code && !item.itemRender) {
+      item.itemRender = renderHook.renderDict({ code: item.code }, options.callback);
+    } else if (
+      ['#select', '#SuSelect', 'VxeRadioGroup', 'VxeCheckboxGroup', 'VxeSwitch'].includes(item.itemRender?.name)
+    ) {
+      item.itemRender.events = { change: options.callback };
+    }
+    // console.log(item);
+    item.itemRender = item.itemRender || { name: '$input' };
+    item.title = item.title || `message.${item.field}`;
+    if (item.multiple || item.itemRender?.props?.multiple) {
+      item.itemRender.props = Object.assign(defaultCollapse, item.itemRender?.props || {});
+    }
+    return item;
+  });
+
+  const btn = clone(searchBtn, true);
+  // 搜索按钮占1列，与普通项一致
+  btn.span = span;
+  options.favorite && btn.itemRender.options.length < 3 && btn.itemRender.options.push(options.favorite);
+
+  // 所有项span总和 + 按钮span <= 24 时，全部放第一行
+  const totalSpan = items.reduce((sum, item) => sum + (item.span || span), 0);
+
+  if (totalSpan + span <= 24) {
+    // 无需折叠，按钮追加到末尾
+    btn.collapseNode = false;
+    items.forEach(item => {
+      item.folding = false;
+    });
+    items.push(btn);
+  } else {
+    // 贪心遍历：计算第一行能放下多少个项（需为按钮预留span空间）
+    let firstRowSpan = 0;
+    // 列占用计数：普通项占1列，日期范围占2列
+    let firstRowCount = 0;
+    let insertIdx = items.length;
+    for (let i = 0; i < items.length; i++) {
+      const itemSpan = items[i].span || span;
+      const dateRangeCols = getDateRange(items[i]) ? 2 : 1;
+      // span溢出 或 列数达到上限时，截断第一行
+      if (firstRowSpan + itemSpan + span > 24 || firstRowCount + dateRangeCols > itemsPerRow) {
+        insertIdx = i;
+        break;
+      }
+      firstRowSpan += itemSpan;
+      firstRowCount += dateRangeCols;
+    }
+    // 存在折叠项时，按钮显示折叠节点
+    btn.collapseNode = insertIdx < items.length;
+    items.forEach((item, idx) => {
+      item.folding = idx >= insertIdx;
+    });
+    // 将搜索按钮插入到第一行末位
+    items.splice(insertIdx, 0, btn);
+  }
+  return items;
+};
+
+const getDateRange = item => {
+  if (item.itemRender?.name === '#SuDateRange') {
+    return item.itemRender?.props?.type === 'daterange' || !item.itemRender?.props?.type;
+  }
+  return false;
+};
+export const formatButton = (buttons, auth?) => {
+  buttons.forEach(btn => {
+    btn.auth = auth ? auth[btn.code] || btn.auth : btn.auth;
+    if (!btn.name) {
+      btn.name = `message.${btn.name || btn.code}`;
+    } else if (!btn.name.includes('message.')) {
+      btn.name = `message.${btn.name}`;
+    }
+  });
+  return buttons;
+};
+
+export const queryAll = (props, http, form, fetchParam) => {
+  const params = { pageNum: 1, pageSize: 100000 };
+  Object.assign(params, form, fetchParam || {});
+  const query = formatDateRange(params, props.formItems);
+  const ajax = props.version === 'v2' ? http.get : http.post;
+  return new Promise((resolve, reject) => {
+    ajax(props.serviceCode.fetch, query)
+      .then((response: IResponseData) => {
+        resolve(response.list);
+      })
+      .catch((e: any) => {
+        reject(e);
+      });
+  });
+};
+
+/** 查询服务 */
+export const query = (props, form, page, http, fetchParam) => {
+  for (const i in form) {
+    if (form[i] && isString(form[i])) {
+      form[i] = form[i].trim();
+    }
+  }
+  const params = {
+    pageNum: page.currentPage,
+    pageSize: page.pageSize
+  };
+  Object.assign(params, form, fetchParam || {});
+  const query = formatDateRange(params, props.formItems);
+  const {
+    version,
+    serviceCode: { fetch }
+  } = props;
+  if (!fetch) return null;
+  if (version === 'v2') {
+    return http.get(fetch, query);
+  }
+  return http.post(fetch, query);
+};
+/** 删除服务 */
+export const del = (http, removeRecords, props) => {
+  const { serviceCode, version, isSingleSubmit } = props;
+  const { del } = serviceCode;
+  if (!del) return null;
+  if (version === 'v2') {
+    return http.delete(del, !isSingleSubmit ? removeRecords : removeRecords[0]);
+  }
+  return http.post(del, !isSingleSubmit ? removeRecords : removeRecords[0]);
+};
+/** 更新服务 */
+export const save = (http, body, props, confirmParam) => {
+  const allService = [];
+  const { serviceCode, isSingleSubmit, version, multiField } = props;
+  const { add, update } = serviceCode;
+  const { insertRecords, updateRecords } = body;
+
+  if (!isEmpty(insertRecords) && add) {
+    insertRecords.forEach(m => {
+      !isEmpty(confirmParam) && Object.assign(m, confirmParam);
+      m = !isEmpty(multiField) ? setMultiField(props, m, confirmParam) : m;
+    });
+    const service = http.post(add, !isSingleSubmit ? insertRecords : insertRecords[0]);
+    allService.push(service);
+  }
+  if (!isEmpty(updateRecords) && update) {
+    const records = !isEmpty(multiField)
+      ? updateRecords.map(m => setMultiField(props, m, confirmParam))
+      : updateRecords;
+    let service = null;
+    if (version === 'v2') {
+      service = http.put(update, !isSingleSubmit ? records : records[0]);
+    } else {
+      service = http.post(update, !isSingleSubmit ? records : records[0]);
+    }
+    allService.push(service);
+  }
+  return allService;
+};
+
+const formatDateRange = (listQuery: any, formItems) => {
+  const dateRanges = formItems.filter(f => f.itemRender?.name === '#SuDateRange');
+  if (isEmpty(dateRanges)) return listQuery;
+  const query = clone(listQuery, true);
+  dateRanges.forEach((element: any) => {
+    const val = query[element.field];
+    if (val && element.toField) {
+      query[element.fromField] = toDateString(val[0], 'yyyy-MM-dd 00:00:00');
+      query[element.toField] = toDateString(val[1], 'yyyy-MM-dd 23:59:59');
+      delete query[element.field];
+    } else if (val) {
+      query[`${element.field}From`] = toDateString(val[0], 'yyyy-MM-dd 00:00:00');
+      query[`${element.field}To`] = toDateString(val[1], 'yyyy-MM-dd 23:59:59');
+      delete query[element.field];
+    }
+  });
+  return query;
+};
+
+const setMultiField = (props, source: any, confirmParam) => {
+  const { multiField } = props;
+  multiField.forEach(field => {
+    source[field] = isArray(source[field]) ? source[field].join(',') : source[field];
+  });
+  Object.assign(source, confirmParam || {});
+  return source;
+};