@utogether/udp-core 1.0.1-beta.2 → 1.0.1-beta.21

package/src/views/organization/inv-org/InvOrganization.vue

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2021-11-29 11:32:07
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-04-29 10:22:16
+ * @LastEditTime: 2025-09-05 10:49:38
  * @Description: 库存组织
 -->
 <template>
@@ -21,8 +21,7 @@ export default { name: 'InvOrganization' };
 <script setup lang="tsx">
 import { ref, reactive } from 'vue';
 import to from 'await-to-js';
-// import { useRender } from '@utogether/utils';
-import { useRender } from '../../../utils/udp/useRender';
+import { useRender } from '@utogether/utils';
 import { getServiceApi } from '../../../api';
 
 const url = '/uums/cusOrganization';
@@ -30,20 +29,35 @@ const url = '/uums/cusOrganization';
 const xgrid = ref(null);
 const renderHook = useRender();
 
-const formItems = [{ field: 'organizationCode' }, { field: 'organizationName' }];
+const formItems = [
+  { field: 'organizationCode', title: 'message.udp.organizationCode' },
+  { field: 'organizationName', title: 'message.udp.organizationName' }
+];
 
 // 列字段
 const columns = [
   { type: 'checkbox', width: 40, align: 'center' },
-  { field: 'organizationCode', width: 120, required: true, editRender: renderHook.renderInput() },
-  { field: 'organizationName', minWidth: 120, required: true, editRender: renderHook.renderInput() },
-  { field: 'orgName', minWidth: 170, required: true, editRender: renderHook.renderBU() },
-  { field: 'orgCode', width: 110 },
+  {
+    field: 'organizationCode',
+    width: 120,
+    title: 'message.udp.organizationCode',
+    required: true,
+    editRender: renderHook.renderInput()
+  },
+  {
+    field: 'organizationName',
+    minWidth: 120,
+    title: 'message.udp.organizationName',
+    required: true,
+    editRender: renderHook.renderInput()
+  },
+  { field: 'orgName', minWidth: 170, title: 'message.udp.orgName', required: true, editRender: renderHook.renderBU() },
+  { field: 'orgCode', width: 110, title: 'message.udp.orgCode' },
   { field: 'enabled', width: 80, cellRender: renderHook.renderEnabled(handleClick) }
 ];
 
 // 启用/禁用
