@utogether/udp-core 1.0.1-beta.4 → 1.0.1-beta.5

package/src/components/udp/upload.vue

@@ -0,0 +1,425 @@
+<!--
+ * @Author: wei.li
+ * @Date: 2022-06-21 14:50:52
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-08-03 16:01:16
+ * @Description: excel数据导入
+-->
+<template>
+  <vxe-modal v-model="visible" :show-header="false" fullscreen remember @close="onClose">
+    <template #default>
+      <vxe-grid ref="xgrid" v-bind="gridOptions" v-on="gridEvents">
+        <template v-for="col in columns" :key="col.field" #[col.field!]="{ row }">
+          <el-select v-if="col.dictCode && !col.disabled" v-model.trim="row[col.field!]" clearable>
+            <el-option
+              v-for="child in dict[col.dictCode]?.children"
+              :key="child.dictCode"
+              :value="child.dictCode"
+              :label="child.dictName"
+            />
+          </el-select>
+          <el-date-picker
+            v-else-if="['date', 'month', 'datetime'].includes(col.dataType) && !col.disabled"
+            v-model.trim="row[col.field!]"
+            :type="col.dataType"
+            value-format="YYYY-MM-DD hh:mm:ss"
+          />
+          <input v-else-if="!col.da && !col.disabled" v-model.trim="row[col.field!]" class="ut-input" />
+          <span v-else-if="!showErrorMsg">{{ row[col.field!] }}</span>
+          <span v-else>{{ row[col.field!] }}</span>
+        </template>
+        <template #pager>
+          <vxe-pager
+            v-model:current-page="listQuery.currentPage"
+            v-model:page-size="listQuery.pageSize"
+            :layouts="layouts"
+            :page-sizes="[200, 500, 1000, 2000, 5000, 10000]"
+            :total="listQuery.total"
+            @page-change="handlePageChange"
+        /></template>
+      </vxe-grid>
+    </template>
+  </vxe-modal>
+</template>
+
+<script lang="ts">
+export default {
+  name: 'UtUpload'
+};
+</script>
+<script setup lang="ts">
+import { reactive, ref, watch, getCurrentInstance } from 'vue';
+import { toDateString } from 'xe-utils';
+import { storageLocal, cookies, warnMessage } from '@utogether/utils';
+import Big from 'big.js';
+import { useI18n } from 'vue-i18n';
+// import type { IRecord, ITableColProps } from '../../types';
+import { VxeTableInstance, VxeGridProps, VxeGridListeners } from 'vxe-table';
+import { VxeUI } from 'vxe-pc-ui';
+import type { VxePagerPropTypes, VxePagerEvents } from 'vxe-pc-ui';
+
+export interface IProps {
+  defaultParams?: IRecord;
+  options?: IRecord;
+  columns: Array<ITableColProps>;
+  templateData?: Array<ITableColProps>;
+  serviceCode?: string;
+  url?: string;
+  sourceList?: string;
+}
+
+const props = withDefaults(defineProps<IProps>(), {
+  defaultParams: (): IRecord => {
+    return {};
+  },
+  options: (): IRecord => {
+    return {
+      filename: '数据模板',
+      errorField: 'errorMsg',
+      errListField: 'list'
+    };
+  },
+  columns: () => [],
+  templateData: () => [],
+  sourceList: 'list'
+});
+
+const instance = getCurrentInstance()!;
+const serviceApi = instance.appContext.config.globalProperties.$serviceApi;
+const visible = defineModel<boolean>('visible');
+
+const { t } = useI18n();
+
+const showErrorMsg = ref(false);
+
+const dict = storageLocal.getItem('kLov');
+
+watch(
+  () => visible.value,
+  nv => {
+    if (nv) {
+      gridOptions.data = [];
+    }
+  }
+);
+
+const getColumns = () => {
+  const columns = props.columns.map(col => {
+    col.slots = { default: col.field };
+    col.title = col.field;
+    return col;
+  });
+  const col: ITableColProps = {
+    type: 'checkbox',
+    width: 40,
+    align: 'center',
+    fixed: 'left'
+  };
+  columns.unshift(col);
+  return columns;
+};
+
+const listQuery = ref({ pageSize: 200, currentPage: 1, total: 0 });
+
+const layouts: VxePagerPropTypes.Layouts = [
+  'Sizes',
+  'PrevJump',
+  'PrevPage',
+  'Number',
+  'NextPage',
+  'NextJump',
+  'FullJump',
+  'Total'
+];
+
+const height = window.innerHeight - 25;
+
+const xgrid = ref<VxeTableInstance>();
+// 导入的所有数据
+let dataList: ITableColProps[] = [];
+
+const importConfig = {
+  mode: 'covering',
+  types: ['csv', 'xlsx'],
+  afterImportMethod: onImportMethod
+};
+
+const gridOptions = reactive<VxeGridProps>({
+  border: true,
+  height,
+  data: [],
+  importConfig,
+  showOverflow: true,
+  loading: false,
+  toolbarConfig: {
+    buttons: [
+      {
+        code: 'import_plus',
+        name: t('message.btn.upload'),
+        icon: 'ri-upload-2-line',
+        status: 'primary'
+      },
+      {
+        code: 'save_plus',
+        name: t('message.btn.save'),
+        icon: 'ri-save-3-line',
+        status: 'success'
+      },
+      {
+        code: 'del_plus',
+        name: t('message.btn.delete'),
+        icon: 'ri-delete-bin-line',
+        status: 'danger'
+      },
+      {
+        code: 'export_plus',
+        name: t('message.btn.downloadTemp'),
+        icon: 'ri-download-2-line',
+        status: 'warning'
+      }
+    ],
+    tools: [
+      {
+        code: 'question',
+        name: t('message.btn.FAQ'),
+        status: 'primary',
+        icon: 'vxe-icon-info-circle-fill'
+      },
+      {
+        code: 'replay',
+        name: t('message.btn.back'),
+        status: 'info',
+        icon: 'vxe-icon-undo'
+      }
+    ]
+  },
+  columns: getColumns()
+});
+
+const gridEvents: VxeGridListeners = {
+  toolbarButtonClick({ code }) {
+    // const $grid = xgrid.value;
+    switch (code) {
+      case 'import_plus': {
+        handleImport();
+        break;
+      }
+      case 'save_plus': {
+        handleSave();
+        break;
+      }
+      case 'del_plus': {
+        handleDelete();
+        break;
+      }
+      case 'export_plus': {
+        handleDownLoadFile();
+        break;
+      }
+    }
+  },
+  toolbarToolClick({ code }) {
+    // const $grid = xgrid.value;
+    switch (code) {
+      case 'replay': {
+        onClose();
+        break;
+      }
+      case 'question': {
+        showImportQuestion();
+        break;
+      }
+    }
+  }
+};
+
+const handleImport = () => {
+  dataList = [];
+  xgrid.value?.openImport();
+};
+// 导入后获取数据
+function onImportMethod(options: any) {
+  dataList = options.$table.getTableData().fullData;
+  // 标题会默认导入，删除第一行
+  // dataList.splice(0, 1);
+  const columns = getColumns().filter(f => !f.type && f.mapField !== props.options.errorField);
+  columns.forEach(col => {
+    const idx = dataList.findIndex(data => data[col.field!] === col.field);
+    idx !== -1 && dataList.splice(idx, 1);
+  });
+  props.columns.forEach(col => {
+    if (col.dateFormatter || col.valueType === 'number') {
+      dataList.forEach(data => {
+        if (col.dateFormatter) {
+          data[col.field!] = toDateString(data[col.field!], col.dateFormatter || 'yyyy-MM-dd HH:mm:ss');
+        } else {
+          data[col.field!] = Big(data[col.field!]).toFixed(col.decimal || 6);
+        }
+      });
+    }
+  });
+  listQuery.value.total = dataList.length;
+  getDataList();
+}
+
+const getDataList = () => {
+  const { currentPage, pageSize } = listQuery.value;
+  gridOptions.data = dataList.filter(
+    (data, idx) => idx < pageSize * currentPage && idx >= pageSize * (currentPage - 1)
+  );
+};
+// 切换页数
+const handlePageChange: VxePagerEvents.PageChange = ({ currentPage, pageSize }) => {
+  listQuery.value.currentPage = currentPage;
+  listQuery.value.pageSize = pageSize;
+  getDataList();
+};
+// 模板下载
+const handleDownLoadFile = () => {
+  const data: ITableColProps[] = [];
+  if (props.templateData.length) {
+    data.push(...props.templateData);
+  } else {
+    const obj: ITableColProps = {};
+    getColumns()
+      .filter(f => f.type !== 'checkbox')
+      .forEach(col => {
+        obj[col.field!] = '案例';
+      });
+    data.push(obj);
+  }
+  const opt: IRecord = {
+    filename: props.options.filename,
+    type: 'xlsx',
+    columns: getColumns().filter(f => f.mapField !== props.options.errorField && f.type !== 'checkbox'),
+    data
+  };
+  xgrid.value?.exportData(opt);
+};
+
+const handleSave = async () => {
+  if (!dataList.length) {
+    return warnMessage(t('message.importEmpty'));
+  }
+  const type = await VxeUI.modal.confirm(t('message.importRecord'));
+  if (type === 'confirm') {
+    gridOptions.loading = true;
+    const { url } = props;
+    formatterData('toSave');
+    serviceApi
+      .post(url, dataList)
+      .then((res: any) => {
+        if (res?.status === 'error' || res?.length) {
+          showErrorMsg.value = true;
+          setErrorMessage(res?.length ? res : res[props.options.errListField || props.sourceList]);
+          VxeUI.modal.message({
+            content: t('message.importFailed'),
+            status: 'error'
+          });
+        } else {
+          VxeUI.modal.message({
+            content: t('message.importSuccess'),
+            status: 'success'
+          });
+          onClose();
+        }
+      })
+      .finally(() => {
+        showErrorMsg.value = false;
+        gridOptions.loading = false;
+      });
+  }
+};
+
+/**
+ * @description:删除行
+ */
+const handleDelete = () => {
+  const checkboxRecords = xgrid.value?.getCheckboxRecords();
+  if (!checkboxRecords?.length) {
+    return VxeUI.modal.message({
+      content: t('message.selectedRecord'),
+      status: 'warning'
+    });
+  }
+  checkboxRecords.forEach(record => {
+    const idx = dataList.findIndex(data => data._X_ROW_KEY === record._X_ROW_KEY)!;
+    idx !== -1 && dataList.splice(idx, 1);
+  });
+  gridOptions.data = dataList;
+};
+
+const setErrorMessage = (array: ITableColProps[]) => {
+  listQuery.value.total = array.length;
+  dataList = array.map((item, idx) => {
+    item._X_ROW_KEY = idx;
+    return item;
+  });
+  formatterData('toShow');
+  getDataList();
+};
+const formatterData = (formatterType: string) => {
+  gridOptions.columns!.forEach((col: any) => {
+    if (formatterType === 'toSave') {
+      const commonParam = cookies.get('kCookies_param')
+        ? JSON.parse(cookies.get('kCookies_param')!)
+        : {};
+      dataList.forEach(data => {
+        data[col.mapField] = data[col.field];
+        Object.assign(data, commonParam, props.defaultParams);
+      });
+    } else {
+      dataList.forEach(data => {
+        data[col.field] = data[col.mapField];
+      });
+    }
+  });
+};
+
+const showImportQuestion = () => {
+  VxeUI.modal.alert(t('message.importTip'), t('message.udp.tip'));
+};
+
+const emit = defineEmits<{ (e: 'close'): void }>();
+
+const onClose = () => {
+  visible.value = false;
+  emit('close');
+};
+</script>
+
+<style lang="scss" scoped>
+.ut-input {
+  box-sizing: border-box;
+  box-sizing: border-box;
+  display: inline-block;
+  width: 100%;
+  height: 28px;
+  padding: 0 15px;
+  font-size: 13px;
+  line-height: 28px;
+  color: #606266;
+  background-color: #fff;
+  background-image: none;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+  outline: 0;
+  transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
+  transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
+  appearance: none;
+
+  &:hover {
+    border-color: #c0c4cc;
+  }
+
+  &:focus {
+    border-color: #409eff;
+    outline: 0;
+  }
+
+  &:disabled {
+    background-color: #f5f7fa;
+    outline: none;
+  }
+}
+</style>

