@utogether/udp-core 1.0.1 → 1.0.2

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

@@ -16,13 +16,8 @@
       mode="form"
       @toolbarButtonClick="handleToolClick"
     />
-    <MenuInfo
-      :show="data.showDrawer"
-      :record="data.record"
-      :data-status="data.dataStatus"
-      @onClose="onClose"
-    />
-    <AuthorityPanel :show="data.showAuthority" :record="data.record" @onClose="onClose" />
+    <MenuInfo :show="data.showDrawer" :record="data.record" :data-status="data.dataStatus" @close="onClose" />
+    <AuthorityPanel :show="data.showAuthority" :record="data.record" @close="onClose" />
   </div>
 </template>
 
@@ -63,6 +58,8 @@ const xgrid = ref(null);
 
 const url = '/uums/menu';
 
+let row;
+
 // const buttons = [{ code: 'add', status: 'u-cyan', icon: 'plus', auth: 'add' }];
 
 const columns = [
@@ -86,22 +83,13 @@ const columns = [
     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)} />
-        );
+        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)}
-                />
+                <ut-button status="success" icon="ri-edit-box-line" content="edit" onTap={() => handleEdit(row)} />
                 {['0', '5'].includes(row.menuCategory) ? addCmp : authCmp}
               </>
             ) : null}
@@ -147,9 +135,14 @@ const handleAdd = (record?: IRecord) => {
   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;
 };
 
 // 编辑
@@ -183,7 +176,8 @@ const handleAuthorityPanel = record => {
   data.record.dispalyCode = record.permissionCode;
 };
 
-const onClose = () => {
+const onClose = (type?, record?) => {
+  type === 'submit' && (row || record) && xgrid.value.getInstance().reloadTreeExpand(row || record);
   data.record = {};
   data.showDrawer = false;
   data.showAuthority = false;

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-04-08 15:43:16
+ * @LastEditTime: 2025-11-13 18:18:01
  * @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"
@@ -112,6 +102,27 @@
           field="extraIcon"
           span="24"
         />
+        <vxe-form-item
+          :visible-method="({ data }) => data.menuCategory === '1'"
+          :title="$t('message.udp.showLink')"
+          :item-render="{
+            name: 'VxeSwitch',
+            props: { openLabel: '显示', closeLabel: '隐藏', closeValue: 'N', openValue: 'Y' }
+          }"
+          field="showLink"
+          span="24"
+        />
+        <vxe-form-item
+          :visible-method="({ data }) => data.menuCategory === '1'"
+          :title="$t('message.udp.isApprovalPage')"
+          :item-render="{
+            name: 'VxeSwitch',
+
+            props: { openLabel: '是', closeLabel: '否', closeValue: 'N', openValue: 'Y' }
+          }"
+          field="isApprovalPage"
+          span="24"
+        />
         <vxe-form-item
           v-if="['0', '5'].includes(record.menuCategory)"
           :title="$t('message.redirect')"
