@utogether/udp-core 1.0.1-beta.6 → 1.0.1-beta.8

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

@@ -26,18 +26,9 @@
         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'"
-              :transfer="false"
-            >
+            <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"
@@ -69,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"
@@ -291,6 +277,7 @@ const onSubmit = () => {
         record.permissionCode = record.dispalyCode;
         await to(serviceApi.put(url, [record]));
         loading.value = false;
+        resData = record;
       }
       handleClose('submit', resData);
     }

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 />

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

@@ -11,6 +11,7 @@
       ref="xgrid"
       :items="formItems"
       :columns="columns"
+      :check-method="checkMethod"
       url="/uums/role"
       mode="form"
       @buttonClick="onButtonClick"
@@ -39,7 +40,7 @@
       :url="url"
       :method="method"
       width="400"
-      height="220"
+      height="240"
       data-status="update"
       :title="$t('message.title.authEdit')"
       @close="data.showModalView = false"
@@ -105,7 +106,7 @@ const columns = [
         // <ut-button content="edit" onTap={() => handleShowChild(row, 'update')} />
         return [
           <>
-            <ut-button content="edit" auth="edit" onTap={() => handleEdit(row)} />
+            <ut-button content="edit" auth="edit" disabled={row.roleCode === 'admin'} onTap={() => handleEdit(row)} />
             <ut-button
               content="dispatchUser"
               status="warning"
@@ -174,6 +175,10 @@ const handleDispathUser = record => {
 };
 // 启用/禁用
 async function handleClick({ row }) {
+  if (row.roleCode === 'admin') {
+    row.enabled = '1';
+    return;
+  }
   await getServiceApi().put('/uums/role/singleUpdate', row);
   xgrid.value.refreshData();
 }
@@ -183,6 +188,10 @@ const onClose = () => {
   data.showAuthView = false;
   data.showUserView = false;
 };
+
+const checkMethod = row => {
+  return row.roleCode !== 'admin';
+};
 // 拷贝当前列表项的数据（字典类型）
 // const { clipboardRef } = useCopyToClipboard();
 // const cellDBLClickEvent: VxeTableEvents.CellDblclick = ({ row }) => {

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

@@ -1,193 +1,195 @@
-<template>
-  <div class="u-dict-config_wrapper">
-    <el-drawer
-      :model-value="show"
-      :title="$t('message.title.authUser', { role: record.roleName })"
-      :before-close="handleClose"
-      direction="rtl"
-      destroy-on-close
-      size="80%"
-    >
-      <vxe-grid ref="xgrid" v-bind="gridOptions" v-on="gridEvents" />
-      <ut-modal-grid
-        v-if="showModalView"
-        url="/uums/user/listUserToRole"
-        :default-params="{ roleId: record.id }"
-        :items="modalFormItems"
-        :columns="modalColum"
-        :show-footer="true"
-        :editable="false"
-        width="60%"
-        @close="showModalView = false"
-        @confirm="onConfirm"
-      />
-    </el-drawer>
-  </div>
-</template>
-<script setup lang="ts">
-import { onBeforeMount, reactive, ref } from 'vue';
-import { VxeGridProps, VxeGridListeners, VxeGridInstance } from 'vxe-table';
-import to from 'await-to-js';
-import { getServiceApi } from '../../../api';
-
-interface IProps {
-  record: IRecord;
-  show: boolean;
-  direction?: string;
-}
-
-const props = withDefaults(defineProps<IProps>(), {
-  record: (): IRecord => {
-    return {};
-  },
-  show: false,
-  direction: 'rtl'
-});
-const loading = ref(false);
-const showModalView = ref(false);
-
-const serviceApi = getServiceApi();
-
-const emit = defineEmits<{
-  (e: 'onClose'): void;
-}>();
-const formItems: IFormItemProps[] = [
-  {
-    field: 'userName',
-    title: 'message.userCode',
-    span: 8,
-    itemRender: { name: '$input' }
-  },
-  {
-    field: 'name',
-    title: 'message.userName',
-    span: 8,
-    itemRender: { name: '$input' }
-  },
-  {
-    span: 8,
-    align: 'right',
-    itemRender: {
-      name: '$buttons',
-      children: [
-        {
-          props: {
-            type: 'submit',
-            content: 'message.btn.search',
-            icon: 'ri-search-line',
-            status: 'primary'
-          }
-        },
-        { props: { type: 'reset', icon: 'ri-refresh-line', content: 'message.btn.reset' } }
-      ]
-    }
-  }
-];
-// 列字段
-const columns: ITableColProps[] = [
-  { type: 'checkbox', width: 50, align: 'center' },
-  {
-    field: 'userName',
-    title: 'message.userCode'
-  },
-  {
-    field: 'name',
-    title: 'message.userName'
-  },
-  {
-    field: 'enabled',
-    title: 'message.enabled',
-    width: 70,
-    editRender: {
-      name: '$select',
-      options: [
-        { label: '启用', value: '1' },
-        { label: '禁用', value: '0' }
-      ],
-      defaultValue: '1'
-    }
-  }
-];
-// 新增/删除/保存
-const buttons = [
-  { code: 'add', name: 'message.btn.add', status: 'u-cyan', icon: 'ri-add-line' },
-  { code: 'delete', name: 'message.btn.del', status: 'danger', icon: 'ri-delete-bin-5-fill' }
-];
-const modalFormItems = [
-  { field: 'userName', title: 'message.userCode' },
-  { field: 'name', title: 'message.userName' }
-];
-const modalColum = [
-  { type: 'checkbox', width: 40 },
-  { field: 'userName', title: 'message.userCode' },
-  { field: 'name', title: 'message.userName' },
-  { field: 'enabled', width: 70, formatter: ['formatDict', 'SU.ENABLE'] }
-];
-const xgrid = ref({} as VxeGridInstance);
-const gridOptions = reactive<VxeGridProps>({
-  height: 560,
-  border: true,
-  pagerConfig: {},
-  toolbarConfig: { buttons, perfect: true },
-  loading: false,
-  formConfig: { titleWidth: 100, titleAlign: 'right', items: formItems },
-  // data: props.record.children,
-  proxyConfig: {
-    form: true, // 查询是需要启用表单代理
-    ajax: {
-      // 接收 Promise
-      query: ({ page, form }) => {
-        const queryParams = Object.assign({}, form);
-        queryParams.id = props.record.id;
-        queryParams.pageNum = page.currentPage;
-        queryParams.pageSize = page.pageSize;
-        return serviceApi.get('/uums/user/listRoleUsers', queryParams);
-      },
-      // body 对象： { removeRecords }
-      delete: ({ body: { removeRecords } }) => {
-        const param = {
-          roleId: props.record.id,
-          userIds: removeRecords.map(v => v.id).join()
-        };
-        return serviceApi.delete('/uums/role/deleteRoleUsers', param);
-      }
-    }
-  },
-  columns
-});
-// grid点击事件监听
-const gridEvents: VxeGridListeners = {
-  toolbarButtonClick({ code }) {
-    if (code === 'add') {
-      showModalView.value = true;
-    }
-  }
-};
-// 监听modal table确定
-const onConfirm = async records => {
-  const param = { userIds: '', roleId: props.record.id };
-  param.userIds = records.map(m => m.id).join(',');
-  gridOptions.loading = true;
-  const [err] = await to(serviceApi.post('/uums/role/addUserRole', param));
-  gridOptions.loading = false;
-  if (!err) {
-    xgrid.value.commitProxy('query');
-    showModalView.value = false;
-  }
-};
-// 抽屉关闭
-function handleClose() {
-  emit('onClose');
-}
-onBeforeMount(() => {
-  loading.value = true;
-});
-</script>
-
-<style lang="scss">
-.u-dict-config_wrapper {
-  .el-drawer__header {
-    margin-bottom: 0;
-  }
-}
-</style>
+<template>
+  <div class="u-dict-config_wrapper">
+    <el-drawer
+      :model-value="show"
+      :title="$t('message.title.authUser', { role: record.roleName })"
+      :before-close="handleClose"
+      direction="rtl"
+      destroy-on-close
+      size="80%"
+    >
+      <vxe-grid ref="xgrid" v-bind="gridOptions" v-on="gridEvents" />
+      <ut-modal-grid
+        v-if="showModalView"
+        url="/uums/user/listUserToRole"
+        :default-params="{ roleId: record.id }"
+        :items="modalFormItems"
+        :columns="modalColum"
+        :show-footer="true"
+        :editable="false"
+        :title="$t('message.udp.userList')"
+        width="60%"
+        height="75%"
+        @close="showModalView = false"
+        @confirm="onConfirm"
+      />
+    </el-drawer>
+  </div>
+</template>
+<script setup lang="ts">
+import { onBeforeMount, reactive, ref } from 'vue';
+import { VxeGridProps, VxeGridListeners, VxeGridInstance } from 'vxe-table';
+import to from 'await-to-js';
+import { getServiceApi } from '../../../api';
+
+interface IProps {
+  record: IRecord;
+  show: boolean;
+  direction?: string;
+}
+
+const props = withDefaults(defineProps<IProps>(), {
+  record: (): IRecord => {
+    return {};
+  },
+  show: false,
+  direction: 'rtl'
+});
+const loading = ref(false);
+const showModalView = ref(false);
+
+const serviceApi = getServiceApi();
+
+const emit = defineEmits<{
+  (e: 'onClose'): void;
+}>();
+const formItems: IFormItemProps[] = [
+  {
+    field: 'userName',
+    title: 'message.udp.userCode',
+    span: 8,
+    itemRender: { name: '$input' }
+  },
+  {
+    field: 'name',
+    title: 'message.udp.userName',
+    span: 8,
+    itemRender: { name: '$input' }
+  },
+  {
+    span: 8,
+    align: 'right',
+    itemRender: {
+      name: '$buttons',
+      children: [
+        {
+          props: {
+            type: 'submit',
+            content: 'message.btn.search',
+            icon: 'ri-search-line',
+            status: 'primary'
+          }
+        },
+        { props: { type: 'reset', icon: 'ri-refresh-line', content: 'message.btn.reset' } }
+      ]
+    }
+  }
+];
+// 列字段
+const columns: ITableColProps[] = [
+  { type: 'checkbox', width: 50, align: 'center' },
+  {
+    field: 'userName',
+    title: 'message.udp.userCode'
+  },
+  {
+    field: 'name',
+    title: 'message.udp.userName'
+  },
+  {
+    field: 'enabled',
+    title: 'message.enabled',
+    width: 70,
+    editRender: {
+      name: '$select',
+      options: [
+        { label: '启用', value: '1' },
+        { label: '禁用', value: '0' }
+      ],
+      defaultValue: '1'
+    }
+  }
+];
+// 新增/删除/保存
+const buttons = [
+  { code: 'add', name: 'message.btn.add', status: 'u-cyan', icon: 'ri-add-line' },
+  { code: 'delete', name: 'message.btn.del', status: 'danger', icon: 'ri-delete-bin-5-fill' }
+];
+const modalFormItems = [
+  { field: 'userName', title: 'message.udp.userCode', span: 9 },
+  { field: 'name', title: 'message.udp.userName', span: 9 }
+];
+const modalColum = [
+  { type: 'checkbox', width: 40 },
+  { field: 'userName', title: 'message.udp.userCode' },
+  { field: 'name', title: 'message.udp.userName' },
+  { field: 'enabled', width: 70, formatter: ['formatDict', 'SU.ENABLE'] }
+];
+const xgrid = ref({} as VxeGridInstance);
+const gridOptions = reactive<VxeGridProps>({
+  height: 'auto',
+  border: true,
+  pagerConfig: {},
+  toolbarConfig: { buttons, perfect: true },
+  loading: false,
+  formConfig: { titleWidth: 100, titleAlign: 'right', items: formItems },
+  // data: props.record.children,
+  proxyConfig: {
+    form: true, // 查询是需要启用表单代理
+    ajax: {
+      // 接收 Promise
+      query: ({ page, form }) => {
+        const queryParams = Object.assign({}, form);
+        queryParams.id = props.record.id;
+        queryParams.pageNum = page.currentPage;
+        queryParams.pageSize = page.pageSize;
+        return serviceApi.get('/uums/user/listRoleUsers', queryParams);
+      },
+      // body 对象： { removeRecords }
+      delete: ({ body: { removeRecords } }) => {
+        const param = {
+          roleId: props.record.id,
+          userIds: removeRecords.map(v => v.id).join()
+        };
+        return serviceApi.delete('/uums/role/deleteRoleUsers', param);
+      }
+    }
+  },
+  columns
+});
+// grid点击事件监听
+const gridEvents: VxeGridListeners = {
+  toolbarButtonClick({ code }) {
+    if (code === 'add') {
+      showModalView.value = true;
+    }
+  }
+};
+// 监听modal table确定
+const onConfirm = async records => {
+  const param = { userIds: '', roleId: props.record.id };
+  param.userIds = records.map(m => m.id).join(',');
+  gridOptions.loading = true;
+  const [err] = await to(serviceApi.post('/uums/role/addUserRole', param));
+  gridOptions.loading = false;
+  if (!err) {
+    xgrid.value.commitProxy('query');
+    showModalView.value = false;
+  }
+};
+// 抽屉关闭
+function handleClose() {
+  emit('onClose');
+}
+onBeforeMount(() => {
+  loading.value = true;
+});
+</script>
+
+<style lang="scss">
+.u-dict-config_wrapper {
+  .el-drawer__header {
+    margin-bottom: 0;
+  }
+}
+</style>