package/src/components/udp/utils.ts

@@ -2,22 +2,25 @@
  * @Author: levi7754 levi7754@163.com
  * @Date: 2025-07-14 17:38:38
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-07-23 10:31:52
+ * @LastEditTime: 2025-07-30 15:00:49
  * @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
  */
-import { clone, isString, isEmpty, toDateString, isObject, isFunction } from 'xe-utils';
-import { cookies, storageLocal } from '@utogether/utils';
+import { clone, isString, isEmpty, toDateString, isObject, isFunction, merge } from 'xe-utils';
+import { cookies, storageLocal, useRender } 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.')) {
@@ -377,3 +380,69 @@ 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-panel/index.vue

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2021-12-23 17:33:20
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-04-16 15:54:13
+ * @LastEditTime: 2025-07-31 10:15:40
  * @Description: 个性化设置页面
 -->
 <script setup lang="ts">
@@ -52,7 +52,7 @@ onBeforeUnmount(() => {
 <template>
   <div :class="{ show }">
     <div class="right-panel-background" />
-    <div ref="target" class="right-panel bg-bg_color">
+    <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)]"
       >
@@ -118,7 +118,7 @@ onBeforeUnmount(() => {
   position: fixed;
   top: 0;
   right: 0;
-  z-index: 40000;
+  z-index: 400000;
   width: 100%;
   max-width: 300px;
   box-shadow: 0 0 15px 0 rgb(0 0 0 / 5%);

package/src/main.ts

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2022-10-18 18:13:54
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-07-26 22:32:03
+ * @LastEditTime: 2025-07-31 17:17:32
  * @Description: file content
  */
 import { createApp, type Directive } from 'vue';
@@ -31,21 +31,22 @@ import VueViewer from 'v-viewer';
 
 // import SuTable from './components/SuTable/SuTable.vue';
 
-// import {
-//   UtButton,
-// utLov2,
-// UGrid,
-//   UtDivider,
-// UtModalForm2,
-// FormUpload2
-//   UtForm,
-// UtGrid2
-//   UtContent,
-//   UtCountdown,
-//   UtIconSelect,
-//   UtCalendar
-// uAttachment
-// } from './components/udp';
+import {
+  //   UtButton,
+  // utLov2,
+  // UGrid,
+  //   UtDivider,
+  UtModalForm2,
+  // FormUpload2
+  UtForm2,
+  UtGrid2,
+  //   UtContent,
+  // UtCountdown2,
+  UtUpload2
+  //   UtIconSelect,
+  //   UtCalendar
+  // uAttachment
+} from './components/udp';
 
 const app = createApp(App);
 
@@ -88,12 +89,12 @@ const init = ({ router, config, lang, views, env, tableConfig }) => {
     app.component('FontIcon', FontIcon);
     // app.component('uAttachment', uAttachment).component('UGrid', UGrid);
     //   .component('UtDivider', UtDivider)
-    // .component('UtModalForm2', UtModalForm2)
-    // app.component('UtGrid2', UtGrid2);
-    //   .component('UtForm', UtForm)
+    app.component('UtModalForm2', UtModalForm2);
+    app.component('UtGrid2', UtGrid2);
+    app.component('UtForm2', UtForm2);
     //   .component('UtContent', UtContent)
     //   .component('UtIconSelect', UtIconSelect)
-    //   .component('UtCountdown', UtCountdown)
+    app.component('UtUpload2', UtUpload2);
     //   .component('UtCalendar', UtCalendar)
     //   .component('UtModalGrid', UtModalGrid);
     app.use(VueViewer, { defaultOptions: { zIndex: 9999 } });

package/src/style/vxetable.scss

@@ -33,7 +33,15 @@ html[data-vxe-ui-theme='light'] {
 
 /** 必填录入框颜色 */
 .vxe-form--item.is--required {
-  .vxe-input > .vxe-input--inner:not(:disabled) {
+  .vxe-input > .vxe-input--wrapper > .vxe-input--inner:not(:disabled) {
+    background-color: #fffbdf;
+  }
+
+  .vxe-input--control-icon:not(:disabled) {
+    background-color: #fffbdf;
+  }
+
+  .el-select__wrapper:not(:disabled) {
     background-color: #fffbdf;
   }
 
@@ -152,10 +160,24 @@ html[data-vxe-ui-theme='light'] {
 
   // 表单label加粗
   .vxe-form--item-title-content {
-    font-size: 13px;
     font-weight: 700;
     color: #192847;
   }
+
+  .vxe-form--group-title {
+    border-bottom: 1px solid #eee;
+
+    .vxe-form--item-title-content {
+      font-size: 15px;
+    }
+  }
+
+  .vxe-form--group-title::before {
+    position: relative;
+    top: 2px;
+    color: var(--udp-theme-project-text);
+    content: '▉';
+  }
 }
 
 .vxe-form.size--mini .vxe-form--item-inner {