@utogether/udp-core 1.0.2 → 1.0.4

package/src/utils/dataFormat/index.ts

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2022-06-23 17:29:11
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2024-07-04 21:06:05
+ * @LastEditTime: 2025-12-04 13:34:40
  * @Description: file content
  */
 
@@ -39,25 +39,24 @@ const searchBtn: IFormItemProps = {
   align: 'right',
   collapseNode: false,
   itemRender: {
-    name: '$buttons',
-    children: [
+    name: 'VxeButtonGroup',
+    options: [
       {
-        props: {
-          type: 'submit',
-          content: 'message.btn.search',
-          status: 'primary',
-          icon: 'vxe-icon-search'
-        }
+        type: 'submit',
+        submit: 'submit',
+        content: 'message.btn.search',
+        status: 'primary',
+        icon: 'ri-search-line'
       },
       {
-        props: {
-          type: 'reset',
-          content: 'message.btn.reset',
-          status: 'info',
-          icon: 'ri-refresh-line ri-1x'
-        }
+        type: 'reset',
+        name: 'reset',
+        content: 'message.btn.reset',
+        status: 'info',
+        icon: 'ri-refresh-line'
       }
-    ]
+    ],
+    events: null
   }
 };
 
@@ -68,7 +67,7 @@ export const formatGridItems = (records, favorite) => {
   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 };
+  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;
@@ -84,7 +83,7 @@ export const formatGridItems = (records, favorite) => {
   });
   const btn = clone(searchBtn, true);
   btn.collapseNode = isCollapse;