@@ -155,7 +166,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 +199,7 @@ watch(
 const serviceApi = getServiceApi();
 
 const { t } = useI18n();
-const rules: VxeFormPropTypes.Rules = {
+const rules = {
   menuCode: [
     {
       required: true,
@@ -242,7 +252,7 @@ const authority = ref(['fetch']);
 const url = '/uums/menu';
 
 const emit = defineEmits<{
-  (e: 'onClose', type): void;
+  (e: 'close', type, data?): void;
 }>();
 
 const getPrefixCode = () => {
@@ -261,6 +271,7 @@ const onSubmit = () => {
   xForm.value.validate(async valid => {
     if (!valid) {
       loading.value = true;
+      let resData;
       const { record, dataStatus } = props;
       if (dataStatus === 'add') {
         record.permissionCode = `${prefixCode.value}.${record.dispalyCode}`;
@@ -276,14 +287,20 @@ const onSubmit = () => {
               sort: (idx + 1) * 10
             };
           });
-          await to(serviceApi.post(url, dataList));
+          const [err, res] = await to(serviceApi.post(url, dataList));
+          if (!err) {
+            // props.record.children.push(...res);
+            resData = res[0];
+          }
         }
         loading.value = false;
       } else {
+        record.permissionCode = record.dispalyCode;
         await to(serviceApi.put(url, [record]));
         loading.value = false;
+        resData = record;
       }
-      handleClose('submit');
+      handleClose('submit', resData);
     }
   });
 };
@@ -304,8 +321,8 @@ const getLovList = code => {
   });
 };
 // 抽屉关闭
-function handleClose(type) {
-  emit('onClose', type);
+function handleClose(type, data?) {
+  emit('close', type, data);
 }
 </script>
 
@@ -324,7 +341,6 @@ function handleClose(type) {
 }
 
 .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 />

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

@@ -17,7 +17,9 @@
         :columns="modalColum"
         :show-footer="true"
         :editable="false"
+        :title="$t('message.udp.userList')"
         width="60%"
+        height="75%"
         @close="showModalView = false"
         @confirm="onConfirm"
       />
@@ -54,13 +56,13 @@ const emit = defineEmits<{
 const formItems: IFormItemProps[] = [
   {
     field: 'userName',
-    title: 'message.userCode',
+    title: 'message.udp.userCode',
     span: 8,
     itemRender: { name: '$input' }
   },
   {
     field: 'name',
-    title: 'message.userName',
+    title: 'message.udp.userName',
     span: 8,
     itemRender: { name: '$input' }
   },
@@ -88,11 +90,11 @@ const columns: ITableColProps[] = [
   { type: 'checkbox', width: 50, align: 'center' },
   {
     field: 'userName',
-    title: 'message.userCode'
+    title: 'message.udp.userCode'
   },
   {
     field: 'name',
-    title: 'message.userName'
+    title: 'message.udp.userName'
   },
   {
     field: 'enabled',
@@ -114,18 +116,18 @@ const buttons = [
   { 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' }
+  { 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.userCode' },
-  { field: 'name', title: 'message.userName' },
+  { 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: 560,
+  height: 'auto',
   border: true,
   pagerConfig: {},
   toolbarConfig: { buttons, perfect: true },

package/src/views/system/role-assign/RoleAssign.vue

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2021-11-26 14:37:07
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2024-06-24 20:20:57
+ * @LastEditTime: 2025-08-06 17:55:03
  * @Description: 角色分配业务单元
 -->
 <template>
@@ -11,7 +11,7 @@
       <ScrollPane
         :title="$t('SuOrg')"
         :tree-otions="{ children: 'children', label: 'orgName' }"
-        extParam="{ pageSize: 500 }"
+        :default-params="{ pageSize: 500 }"
         url="/uums/org"
       />
     </div>

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

@@ -5,9 +5,11 @@
       :items="formItems"
       :columns="gridCol"
       :default-params="data.fetchExtParam"
+      :default-value="data.fetchExtParam"
       :buttons="buttons"
       :auto-load="false"
       :url="url"
+      :check-method="checkMethod"
       mode="form"
       @buttonClick="onButtonClick"
     />
@@ -18,8 +20,10 @@
       :columns="columns"
       :show-footer="true"
       :editable="false"
+      :title="$t('message.udp.roleList')"
       url="/uums/role"
       width="60%"
+      height="75%"
       @close="data.showModalView = false"
       @confirm="onConfirm"
     />
@@ -61,8 +65,8 @@ watch(
 const buttons = [{ code: 'del', auth: '/' }];
 
 const formItems = [
-  { field: 'roleName', title: 'message.udp.roleName' },
-  { field: 'roleCode', title: 'message.udp.roleCode' }
+  { field: 'roleName', title: 'message.udp.roleName', span: 9 },
+  { field: 'roleCode', title: 'message.udp.roleCode', span: 9 }
 ];
 
 const columns = [
@@ -80,14 +84,9 @@ gridCol.push({
   fixed: 'right',
   slots: {
     default: ({ row }) => {
+      if (row.roleCode === 'admin') return null;
       return [
-        <ut-button
-          icon="ri-delete-bin-5-fill"
-          content="del"
-          status="danger"
-          auth="del"
-          onTap={() => handleDel(row)}
-        />
+        <ut-button icon="ri-delete-bin-5-fill" content="del" status="danger" auth="del" onTap={() => handleDel(row)} />
       ];
     }
   }
@@ -130,6 +129,10 @@ const onConfirm = async records => {
   }
 };
 
+const checkMethod = row => {
+  return row.roleCode !== 'admin';
+};
+
 const onButtonClick = code => {
   code === 'add' && handleAdd();
 };

package/src/views/system/sys/sys-config.vue

@@ -1,20 +1,7 @@
 <template>
-  <div v-spinning="loading" class="flex flex-col items-center bg-white u-system-config">
-    <div class="flex justify-end w-1/2 p-2">
-      <el-button type="primary" @click="submitForm(xfrom)">
-        {{ $t('message.btn.confirm') }}
-      </el-button>
-    </div>
-    <div class="flex w-1/2 p-2 overflow-y-auto border border-gray-300 rounded-md">
-      <el-form
-        ref="xfrom"
-        :model="record"
-        :rules="rules"
-        label-width="90"
-        size="small"
-        status-icon
-        class="w-full"
-      >
+  <div v-spinning="loading" class="flex flex-col items-center pt-20 bg-white u-system-config">
+    <div class="flex w-1/2 p-3 overflow-y-auto border border-gray-300 rounded-md">
+      <el-form ref="xfrom" :model="record" :rules="rules" label-width="90" size="small" status-icon class="w-full">
         <el-form-item :label="$t('message.udp.systemTitle')" prop="title">
           <el-input v-model="record.title" />
         </el-form-item>
@@ -33,6 +20,26 @@
         <el-form-item :label="$t('message.udp.i18nEnabled')" prop="i18nEnabled">
           <el-switch v-model="record.i18nEnabled" active-value="Y" inactive-value="N" />
         </el-form-item>
+        <el-form-item :label="$t('message.udp.orgTaggle')" prop="orgTaggle">
+          <el-switch v-model="record.orgTaggle" active-value="Y" inactive-value="N" />
+        </el-form-item>
+        <el-form-item :label="$t('message.udp.showTitle')" prop="showTitle">
+          <el-switch v-model="record.showTitle" active-value="Y" inactive-value="N" />
+        </el-form-item>
+        <el-form-item
+          v-if="['liwei', 'yanhuaijun', 'phr', 'zhonglijun', 'ccl'].includes(cookies.get(kLOGINER))"
+          :label="$t('message.udp.techSupport')"
+          prop="techSupport"
+        >
+          <el-switch v-model="record.techSupport" active-value="Y" inactive-value="N" />
+        </el-form-item>
+        <el-form-item
+          v-if="['liwei', 'yanhuaijun', 'phr', 'zhonglijun', 'ccl'].includes(cookies.get(kLOGINER))"
+          :label="$t('message.udp.baseColor')"
+          prop="baseColor"
+        >
+          <vxe-color-picker v-model="record.baseColor" :colors="colorList" type="hex" clearable transfer />
+        </el-form-item>
         <el-form-item :label="$t('message.udp.systemLogo')">
           <el-upload
             v-model:file-list="record.logo"
@@ -100,6 +107,11 @@
         </el-form-item>
       </el-form>
     </div>
+    <div class="flex justify-end w-1/2 p-2">
+      <el-button type="primary" @click="submitForm(xfrom)">
+        {{ $t('message.btn.confirm') }}
+      </el-button>
+    </div>
   </div>
 </template>
 
@@ -110,7 +122,7 @@ import { useI18n } from 'vue-i18n';
 import to from 'await-to-js';
 import { successMessage, cookies, warnMessage } from '@utogether/utils';
 import { isArray } from 'xe-utils';
-import { kTOKEN } from '../../../contant';
+import { kTOKEN, kLOGINER } from '../../../contant';
 import { getServiceApi, getBaseURL } from '../../../api';
 
 const xfrom = ref<FormInstance>();
@@ -119,7 +131,11 @@ const record = reactive({
   defaultLanguage: 'zh',
   title: 'U-DP',
   ispTitle: 'U-DP',
-  i18nEnabled: 'Y',
+  baseColor: '#FFF',
+  i18nEnabled: 'N',
+  orgTaggle: 'Y',
+  showTitle: 'Y',
+  techSupport: 'Y',
   copyright: '深圳友聚信息技术有限公司',
   logo: [],
   backgroundImg: [],
@@ -134,6 +150,39 @@ const baseUrl = ref(getBaseURL());
 const url = '/upfm/v1/sysConfig';
 let dataList = [];
 
+const colorList = [
+  '#DC143C',
+  '#FF1493',
+  '#FF00FF',
+  '#9932CC',
+  '#6A5ACD',
+  '#0000FF',
+  '#00008B',
+  '#778899',
+  '#1E90FF',
+  '#00BFFF',
+  '#5F9EA0',
+  '#00FFFF',
+  '#008080',
+  '#7FFFAA',
+  '#3CB371',
+  '#8FBC8F',
+  '#008000',
+  '#7CFC00',
+  '#556B2F',
+  '#FFFFE0',
+  '#FFFF00',
+  '#808000',
+  '#EEE8AA',
+  '#FFD700',
+  '#FFA500',
+  '#FF4500',
+  '#FA8072',
+  '#FF0000',
+  '#800000',
+  '#C0C0C0'
+];
+
 const rules = reactive<FormRules>({
   defaultLanguage: [
     {
@@ -142,9 +191,7 @@ const rules = reactive<FormRules>({
       trigger: 'blur'
     }
   ],
-  title: [
-    { required: true, message: t('message.required') + t('message.udp.systemTitle'), trigger: 'blur' }
-  ]
+  title: [{ required: true, message: t('message.required') + t('message.udp.systemTitle'), trigger: 'blur' }]
 });
 
 const headers = computed(() => {
@@ -266,6 +313,8 @@ onMounted(() => {
 </script>
 <style lang="scss">
 .u-system-config {
+  padding-top: 48px;
+
   .el-select,
   .el-select--small {
     width: 100%;