@utogether/udp-core 1.0.2 → 1.0.4-beta.1

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/AuthorityPanel.vue

@@ -1,140 +1,142 @@
-<!--
- * @Author: wei.li
- * @Date: 2022-08-05 10:05:27
- * @LastEditors: wei.li
- * @LastEditTime: 2022-08-16 18:05:43
- * @Description: 菜单权限列表
--->
-<template>
-  <div class="u-dict-config_wrapper">
-    <el-drawer
-      :model-value="show"
-      :before-close="handleClose"
-      title="权限明细"
-      direction="rtl"
-      destroy-on-close
-      size="66%"
-    >
-      <ut-grid
-        ref="SuGridRef"
-        :columns="columns"
-        url="/uums/menu"
-        :default-params="{ parentId: record.id }"
-        :default-value="{ parentId: record.id, menuType: 1 }"
-      />
-    </el-drawer>
-  </div>
-</template>
-
-<script setup lang="tsx">
-import { ref, watch } from 'vue';
-import { useRender } from '@utogether/utils';
-
-interface IProps {
-  record: IRecord;
-  show: boolean;
-}
-
-const props = withDefaults(defineProps<IProps>(), {
-  record: (): IRecord => {
-    return {};
-  },
-  show: false
-});
-
-watch(
-  () => props.show,
-  () => {
-    prefixCode.value = props.show && getPrefixCode();
-  }
-);
-
-const prefixCode = ref('');
-
-const renderHook = useRender();
-
-// 列字段
-const columns = [
-  { type: 'checkbox', width: 50, align: 'center' },
-  {
-    field: 'menuName',
-    title: 'message.permissionName',
-    required: true,
-    editRender: renderHook.renderInput()
-  },
-  {
-    field: 'permissionCode',
-    required: true,
-    minWidth: 200,
-    editRender: renderHook.renderInput(),
-    slots: {
-      edit: ({ row }) => {
-        const slots = {
-          prefix: () => <span>{prefixCode.value}.</span>
-        };
-        row.dispalyCode = row.permissionCode?.replace(`${prefixCode.value}.`, '');
-        return [
-          <vxe-input
-            v-model={row.dispalyCode}
-            v-slots={slots}
-            className="ut-slot-input"
-            onInput={() => onInput(row)}
-          />
-        ];
-      }
-    }
-  },
-  {
-    field: 'enabled',
-    title: 'message.enabled',
-    width: 90,
-    editRender: renderHook.renderDict({ code: 'SU.ENABLE', defaultValue: '1' }),
-    formatter: ['formatDict', 'SU.ENABLE']
-  }
-];
-
-const getPrefixCode = () => {
-  const { record } = props;
-  const { id, parentId, hasChildren } = record;
-  if (!id && !parentId) return 'su';
-  if (hasChildren) {
-    record.dispalyCode = '';
-    return record.permissionCode;
-  }
-  return record.permissionCode;
-};
-
-const onInput = record => {
-  record.permissionCode = `${prefixCode.value}.${record.dispalyCode}`;
-};
-
-const emit = defineEmits<{ (e: 'close'): void }>();
-// 抽屉关闭
-function handleClose() {
-  emit('close');
-}
-</script>
-
-<style lang="scss">
-.u-dict-config_wrapper {
-  .el-drawer__header {
-    margin-bottom: 0;
-  }
-
-  .ut-slot-input {
-    .vxe-input--inner {
-      width: auto;
-      max-width: 66%;
-      padding-left: 0.5em;
-    }
-
-    .vxe-input--prefix {
-      display: contents;
-    }
-  }
-
-  .ut-disable-text {
-    background-color: #fefefe;
-  }
-}
-</style>
+<!--
+ * @Author: wei.li
+ * @Date: 2022-08-05 10:05:27
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-12-20 08:03:07
+ * @Description: 菜单权限列表
+-->
+<template>
+  <div class="u-dict-config_wrapper">
+    <el-drawer
+      :model-value="show"
+      :before-close="handleClose"
+      title="权限明细"
+      direction="rtl"
+      destroy-on-close
+      size="66%"
+    >
+      <ut-grid
+        ref="SuGridRef"
+        :columns="columns"
+        url="/uums/menu"
+        :default-params="{ parentId: record.id }"
+        :default-value="{ parentId: record.id, menuType: 1 }"
+        :pager-config="{ layouts: [] }"
+      />
+    </el-drawer>
+  </div>
+</template>
+
+<script setup lang="tsx">
+import { ref, watch } from 'vue';
+import { useRender } from '@utogether/utils';
+
+interface IProps {
+  record: IRecord;
+  show: boolean;
+}
+
+const props = withDefaults(defineProps<IProps>(), {
+  record: (): IRecord => {
+    return {};
+  },
+  show: false
+});
+
+watch(
+  () => props.show,
+  () => {
+    prefixCode.value = props.show && getPrefixCode();
+  }
+);
+
+const prefixCode = ref('');
+
+const renderHook = useRender();
+
+// 列字段
+const columns = [
+  { type: 'checkbox', width: 50, align: 'center' },
+  {
+    field: 'menuName',
+    title: 'message.permissionName',
+    required: true,
+    editRender: renderHook.renderInput()
+  },
+  {
+    field: 'permissionCode',
+    required: true,
+    minWidth: 180,
+    editRender: renderHook.renderInput(),
+    slots: {
+      edit: ({ row }) => {
+        const slots = {
+          prefix: () => <span>{prefixCode.value}.</span>
+        };
+        row.dispalyCode = row.permissionCode?.replace(`${prefixCode.value}.`, '');
+        return [
+          <vxe-input v-model={row.dispalyCode} v-slots={slots} className="ut-slot-input" onInput={() => onInput(row)} />
+        ];
+      }
+    }
+  },
+  {
+    field: 'remark',
+    title: 'message.udp.description',
+    required: true,
+    editRender: renderHook.renderInput()
+  },
+  {
+    field: 'enabled',
+    title: 'message.enabled',
+    width: 90,
+    editRender: renderHook.renderDict({ code: 'SU.ENABLE', defaultValue: '1' }),
+    formatter: ['formatDict', 'SU.ENABLE']
+  }
+];
+
+const getPrefixCode = () => {
+  const { record } = props;
+  const { id, parentId, hasChildren } = record;
+  if (!id && !parentId) return 'su';
+  if (hasChildren) {
+    record.dispalyCode = '';
+    return record.permissionCode;
+  }
+  return record.permissionCode;
+};
+
+const onInput = record => {
+  record.permissionCode = `${prefixCode.value}.${record.dispalyCode}`;
+};
+
+const emit = defineEmits<{ (e: 'close'): void }>();
+// 抽屉关闭
+function handleClose() {
+  emit('close');
+}
+</script>
+
+<style lang="scss">
+.u-dict-config_wrapper {
+  .el-drawer__header {
+    margin-bottom: 0;
+  }
+
+  .ut-slot-input {
+    .vxe-input--inner {
+      width: auto;
+      max-width: 66%;
+      padding-left: 0.5em;
+    }
+
+    .vxe-input--prefix {
+      display: contents;
+    }
+  }
+
+  .ut-disable-text {
+    background-color: #fefefe;
+  }
+}
+</style>