-  favorite && btn.itemRender.children.length < 3 && btn.itemRender.children.push(favorite);
+  favorite && btn.itemRender.options.length < 3 && btn.itemRender.options.push(favorite);
 
   if (isCollapse) {
     // 按钮设置为	折叠节点

package/src/views/organization/staff/StaffPanel.vue

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2021-11-17 16:42:14
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-11-27 18:59:49
+ * @LastEditTime: 2025-12-08 08:27:39
  * @Description: 员工管理
 -->
 
@@ -17,6 +17,7 @@
       :auto-load="false"
       :buttons="buttons"
       :url="url"
+      :callback="callback"
       mode="form"
       @buttonClick="onButtonClick"
     />
@@ -32,6 +33,7 @@ import { warnMessage } from '@utogether/utils';
 import StaffInfo from './StaffInfo.vue';
 import { getServiceApi } from '../../../api';
 import { VxeUI } from 'vxe-pc-ui';
+import to from 'await-to-js';
 
 const xgrid = ref(null);
 const { t } = useI18n();
@@ -126,13 +128,14 @@ const handleUpdate = async (record: IRecord) => {
   xgrid.value.hiddenLoading();
   xgrid.value.refreshData();
 };
-// 启用/禁用
+// 同步
 const handleSync = async () => {
   const type = await VxeUI.modal.confirm(t('message.tip.confirmSync'));
   if (type !== 'confirm') return;
   xgrid.value.showLoading();
-  await getServiceApi().post('/uums/employee/syncEwEmp', {});
+  const [err] = await to(getServiceApi().post('/uums/employee/syncEwEmp', {}));
   xgrid.value.hiddenLoading();
+  if (err) return;
   xgrid.value.refreshData();
 };
 
@@ -140,6 +143,12 @@ const onButtonClick = code => {
   code === 'sync' && handleSync();
 };
 
+const callback = {
+  querySuccess: data => {
+    console.log('querySuccess', data);
+  }
+};
+
 // 删除
 // const handleDel = async () => {
 //   const type = await VXETable.modal.confirm(t('message.delRecord'));

package/src/views/system/menu/SystemMenu.vue

@@ -1,185 +1,185 @@
-<template>
-  <div class="page-content">
-    <ut-grid
-      ref="xgrid"
-      :tree-config="{
-        childrenField: 'children',
-        lazy: true,
-        hasChild: 'hasChildren',
-        loadMethod: loadChildrenMethod,
-        iconOpen: 'ri-checkbox-indeterminate-line ri-lg',
-        iconClose: 'ri-add-box-line ri-lg'
-      }"
-      :columns="columns"
-      :url="url"
-      :stripe="false"
-      mode="form"
-      @toolbarButtonClick="handleToolClick"
-    />
-    <MenuInfo :show="data.showDrawer" :record="data.record" :data-status="data.dataStatus" @close="onClose" />
-    <AuthorityPanel :show="data.showAuthority" :record="data.record" @close="onClose" />
-  </div>
-</template>
-
-<script lang="tsx">
-export default { name: 'SystemMenu' };
-</script>
-<script setup lang="tsx">
-import { useI18n } from 'vue-i18n';
-import { ref, reactive } from 'vue';
-import MenuInfo from './menuInfo.vue';
-import AuthorityPanel from './AuthorityPanel.vue';
-import { clone } from 'xe-utils';
-import to from 'await-to-js';
-import { VxeUI } from 'vxe-pc-ui';
-import { useRender } from '@utogether/utils';
-import { getServiceApi } from '../../../api';
-
-const data = reactive<IRecord>({
-  record: {},
-  dataList: [],
-  submitLoading: false,
-  showDrawer: false,
-  dataStatus: '',
-  total: 0,
-  listQuery: {
-    pageSize: 10,
-    pageNum: 1
-  }
-});
-
-const { t } = useI18n();
-
-const renderHook = useRender();
-
-const serviceApi = getServiceApi();
-
-const xgrid = ref(null);
-
-const url = '/uums/menu';
-
-let row;
-
-// const buttons = [{ code: 'add', status: 'u-cyan', icon: 'plus', auth: 'add' }];
-
-const columns = [
-  { type: 'checkbox', width: 50, align: 'center' },
-  { field: 'menuName', width: 180, treeNode: true },
-  { field: 'menuNameEn', width: 140 },
-  { field: 'sort', width: 70 },
-  { field: 'menuCode', width: 140 },
-  { field: 'permissionCode', minWidth: 180 },
-  {
-    field: 'menuCategory',
-    title: 'message.menuType',
-    formatter: ['formatDict', 'SU.MENU.TYPE'],
-    width: 100
-  },
-  { field: 'enabled', width: 80, cellRender: renderHook.renderEnabled(handleUpdate) },
-  {
-    field: 'operate',
-    width: 140,
-    fixed: 'right',
-    slots: {
-      default: ({ row }) => {
-        const type = row.menuType;
-        const addCmp = <ut-button status="u-cyan" icon="ri-add-fill" content="add" onTap={() => handleAdd(row)} />;
-        const authCmp = <ut-button icon="ri-lock-fill" content="auth" onTap={() => handleAuthorityPanel(row)} />;
-        return [
-          <>
-            {!type ? (
-              <>
-                <ut-button status="success" icon="ri-edit-box-line" content="edit" onTap={() => handleEdit(row)} />
-                {['0', '5'].includes(row.menuCategory) ? addCmp : authCmp}
-              </>
-            ) : null}
-          </>
-        ];
-      }
-    }
-  }
-];
-
-// const resetListQuery = () => {
-//   data.listQuery.pageSize = 99;
-//   data.listQuery.pageNum = 1;
-//   getDataList();
-// };
-
-// const getDataList = async () => {
-//   const res = (await serviceApi('sys/listMenus', data.listQuery)) as IResponseData;
-//   data.dataList = res.list;
-//   data.total = res.total;
-// };
-
-const handleToolClick = ({ code }) => {
-  code === 'add' && handleAdd();
-  code === 'del' && handleDel();
-};
-
-// 异步加载子节点
-const loadChildrenMethod = async ({ row }: any) => {
-  const data = (await serviceApi.get(url, { parentId: row.id })) as IResponseData;
-  return new Promise(resolve => {
-    resolve(data.list);
-  });
-};
-
-// 新增子类型
-// menuType:保持原有不懂， 0:菜单 1，数据权限
-// 新增menuCategory: 0、根目录 1、菜单 2、内部链接3、外部链接
-const handleAdd = (record?: IRecord) => {
-  data.showDrawer = true;
-  data.dataStatus = 'add';
-  data.record.dispalyCode = record?.permissionCode; // 前缀
-  data.record.permissionCode = record?.permissionCode;
-  // data.record.menuType = !record || !record.parentId ? '0' : '1';
-  data.record.menuType = '0';
-  data.record.showLink = 'Y';
-  data.record.isApprovalPage = 'N';
-  data.record.menuCategory = !record ? '0' : '';
-  data.record.parentId = record?.id;
-  data.record.hasChildren = record?.hasChildren;
-  data.record.children = data.record.children || [];
-  console.log(data.record);
-  row = record;
-};
-
-// 编辑
-const handleEdit = (record: IRecord) => {
-  data.showDrawer = true;
-  data.dataStatus = 'update';
-  data.record = clone(record, true);
-  data.record.menuType = data.record.menuType.toString();
-  data.record.dispalyCode = record.permissionCode;
-};
-
-// 启用/禁用
-async function handleUpdate({ row }) {
-  await serviceApi.put(url, [row]);
-  xgrid.value.refreshData();
-}
-// 删除
-const handleDel = async () => {
-  const type = await VxeUI.modal.confirm(t('message.delRecord'));
-  const records = xgrid.value.getInstance().getCheckboxRecords();
-  if (type === 'confirm') {
-    const [err] = await to(serviceApi.delete(url, records));
-  }
-};
-
-const handleAuthorityPanel = record => {
-  data.showAuthority = true;
-  data.dataStatus = 'update';
-  data.record = clone(record, true);
-  data.record.menuType = data.record.menuType.toString();
-  data.record.dispalyCode = record.permissionCode;
-};
-
-const onClose = (type?, record?) => {
-  type === 'submit' && (row || record) && xgrid.value.getInstance().reloadTreeExpand(row || record);
-  data.record = {};
-  data.showDrawer = false;
-  data.showAuthority = false;
-};
-</script>
+<template>
+  <div class="page-content">
+    <ut-grid
+      ref="xgrid"
+      :tree-config="{
+        childrenField: 'children',
+        lazy: true,
+        hasChild: 'hasChildren',
+        loadMethod: loadChildrenMethod,
+        iconOpen: 'ri-checkbox-indeterminate-line ri-lg',
+        iconClose: 'ri-add-box-line ri-lg'
+      }"
+      :columns="columns"
+      :url="url"
+      :stripe="false"
+      mode="form"
+      @toolbarButtonClick="handleToolClick"
+    />
+    <MenuInfo :show="data.showDrawer" :record="data.record" :data-status="data.dataStatus" @close="onClose" />
+    <AuthorityPanel :show="data.showAuthority" :record="data.record" @close="onClose" />
+  </div>
+</template>
+
+<script lang="tsx">
+export default { name: 'SystemMenu' };
+</script>
+<script setup lang="tsx">
+import { useI18n } from 'vue-i18n';
+import { ref, reactive } from 'vue';
+import MenuInfo from './menuInfo.vue';
+import AuthorityPanel from './AuthorityPanel.vue';
+import { clone } from 'xe-utils';
+import to from 'await-to-js';
+import { VxeUI } from 'vxe-pc-ui';
+import { useRender } from '@utogether/utils';
+import { getServiceApi } from '../../../api';
+
+const data = reactive<IRecord>({
+  record: {},
+  dataList: [],
+  submitLoading: false,
+  showDrawer: false,
+  dataStatus: '',
+  total: 0,
+  listQuery: {
+    pageSize: 10,
+    pageNum: 1
+  }
+});
+
+const { t } = useI18n();
+
+const renderHook = useRender();
+
+const serviceApi = getServiceApi();
+
+const xgrid = ref(null);
+
+const url = '/uums/menu';
+
+let row;
+
+// const buttons = [{ code: 'add', status: 'u-cyan', icon: 'plus', auth: 'add' }];
+
+const columns = [
+  { type: 'checkbox', width: 50, align: 'center' },
+  { field: 'menuName', minWidth: 220, treeNode: true },
+  { field: 'menuNameEn', minWidth: 180 },
+  { field: 'sort', width: 70 },
+  { field: 'menuCode', minWidth: 220 },
+  { field: 'permissionCode', minWidth: 180 },
+  {
+    field: 'menuCategory',
+    title: 'message.menuType',
+    formatter: ['formatDict', 'SU.MENU.TYPE'],
+    width: 100
+  },
+  { field: 'enabled', width: 80, cellRender: renderHook.renderEnabled(handleUpdate) },
+  {
+    field: 'operate',
+    width: 140,
+    fixed: 'right',
+    slots: {
+      default: ({ row }) => {
+        const type = row.menuType;
+        const addCmp = <ut-button status="u-cyan" icon="ri-add-fill" content="add" onTap={() => handleAdd(row)} />;
+        const authCmp = <ut-button icon="ri-lock-fill" content="auth" onTap={() => handleAuthorityPanel(row)} />;
+        return [
+          <>
+            {!type ? (
+              <>
+                <ut-button status="success" icon="ri-edit-box-line" content="edit" onTap={() => handleEdit(row)} />
+                {['0', '5'].includes(row.menuCategory) ? addCmp : authCmp}
+              </>
+            ) : null}
+          </>
+        ];
+      }
+    }
+  }
+];
+
+// const resetListQuery = () => {
+//   data.listQuery.pageSize = 99;
+//   data.listQuery.pageNum = 1;
+//   getDataList();
+// };
+
+// const getDataList = async () => {
+//   const res = (await serviceApi('sys/listMenus', data.listQuery)) as IResponseData;
+//   data.dataList = res.list;
+//   data.total = res.total;
+// };
+
+const handleToolClick = ({ code }) => {
+  code === 'add' && handleAdd();
+  code === 'del' && handleDel();
+};
+
+// 异步加载子节点
+const loadChildrenMethod = async ({ row }: any) => {
+  const data = (await serviceApi.get(url, { parentId: row.id })) as IResponseData;
+  return new Promise(resolve => {
+    resolve(data.list);
+  });
+};
+
+// 新增子类型
+// menuType:保持原有不懂， 0:菜单 1，数据权限
+// 新增menuCategory: 0、根目录 1、菜单 2、内部链接3、外部链接
+const handleAdd = (record?: IRecord) => {
+  data.showDrawer = true;
+  data.dataStatus = 'add';
+  data.record.dispalyCode = record?.permissionCode; // 前缀
+  data.record.permissionCode = record?.permissionCode;
+  // data.record.menuType = !record || !record.parentId ? '0' : '1';
+  data.record.menuType = '0';
+  data.record.showLink = 'Y';
+  data.record.isApprovalPage = 'N';
+  data.record.menuCategory = !record ? '0' : '';
+  data.record.parentId = record?.id;
+  data.record.hasChildren = record?.hasChildren;
+  data.record.children = data.record.children || [];
+  console.log(data.record);
+  row = record;
+};
+
+// 编辑
+const handleEdit = (record: IRecord) => {
+  data.showDrawer = true;
+  data.dataStatus = 'update';
+  data.record = clone(record, true);
+  data.record.menuType = data.record.menuType.toString();
+  data.record.dispalyCode = record.permissionCode;
+};
+
+// 启用/禁用
+async function handleUpdate({ row }) {
+  await serviceApi.put(url, [row]);
+  xgrid.value.refreshData();
+}
+// 删除
+const handleDel = async () => {
+  const type = await VxeUI.modal.confirm(t('message.delRecord'));
+  const records = xgrid.value.getInstance().getCheckboxRecords();
+  if (type === 'confirm') {
+    const [err] = await to(serviceApi.delete(url, records));
+  }
+};
+
+const handleAuthorityPanel = record => {
+  data.showAuthority = true;
+  data.dataStatus = 'update';
+  data.record = clone(record, true);
+  data.record.menuType = data.record.menuType.toString();
+  data.record.dispalyCode = record.permissionCode;
+};
+
+const onClose = (type?, record?) => {
+  type === 'submit' && (row || record) && xgrid.value.getInstance().reloadTreeExpand(row || record);
+  data.record = {};
+  data.showDrawer = false;
+  data.showAuthority = false;
+};
+</script>

