@utogether/udp-core 1.0.1-beta.5 → 1.0.1-beta.7

package/src/plugins/vxe-table/index.ts

@@ -10,8 +10,8 @@ import 'xe-utils';
 import { merge } from 'xe-utils';
 import { geti18n, transformI18n } from '../i18n/index';
 // import { storageLocal } from '@utogether/utils';
-import { VxetableRender } from '@utogether/utils';
-// import { VxetableRender } from './render';
+// import { VxetableRender } from '@utogether/utils';
+import { VxetableRender } from './render';
 import { getServiceApi } from '../../api';
 
 import VXETable, { VxeUI } from 'vxe-table';

package/src/plugins/vxe-table/render.tsx

@@ -409,6 +409,84 @@ export const VxetableRender = (VXETable, { serviceApi, i18n }) => {
       ];
     }
   });
+  // 下拉选择
+  VXETable.renderer.add('#textarea', {
+    renderTableEdit(renderOpts: VxeColumnPropTypes.EditRender, params) {
+      const { row, column } = params;
+      const { props, events } = renderOpts;
+      const { mapField } = props;
+
+      const componentHook = useComponent();
+      function onChange(val) {
+        componentHook.change(val, row, column.field, renderOpts, { column, datasource: 'row' });
+      }
+
+      function onClear() {
+        componentHook.clear(row, column.field, mapField, events, 'row');
+      }
+
+      return [
+        <vxe-textarea
+          v-model={row[column.field]}
+          {...props}
+          style="width: 100%"
+          onChange={v => onChange(v)}
+          onClear={() => onClear()}
+        />
+      ];
+    },
+    renderTableDefault(renderOpts: VxeColumnPropTypes.EditRender, params) {
+      const { row, column } = params;
+      const { props, events } = renderOpts;
+      const { mapField } = props;
+
+      const componentHook = useComponent();
+
+      function onChange(val) {
+        componentHook.change(val, row, column.field, renderOpts, { column, datasource: 'row' });
+      }
+
+      function onClear() {
+        componentHook.clear(row, column.field, mapField, events, 'row');
+      }
+
+      return [
+        <vxe-textarea v-model={row[column.field]} {...props} onChange={v => onChange(v)} onClear={() => onClear()} />
+      ];
+    },
+    // 可编辑显示模板
+    renderTableCell(renderOpts, params) {
+      const { row, column } = params;
+      return row[column.field];
+    },
+    renderItemContent(renderOpts: FormItemRenderOptions, params: FormItemContentRenderParams) {
+      const { data, field } = params;
+      const { props, events } = renderOpts;
+      const componentHook = useComponent();
+
+      // 默认值
+      const { defaultValue, mapField } = props;
+      if (defaultValue) {
+        data[field] = defaultValue;
+      }
+      /**
+       * @description: 选中值发生变化时触发
+       * @param {*} val 目前的选中值
+       */
+      function onChange(val) {
+        componentHook.change(val, data, field, renderOpts, { datasource: 'data' });
+      }
+
+      /**
+       * @description: 可清空的单选模式下用户点击清空按钮时触发
+       */
+      function onClear() {
+        componentHook.clear(data, field, mapField, events, 'data');
+      }
+
+      return [<vxe-textarea v-model={data[field]} {...props} onChange={v => onChange(v)} onClear={() => onClear()} />];
+    }
+  });
   // Lov
   VXETable.renderer.add('#lov', {
     renderItemContent(renderOpts: FormItemRenderOptions, params: FormItemContentRenderParams) {
@@ -445,7 +523,7 @@ export const VxetableRender = (VXETable, { serviceApi, i18n }) => {
           }, '');
           Object.assign(data, obj);
         }
-        const parm = { row: data, property: field, item: record, field };
+        const parm = { data, options: record, field };
         events?.change && events.change(parm);
       }
 
@@ -457,13 +535,7 @@ export const VxetableRender = (VXETable, { serviceApi, i18n }) => {
       }
 
       return [
-        <ut-lov
-          record={data}
-          {...props}
-          mode="vxe"
-          onChange={(v, f) => onChange(v, f)}
-          onClear={() => onClear()}
-        />
+        <ut-lov record={data} {...props} mode="vxe" onChange={(v, f) => onChange(v, f)} onClear={() => onClear()} />
       ];
     },
     // 单元格编辑
@@ -483,7 +555,8 @@ export const VxetableRender = (VXETable, { serviceApi, i18n }) => {
           }
           Object.assign(row, obj);
         }
-        events?.change && events.change(params, record, row[column.field]);
+        const params = { row, options: record, field: column.field, column };
+        events?.change && events.change(params);
       }
 
       function onClear() {
@@ -517,7 +590,8 @@ export const VxetableRender = (VXETable, { serviceApi, i18n }) => {
           }
           Object.assign(row, obj);
         }