-async function handleClick(row) {
+async function handleClick({ row }) {
   const [err] = await to(getServiceApi().put(url, [row]));
   !err && xgrid.value.refreshData();
 }

package/src/views/organization/org/Org.vue

@@ -24,14 +24,18 @@ const url = '/uums/org';
 const xgrid = ref(null);
 const renderHook = useRender();
 
-const formItems = [{ field: 'orgCode' }, { field: 'orgName' }, { field: 'orgAlias' }];
+const formItems = [
+  { field: 'orgCode', title: 'message.udp.orgCode' },
+  { field: 'orgName', title: 'message.udp.orgName' },
+  { field: 'orgAlias', title: 'message.udp.orgAlias' }
+];
 // 列字段
 const columns = [
   { type: 'checkbox', width: 50, align: 'center' },
-  { field: 'orgCode', required: true, editRender: { name: '$input' } },
-  { field: 'orgName', required: true, minWidth: 200, editRender: { name: '$input' } },
-  { field: 'orgAlias', editRender: { name: '$input' } },
-  { field: 'orgDesc', editRender: { name: '$input' } },
+  { field: 'orgCode', title: 'message.udp.orgCode', required: true, editRender: { name: '$input' } },
+  { field: 'orgName', title: 'message.udp.orgName', required: true, minWidth: 200, editRender: { name: '$input' } },
+  { field: 'orgAlias', title: 'message.udp.orgAlias', editRender: { name: '$input' } },
+  { field: 'orgDesc', title: 'message.udp.orgDesc', editRender: { name: '$input' } },
   { field: 'enabled', width: 80, cellRender: renderHook.renderEnabled(handleClick) }
 ];
 

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

@@ -1,197 +1,183 @@
-<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.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 && 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', 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.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/system/menu/menuInfo.vue

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2021-11-17 16:44:08
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-07-17 18:47:22
+ * @LastEditTime: 2025-08-01 17:38:53
  * @Description: file content
 -->
 
@@ -24,16 +24,11 @@
         title-colon
         title-align="right"
         title-width="110"
+        transfer
       >
-        <vxe-form-item
-          v-if="record.menuType === '0'"
-          :title="$t('message.menuType')"
-          field="menuCategory"
-          span="24"
-        >
+        <vxe-form-item v-if="record.menuType === '0'" :title="$t('message.menuType')" field="menuCategory" span="24">
           <template #default="{ data }">
-            <vxe-select v-model="data.menuCategory" :disabled="data.menuCategory === '0'">
-              <!-- v-for="dict in dictData['SU.MENU.TYPE']?.children" -->
+            <vxe-select v-model="data.menuCategory" :disabled="data.menuCategory === '0'" :transfer="false">
               <vxe-option
                 v-for="dict in getLovList('SU.MENU.TYPE')"
                 :key="dict.dictCode"
@@ -65,12 +60,7 @@
           field="menuCode"
           span="24"
         />
-        <vxe-form-item
-          :title="$t('message.menuName')"
-          :item-render="{ name: '$input' }"
-          field="menuName"
-          span="24"
-        />
+        <vxe-form-item :title="$t('message.menuName')" :item-render="{ name: '$input' }" field="menuName" span="24" />
         <vxe-form-item
           :title="$t('message.menuNameEn')"
           field="menuNameEn"
@@ -155,7 +145,6 @@
 <script setup lang="ts">
 import { useI18n } from 'vue-i18n';
 import { ref, watch } from 'vue';
-import { VxeFormPropTypes } from 'vxe-table';
 import to from 'await-to-js';
 import { templateRef } from '@vueuse/core';
 import { useSystemStoreHook } from '../../../store/modules/system';
@@ -189,7 +178,7 @@ watch(
 const serviceApi = getServiceApi();
 
 const { t } = useI18n();
-const rules: VxeFormPropTypes.Rules = {
+const rules = {
   menuCode: [
     {
       required: true,
@@ -285,8 +274,10 @@ const onSubmit = () => {
         }
         loading.value = false;
       } else {
+        record.permissionCode = record.dispalyCode;
         await to(serviceApi.put(url, [record]));
         loading.value = false;
+        resData = record;
       }
       handleClose('submit', resData);
     }
@@ -329,7 +320,6 @@ function handleClose(type, data) {
 }
 
 .u-menu-prefix.vxe-input .vxe-input--inner {
-  padding-left: 160px;
   border: 1px solid #dcdfe6;
 }
 

package/src/views/system/role/AuthorityInfo.vue

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2021-11-22 19:50:48
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-07-14 14:58:13
+ * @LastEditTime: 2025-08-12 09:02:46
  * @Description: file content
 -->
 
@@ -14,32 +14,29 @@
       :before-close="handleClose"
       direction="rtl"
       destroy-on-close
+      body-class="ut-draw-body"
       size="40%"
     >
-      <div
-        v-spinning="loading"
-        element-loading-text="Loading..."
-        style="position: relative; height: 80vh"
-      >
-        <div style="height: 85%; overflow: auto">
+      <div v-spinning="loading" style="position: relative; height: 100%">
+        <div>
           <el-tree-v2
             ref="xTree"
             :data="data.dataList"
             :props="{ children: 'children', label: 'menuName' }"
             :default-checked-keys="data.defaultCheckedKeys"
-            :height="420"
+            :height="height"
             show-checkbox
             node-key="id"
           />
         </div>
-        <div style="position: absolute; width: 100%; height: 15%">
-          <el-divider style="margin: 16px 0" />
-          <el-row type="flex" justify="end" style="padding-right: 20px">
-            <ut-button content="cancel" icon="ri-close-fill" status="warning" @tap="handleClose" />
-            <ut-button content="confirm" icon="ri-save-3-fill" status="u-cyan" @tap="onSubmit" />
-          </el-row>
-        </div>
       </div>
+      <template #footer>
+        <el-divider style="margin: 16px 0" />
+        <el-row type="flex" justify="end" style="padding-right: 20px">
+          <ut-button content="cancel" icon="ri-close-fill" status="warning" @tap="handleClose" />
+          <ut-button content="confirm" icon="ri-save-3-fill" status="u-cyan" @tap="onSubmit" />
+        </el-row>
+      </template>
     </el-drawer>
   </div>
 </template>
@@ -72,9 +69,12 @@ const data = reactive({
   defaultCheckedKeys: [] // 默认权限
 });
 
+const height = window.innerHeight - 180;
+
 const emit = defineEmits<{
   (e: 'onClose'): void;
 }>();
+
 // 菜单列表
 const getDataList = async () => {
   const res = (await getServiceApi().get('/uums/menu/listMenuTree', {})) as [IRecord];
@@ -126,4 +126,8 @@ onBeforeMount(() => {
 .el-drawer__header {
   margin-bottom: 12px;
 }
+
+.ut-draw-body {
+  padding: 0 12px;
+}
 </style>

package/src/views/system/role/Role.vue

@@ -8,11 +8,7 @@
 <template>
   <div class="u-content-panel">
     <div class="u-left-panel">
-      <ScrollPane
-        :title="$t('company')"
-        url="/uums/unit"
-        :tree-otions="{ children: 'children', label: 'unitName' }"
-      />
+      <ScrollPane :title="$t('company')" url="/uums/unit" :tree-otions="{ children: 'children', label: 'unitName' }" />
     </div>
     <div class="content">
       <role-panel />