package/src/views/udev/dict/DictView.vue

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2021-12-23 17:33:21
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-11-25 10:16:48
+ * @LastEditTime: 2025-12-05 16:58:27
  * @Description: 数据字典
 -->
 <template>
@@ -79,7 +79,7 @@ const columns = [
     slots: {
       default: ({ row }) => {
         if (!row.id) return null;
-        return [<ut-button content="lov" onClick={() => hanldeDipose(row)} />];
+        return [<ut-button content="lov" icon="ri-dice-6-line" onClick={() => hanldeDipose(row)} />];
       }
     }
   }

package/src/views/udev/dict/childView.vue

@@ -2,18 +2,18 @@
  * @Author: wei.li
  * @Date: 2022-07-15 17:02:56
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-11-24 13:44:45
+ * @LastEditTime: 2025-12-05 16:49:52
  * @Description: file contentu
 -->
 <template>
   <div class="u-dict-config_wrapper">
-    <el-drawer
+    <vxe-drawer
       :model-value="show"
-      :before-close="handleClose"
       :title="$t('message.title.dictList', { name: record.dictName })"
-      direction="rtl"
+      position="right"
       destroy-on-close
-      size="76%"
+      width="67%"
+      @close="handleClose"
     >
       <ut-grid
         ref="xgrid"
@@ -38,7 +38,7 @@
         @close="showModal = false"
         @confirm="onConfirm"
       />
-    </el-drawer>
+    </vxe-drawer>
   </div>
 </template>