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

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-09-10 15:38:34
- * @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-10-29 18:04:53
+ * @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, form);
+  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,44 @@ 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);
+  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;
+      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 +186,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 +210,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 +249,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,6 +274,10 @@ 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,有就不加入按钮组中,相当于重写了默认的按钮
@@ -284,11 +307,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,72 +404,3 @@ export const getAttrs = attrs => {
   });
   return data;
 };
-
-export const formatItems = (items, status, t, span = 24) => {
-  if (!items.length) return items;
-  return items.map(item => {
-    if (item.children?.length) {
-      item.children = formatItems(item.children, status, t, 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;
-      let placeholder = t(`message.udp.placeholder`) + t(item.title);
-      if (status === 'detail') {
-        disabled = true;
-        placeholder = '';
-      } else {
-        disabled = item.disabled === false ? item.disabled : item.disabled || item.itemRender?.props?.disabled;
-      }
-      let itemRender = {
-        name: 'VxeInput',
-        props: { disabled, placeholder: disabled ? '' : 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,
-        placeholder: disabled ? '' : placeholder
-      });
-      console.log('--------------', { item });
-      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;
-};