@utogether/udp-core 1.0.1-beta.3 → 1.0.1-beta.31

package/src/views/system/sysUser/SysUserPanel.vue

@@ -5,8 +5,10 @@
       :columns="columns"
       :items="formItems"
       :url="url"
-      :default-params="paramExt"
-      :events="onGridEvents"
+      :auto-load="false"
+      :default-params="defaultParams"
+      mode="form"
+      @buttonClick="onButtonClick"
     />
     <!-- 编辑用户信息 -->
     <vxe-modal v-model="data.showModelView" title="用户信息" width="300">
@@ -15,12 +17,7 @@
           <vxe-form-item :title="$t('message.unitName')" field="unitId" span="24">
             <template #default="{ data }">
               <vxe-select v-model="data.unitId">
-                <vxe-option
-                  v-for="unit in treeList"
-                  :key="unit.id"
-                  :value="unit.id"
-                  :label="unit.unitName"
-                />
+                <vxe-option v-for="unit in treeList" :key="unit.id" :value="unit.id" :label="unit.unitName" />
               </vxe-select>
             </template>
           </vxe-form-item>
@@ -30,12 +27,7 @@
             field="userName"
             span="24"
           />
-          <vxe-form-item
-            :title="$t('message.userName')"
-            field="name"
-            span="24"
-            :item-render="{ name: 'input' }"
-          />
+          <vxe-form-item :title="$t('message.userName')" field="name" span="24" :item-render="{ name: 'input' }" />
           <vxe-form-item
             v-if="data.dataStatus === 'add'"
             :title="$t('message.userPwd')"
@@ -53,7 +45,7 @@
       </template>
     </vxe-modal>
     <!-- 用户角色 -->
-    <vxe-modal v-model="data.showUserRole" :title="$t('message.title.roleInfo')" width="600">
+    <vxe-modal v-model="data.showUserRole" :loading="loading" :title="$t('message.title.roleInfo')" width="600">
       <template #default>
         <vxe-table height="300" :data="data.roleList" border>
           <vxe-column type="seq" width="60" />
@@ -62,27 +54,49 @@
         </vxe-table>
       </template>
     </vxe-modal>
-    <vxe-modal v-model="data.showAuth" :title="$t('message.title.authority')" height="300" width="360">
+
+    <vxe-modal
+      v-model="data.showAuth"
+      :loading="loading"
+      :title="$t('message.title.authority', { role: data.record.name || '88888' })"
+      height="620"
+      width="560"
+    >
       <template #default>
         <el-tree-v2
           ref="xTree"
           :data="data.roleList"
           :props="{ children: 'children', label: 'menuName' }"
-          :height="420"
+          :height="560"
           node-key="id"
         />
       </template>
     </vxe-modal>
+
+    <ut-modal-form
+      v-if="data.showModal"
+      :record="data.record"
+      :items="data.items"
+      :width="360"
+      :height="data.height"
+      :method="!data.record.id ? 'post' : 'put'"
+      :data-process-method="dataProcessMethod"
+      :title="$t('message.title.userInfo')"
+      data-status="update"
+      :url="url"
+      @close="data.showModal = false"
+      @confirm="onConfirm"
+    />
   </div>
 </template>
 
 <script setup lang="tsx">
 import { useI18n } from 'vue-i18n';
-import { ref, reactive, inject, nextTick, onMounted } from 'vue';
+import { ref, reactive, inject, onMounted } from 'vue';
 import to from 'await-to-js';
-import { useRender, errorMessage, warnMessage } from '@utogether/utils';
+import { useRender, errorMessage, warnMessage, delay, getDictChildren } from '@utogether/utils';
 import { VxeUI, VxeFormPropTypes } from 'vxe-pc-ui';