-        events?.change && events.change(params, record, row[column.field]);
+        const params = { row, options: record, field: column.field, column };
+        events?.change && events.change(params);
       }
       /**
        * @description 清空数据
@@ -527,13 +601,7 @@ export const VxetableRender = (VXETable, { serviceApi, i18n }) => {
       }
 
       return [
-        <ut-lov
-          record={row}
-          mode="ele"
-          {...props}
-          onChange={(v, f) => onChange(v, f)}
-          onClear={() => onClear()}
-        />
+        <ut-lov record={row} mode="ele" {...props} onChange={(v, f) => onChange(v, f)} onClear={() => onClear()} />
       ];
     },
     // 可编辑显示模板
@@ -774,7 +842,16 @@ export const VxetableRender = (VXETable, { serviceApi, i18n }) => {
       }
       events?.clear && events.clear({ [datasource]: data, field });
     };
-    return { clear, remote, selectChange, setDefaultValue };
+    const change = (data, field, mapField, events, datasource) => {
+      data[field] = null;
+      if (!isEmpty(mapField)) {
+        for (const key in mapField) {
+          data[key] = null;
+        }
+      }
+      events?.change && events.change({ [datasource]: data, field });
+    };
+    return { clear, change, remote, selectChange, setDefaultValue };
   };
 
   /**

package/src/views/login/login-view.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="select-none">
-    <div class="absolute flex-c right-5 top-3">
+    <div class="absolute flex justify-center items-center right-5 top-3">
       <!-- 主题 -->
       <!-- <el-switch
         v-model="dataTheme"

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"
       />
@@ -114,8 +116,8 @@ 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.userCode', span: 9 },
+  { field: 'name', title: 'message.userName', span: 9 }
 ];
 const modalColum = [
   { type: 'checkbox', width: 40 },
@@ -125,7 +127,7 @@ const modalColum = [
 ];
 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

@@ -1,57 +1,57 @@
-<!--
- * @Author: wei.li
- * @Date: 2021-11-26 14:37:07
- * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2024-06-24 20:20:57
- * @Description: 角色分配业务单元
--->
-<template>
-  <div class="u-content-panel">
-    <div class="u-left-panel">
-      <ScrollPane
-        :title="$t('SuOrg')"
-        :tree-otions="{ children: 'children', label: 'orgName' }"
-        extParam="{ pageSize: 500 }"
-        url="/uums/org"
-      />
-    </div>
-    <div class="content">
-      <role-panel />
-    </div>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { ref, provide } from 'vue';
-import ScrollPane from '../../../components/SuScrollTree/ScrollPanel.vue';
-import RolePanel from './RolePanel.vue';
-const active: any = ref({});
-const scrollPanelChange: any = ref(false);
-const treeList: any = ref([]);
-provide('active', active);
-
-provide('scrollPanelChange', scrollPanelChange);
-
-provide('treeList', treeList);
-</script>
-
-<style lang="scss" scoped>
-.u-content-panel {
-  box-sizing: border-box;
-  display: flex;
-  width: 100%;
-  height: 84vh;
-  padding: 5px;
-
-  .u-left-panel {
-    width: 250px;
-  }
-
-  .content {
-    flex: 1;
-    width: calc(100% - 250px);
-    height: 82vh;
-    margin: 0 10px;
-  }
-}
-</style>
+<!--
+ * @Author: wei.li
+ * @Date: 2021-11-26 14:37:07
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-08-06 17:55:03
+ * @Description: 角色分配业务单元
+-->
+<template>
+  <div class="u-content-panel">
+    <div class="u-left-panel">
+      <ScrollPane
+        :title="$t('SuOrg')"
+        :tree-otions="{ children: 'children', label: 'orgName' }"
+        :default-params="{ pageSize: 500 }"
+        url="/uums/org"
+      />
+    </div>
+    <div class="content">
+      <role-panel />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { ref, provide } from 'vue';
+import ScrollPane from '../../../components/SuScrollTree/ScrollPanel.vue';
+import RolePanel from './RolePanel.vue';
+const active: any = ref({});
+const scrollPanelChange: any = ref(false);
+const treeList: any = ref([]);
+provide('active', active);
+
+provide('scrollPanelChange', scrollPanelChange);
+
+provide('treeList', treeList);
+</script>
+
+<style lang="scss" scoped>
+.u-content-panel {
+  box-sizing: border-box;
+  display: flex;
+  width: 100%;
+  height: 84vh;
+  padding: 5px;
+
+  .u-left-panel {
+    width: 250px;
+  }
+
+  .content {
+    flex: 1;
+    width: calc(100% - 250px);
+    height: 82vh;
+    margin: 0 10px;
+  }
+}
+</style>