-import { isEmpty } from 'xe-utils';
+import { clone, isEmpty } from 'xe-utils';
 import { getServiceApi } from '../../../api';
 
 const data = reactive<IRecord>({
@@ -90,9 +104,11 @@ const data = reactive<IRecord>({
   listQuery: {},
   dataList: [],
   roleList: [],
+  items: [],
   submitLoading: false,
   showModelView: false,
   showUserRole: false,
+  showModal: false,
   showAuth: false,
   dataStatus: ''
 });
@@ -127,57 +143,42 @@ const rules: VxeFormPropTypes.Rules = {
   ]
 };
 const renderHook = useRender();
-const paramExt = ref({});
+const defaultParams = ref({});
 const treeList: IRecord[] = inject('treeList');
+const loading = ref(false);
 
 const url = '/uums/user';
+let defaultPassword = '';
 
 const xgrid = ref(null);
 
 const formItems = [
-  { field: 'name', title: 'message.userName' },
-  { field: 'userName', title: 'message.userCode' }
+  { field: 'name', title: 'message.udp.userName' },
+  { field: 'userName', title: 'message.udp.userCode' },
+  { field: 'type', title: 'message.udp.userType', code: 'SU.USER.TYPE' }
 ];
 
 const columns = [
   { type: 'checkbox', width: 40, align: 'center' },
-  { field: 'userName', title: 'message.userCode', required: true, editRender: renderHook.renderInput() },
-  { field: 'name', title: 'message.userName', required: true, editRender: renderHook.renderInput() },
+  { field: 'userName', title: 'message.udp.userCode' },
+  { field: 'name', title: 'message.udp.userName' },
   {
     field: 'type',
-    title: 'message.sysType',
-    formatter: ['formatDict', 'SU.ENABLE'],
-    editRender: renderHook.renderDict('SU.USER.TYPE')
-  },
-  {
-    field: 'userPwd',
-    required: true,
-    width: 150,
-    editRender: renderHook.renderInput(),
-    formatter: () => '*******'
+    title: 'message.udp.userType',
+    formatter: ['formatDict', 'SU.USER.TYPE']
   },
   { field: 'enabled', width: 80, cellRender: renderHook.renderEnabled(handleClick) },
   {
     field: 'operate',
-    width: 240,
+    width: 150,
     fixed: 'right',
     slots: {
       default: ({ row }) => {
         return [
           <>
-            <ut-button icon="ri-user-fill" content="role" onTap={() => handleRole(row)} />
-            <ut-button
-              icon="ri-lock-fill"
-              content="auth"
-              status="success"
-              onTap={() => handleAuth(row)}
-            />
-            <ut-button
-              icon="ri-lock-fill"
-              content="passwordReset"
-              status="warning"
-              onTap={() => handleResetPwd(row)}
-            />
+            <ut-button content="edit" icon="ri-edit-line" onTap={() => handleEdit(row)} />
+
+            <ut-dropdown buttons={getButtons()} onCommand={code => handleCommand(row, code)} />
           </>
         ];
       }
@@ -185,6 +186,60 @@ const columns = [
   }
 ];
 
+const handleCommand = (row, code) => {
+  code === 'role' && handleRole(row);
+  code === 'auth' && handleAuth(row);
+  code === 'passwordReset' && handleResetPwd(row);
+};
+
+const getButtons = () => {
+  // 项目延期
+  const buttons = [
+    { code: 'role', icon: 'ri-user-fill' },
+    { code: 'auth', icon: 'ri-lock-fill' },
+    { code: 'passwordReset', icon: 'ri-lock-password-line' }
+  ];
+  return buttons;
+};
+
+const items = [
+  { field: 'userName', title: 'message.udp.userCode', required: true, disabled: false },
+  { field: 'name', title: 'message.udp.userName', required: true },
+  { field: 'type', required: true, title: 'message.udp.userType', code: 'SU.USER.TYPE' },
+  { field: 'userPwd', required: true, visibleMethod: ({ data }) => !data.id }
+];
+
+const handleAdd = () => {
+  data.record = {
+    userPwd: defaultPassword,
+    ...defaultParams.value,
+    type: 'system'
+  };
+  debugger;
+  data.items = clone(items, true);
+  data.height = 280;
+  data.showModal = true;
+};
+const handleEdit = row => {
+  data.record = clone(row, true);
+  data.items = clone(items, true);
+  data.items[0].disabled = true;
+  data.height = 240;
+  data.showModal = true;
+};
+
+const handleDel = () => {
+  xgrid.value.getInstance().commitProxy('delete');
+};
+
+const dataProcessMethod = data => {
+  return [data];
+};
+
+const onConfirm = () => {
+  xgrid.value.refreshData();
+};
+
 // 启用/禁用
 async function handleClick({ row }) {
   await to(serviceApi.put(url, [row]));
@@ -197,11 +252,14 @@ async function handleClick({ row }) {
  * @return {*}
  */
 const handleRole = async (row: any) => {
+  data.roleList = [];
+  data.showUserRole = true;
+  loading.value = true;
   const serverData = await serviceApi.get(url + '/getUserRole', { userName: row.userName });
+  loading.value = false;
   data.roleList = serverData[0]?.sysRoles;
-  nextTick(() => {
-    data.showUserRole = true;
-  });
+  // nextTick(() => {
+  // });
 };
 /**
  * @description: 密码重置
@@ -210,7 +268,7 @@ const handleRole = async (row: any) => {
  */
 const handleResetPwd = async (row: Object) => {
   await serviceApi.put(url + '/resetPwd', row);
-  await VxeUI.modal.alert(t('message.tip.initPassword'));
+  await VxeUI.modal.alert(t('message.tip.initPassword', { code: defaultPassword }));
 };
 // 启用/禁用
 // const handleUpdate = async (record: IRecord) => {
@@ -224,23 +282,21 @@ const handleResetPwd = async (row: Object) => {
  * @return {*}
  */
 const handleAuth = async row => {
+  data.roleList = [];
+  data.showAuth = true;
+  loading.value = true;
+  data.record = row;
   const [err, res] = await to(serviceApi.get(url + '/getUserRole', { userName: row.userName }));
+  loading.value = false;
   if (!err) {
     if (!isEmpty(res)) {
       data.roleList = res[0]?.sysMenuExts;
-      data.showAuth = true;
     } else {
       warnMessage(t('message.tip.emptyAuth'));
     }
   }
 };
 
-const onGridEvents = {
-  editActived({ row }) {
-    columns[1].editRender.props.disabled = !!row.id;
-    columns[4].editRender.props.disabled = !!row.id;
-  }
-};
 const xForm = ref(null);
 // const xSarchFrom = ref(null);
 
@@ -261,18 +317,32 @@ const onSubmit = () => {
 const handleClose = () => {
   data.showModelView = false;
 };
+
+const onButtonClick = code => {
+  code === 'add' && handleAdd();
+  code === 'del' && handleDel();
+};
+
 const getUnitList = () => {
   serviceApi
     .get('/uums/unit', { pageSize: 10 })
-    .then(res => {
-      paramExt.value = { unitId: res[0].id, enabled: '1' };
+    .then(async res => {
+      defaultParams.value = { unitId: res[0].id, enabled: '1' };
+      await delay(100);
+      xgrid.value.refreshData();
     })
     .catch(() => {
       errorMessage('获取租户失败,刷新后重试');
     });
 };
 
+const getDefaultPassword = () => {
+  const dict = getDictChildren('SU.DEFAULT_PASSWORD')?.find(f => f.dictCode === 'default');
+  defaultPassword = dict.dictName;
+};
+
 onMounted(() => {
+  getDefaultPassword();
   getUnitList();
 });
 </script>

package/src/views/uapp/pda/pda-app.vue

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2021-12-23 11:22:51
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-04-29 17:11:13
+ * @LastEditTime: 2025-08-16 18:01:55
  * @Description: 托盘管理
 -->
 
@@ -13,10 +13,11 @@
       v-if="showModalForm"
       :record="record"
       :items="items"
-      :width="360"
-      :height="340"
+      :width="420"
+      :height="450"
       :title="$t('message.title.appAdd')"
       :url="url"
+      class="ut-app-form"
       data-status="add"
       @close="showModalForm = false"
       @confirm="onConfirm"
@@ -31,6 +32,7 @@ import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import to from 'await-to-js';
 import { getBaseURL, getServiceApi } from '../../../api';
+// import { useRender } from '../../../utils/udp/useRender';
 import { useRender } from '@utogether/utils';
 import { clone } from 'xe-utils';
 import SuQrcode from '../../../components/SuQrcode';
@@ -56,15 +58,20 @@ const record = ref({});
 // 列字段
 const columns = [
   { type: 'checkbox', width: 45, align: 'center' },
-  // { field: 'trayTypeCode', width: 110, formatter: ['formatDict', 'SU.TRAY.TYPE'] },
-  { field: 'appVersion', width: 110 },
-  { field: 'buildNo', width: 130 },
-  { field: 'versionInfo', miWidth: 200 },
+  { field: 'appVersion', title: 'message.udp.appVersion', width: 110 },
+  { field: 'buildNo', title: 'message.udp.buildNo', width: 130 },
+  {
+    field: 'isForceUpdate',
+    title: 'message.udp.isForceUpdate',
+    width: 130,
+    formatter: ({ row }) => (row.isForceUpdate === 'Y' ? t('message.udp.forceUpdate') : t('message.udp.freeUpdate'))
+  },
+  { field: 'versionInfo', title: 'message.udp.versionInfo', miWidth: 200 },
   {
     field: 'enabled',
     title: 'message.status',
     width: 90,
-    formatter: ({ row }) => (row.enabled === '1' ? t('message.appupper') : t('message.applower'))
+    formatter: ({ row }) => (row.enabled === '1' ? t('message.udp.appupper') : t('message.udp.applower'))
   },
   { field: 'creationDate', width: 140 },
   {
@@ -77,9 +84,7 @@ const columns = [
         const status = row.enabled === '1' ? 'warning' : 'primary';
         const icon = row.enabled === '1' ? 'ri-inbox-archive-line' : 'ri-inbox-unarchive-line';
         if (row.enabled !== '1') {
-          return [
-            <ut-button content={content} icon={icon} status={status} onTap={() => handleChild(row)} />
-          ];
+          return [<ut-button content={content} icon={icon} status={status} onTap={() => handleChild(row)} />];
         }
         return [
           <>
@@ -139,13 +144,30 @@ const onButtonClick = code => {
 };
 
 const items = [
-  { field: 'appVersion', required: true },
-  { field: 'buildNo', required: true },
-  { field: 'versionInfo', required: true, itemRender: renderHook.renderTextarea() },
+  { field: 'appVersion', title: 'message.udp.appVersion', required: true },
+  { field: 'buildNo', title: 'message.udp.buildNo', required: true },
+  {
+    field: 'isForceUpdate',
+    title: 'message.udp.isForceUpdate',
+    required: true,
+    itemRender: renderHook.renderSwitch({
+      openLabel: t('message.udp.forceUpdate'),
+      closeLabel: t('message.udp.freeUpdate'),
+      openValue: 'Y',
+      closeValue: 'N'
+    })
+  },
+  {
+    field: 'versionInfo',
+    title: 'message.udp.versionInfo',
+    required: true,
+    itemRender: renderHook.renderTextarea()
+  },
   {
     field: 'downloadUrl',
     required: false,
-    itemRender: { name: '#upload', props: { baseUrl: baseURL } }
+    title: 'message.udp.downloadUrl',
+    itemRender: renderHook.renderUpload()
   }
 ];
 
@@ -155,7 +177,10 @@ const showModalForm = ref(false);
  * @description: 添加
  */
 const handleAdd = () => {
-  record.value = {};
+  record.value = {
+    // downloadUrl: 'https://vxeui.com/resource/img/fj577.jpg'
+    // downloadUrl: '/resource/image/20250817/15806d21e3f445dcae0e2e0825c76a79.jpg'
+  };
   showModalForm.value = true;
 };
 
@@ -174,3 +199,10 @@ const onConfirm = () => {
   xgrid.value.refreshData();
 };
 </script>
+<style lang="scss" scoped>
+.ut-app-form {
+  ::v-deep(.vxe-switch--label) {
+    width: 100%;
+  }
+}
+</style>