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

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

@@ -1,282 +1,278 @@
-<template>
-  <div class="page">
-    <ut-grid
-      ref="xgrid"
-      :columns="columns"
-      :items="formItems"
-      :url="url"
-      :auto-load="false"
-      :default-params="defaultParams"
-      :default-value="defaultParams"
-      :events="onGridEvents"
-    />
-    <!-- 编辑用户信息 -->
-    <vxe-modal v-model="data.showModelView" title="用户信息" width="300">
-      <template #default>
-        <vxe-form ref="xForm" :data="data.record" :rules="rules" title-align="right">
-          <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-select>
-            </template>
-          </vxe-form-item>
-          <vxe-form-item
-            :title="$t('message.userCode')"
-            :item-render="{ name: 'input', attrs: { disabled: data.dataStatus === 'update' } }"
-            field="userName"
-            span="24"
-          />
-          <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')"
-            :item-render="{ name: 'input' }"
-            field="userPwd"
-            span="24"
-          />
-          <vxe-form-item align="right" span="24">
-            <template #default>
-              <ut-button content="cancel" icon="ri-close-fill" @click="handleClose" />
-              <ut-button content="confirm" icon="ri-save-3-fill" status="u-cyan" @click="onSubmit" />
-            </template>
-          </vxe-form-item>
-        </vxe-form>
-      </template>
-    </vxe-modal>
-    <!-- 用户角色 -->
-    <vxe-modal v-model="data.showUserRole" :title="$t('message.title.roleInfo')" width="600">
-      <template #default>
-        <vxe-table height="300" :data="data.roleList" border>
-          <vxe-column type="seq" width="60" />
-          <vxe-column field="roleName" :title="$t('message.udp.roleName')" />
-          <vxe-column field="roleDesc" :title="$t('message.udp.roleDesc')" />
-        </vxe-table>
-      </template>
-    </vxe-modal>
-    <vxe-modal v-model="data.showAuth" :title="$t('message.title.authority')" height="300" width="360">
-      <template #default>
-        <el-tree-v2
-          ref="xTree"
-          :data="data.roleList"
-          :props="{ children: 'children', label: 'menuName' }"
-          :height="420"
-          node-key="id"
-        />
-      </template>
-    </vxe-modal>
-  </div>
-</template>
-
-<script setup lang="tsx">
-import { useI18n } from 'vue-i18n';
-import { ref, reactive, inject, nextTick, onMounted } from 'vue';
-import to from 'await-to-js';
-import { useRender, errorMessage, warnMessage, delay } from '@utogether/utils';
-import { VxeUI, VxeFormPropTypes } from 'vxe-pc-ui';
-import { isEmpty } from 'xe-utils';
-import { getServiceApi } from '../../../api';
-
-const data = reactive<IRecord>({
-  record: {},
-  listQuery: {},
-  dataList: [],
-  roleList: [],
-  submitLoading: false,
-  showModelView: false,
-  showUserRole: false,
-  showAuth: false,
-  dataStatus: ''
-});
-
-const serviceApi = getServiceApi();
-const { t } = useI18n();
-
-const rules: VxeFormPropTypes.Rules = {
-  userName: [
-    {
-      required: true,
-      message: `${t('message.required')}${t('message.userCode')}`
-    }
-  ],
-  name: [
-    {
-      required: true,
-      message: `${t('message.required')}${t('message.userName')}`
-    }
-  ],
-  unitId: [
-    {
-      required: true,
-      message: `${t('message.required')}${t('message.unitName')}`
-    }
-  ],
-  userPwd: [
-    {
-      required: true,
-      message: `${t('message.required')}${t('message.userPwd')}`
-    }
-  ]
-};
-const renderHook = useRender();
-const defaultParams = ref({});
-const treeList: IRecord[] = inject('treeList');
-
-const url = '/uums/user';
-
-const xgrid = ref(null);
-
-const formItems = [
-  { field: 'name', title: 'message.userName' },
-  { field: 'userName', title: 'message.userCode' }
-];
-
-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: 'type',
-    title: 'message.sysType',
-    formatter: ['formatDict', 'SU.ENABLE'],
-    editRender: renderHook.renderDict('SU.USER.TYPE')
-  },
-  {
-    field: 'userPwd',
-    required: true,
-    width: 150,
-    editRender: renderHook.renderInput(),
-    formatter: () => '*******'
-  },
-  { field: 'enabled', width: 80, cellRender: renderHook.renderEnabled(handleClick) },
-  {
-    field: 'operate',
-    width: 240,
-    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)}
-            />
-          </>
-        ];
-      }
-    }
-  }
-];
-
-// 启用/禁用
-async function handleClick({ row }) {
-  await to(serviceApi.put(url, [row]));
-  xgrid.value.refreshData();
-}
-
-/**
- * @description: 查看用户角色
- * @param {*} row 用户行
- * @return {*}
- */
-const handleRole = async (row: any) => {
-  const serverData = await serviceApi.get(url + '/getUserRole', { userName: row.userName });
-  data.roleList = serverData[0]?.sysRoles;
-  nextTick(() => {
-    data.showUserRole = true;
-  });
-};
-/**
- * @description: 密码重置
- * @param {*} row 用户信息
- * @return {*}
- */
-const handleResetPwd = async (row: Object) => {
-  await serviceApi.put(url + '/resetPwd', row);
-  await VxeUI.modal.alert(t('message.tip.initPassword'));
-};
-// 启用/禁用
-// const handleUpdate = async (record: IRecord) => {
-//   record.enabled = record.enabled === '1' ? '0' : '1';
-//   await serviceApi.put(url, record);
-//   getDataList();
-// };
-/**
- * @description: 用户权限
- * @param {*} row 用户信息
- * @return {*}
- */
-const handleAuth = async row => {
-  const [err, res] = await to(serviceApi.get(url + '/getUserRole', { userName: row.userName }));
-  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);
-
-const onSubmit = () => {
-  xForm.value.validate(async valid => {
-    if (!valid) {
-      const { record, dataStatus } = data;
-      if (dataStatus === 'add') {
-        await serviceApi.post(url, record);
-      } else {
-        await serviceApi.put(url, record);
-      }
-      handleClose();
-    }
-  });
-};
-
-const handleClose = () => {
-  data.showModelView = false;
-};
-const getUnitList = () => {
-  serviceApi
-    .get('/uums/unit', { pageSize: 10 })
-    .then(async res => {
-      defaultParams.value = { unitId: res[0].id, enabled: '1' };
-      await delay(100);
-      xgrid.value.refreshData();
-    })
-    .catch(() => {
-      errorMessage('获取租户失败,刷新后重试');
-    });
-};
-
-onMounted(() => {
-  getUnitList();
-});
-</script>
+<template>
+  <div class="page">
+    <ut-grid
+      ref="xgrid"
+      :columns="columns"
+      :items="formItems"
+      :url="url"
+      :auto-load="false"
+      :default-params="defaultParams"
+      :default-value="defaultParams"
+      :events="onGridEvents"
+    />
+    <!-- 编辑用户信息 -->
+    <vxe-modal v-model="data.showModelView" title="用户信息" width="300">
+      <template #default>
+        <vxe-form ref="xForm" :data="data.record" :rules="rules" title-align="right">
+          <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-select>
+            </template>
+          </vxe-form-item>
+          <vxe-form-item
+            :title="$t('message.userCode')"
+            :item-render="{ name: 'input', attrs: { disabled: data.dataStatus === 'update' } }"
+            field="userName"
+            span="24"
+          />
+          <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')"
+            :item-render="{ name: 'input' }"
+            field="userPwd"
+            span="24"
+          />
+          <vxe-form-item align="right" span="24">
+            <template #default>
+              <ut-button content="cancel" icon="ri-close-fill" @click="handleClose" />
+              <ut-button content="confirm" icon="ri-save-3-fill" status="u-cyan" @click="onSubmit" />
+            </template>
+          </vxe-form-item>
+        </vxe-form>
+      </template>
+    </vxe-modal>
+    <!-- 用户角色 -->
+    <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" />
+          <vxe-column field="roleName" :title="$t('message.udp.roleName')" />
+          <vxe-column field="roleDesc" :title="$t('message.udp.roleDesc')" />
+        </vxe-table>
+      </template>
+    </vxe-modal>
+
+    <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="560"
+          node-key="id"
+        />
+      </template>
+    </vxe-modal>
+  </div>
+</template>
+
+<script setup lang="tsx">
+import { useI18n } from 'vue-i18n';
+import { ref, reactive, inject, onMounted } from 'vue';
+import to from 'await-to-js';
+import { useRender, errorMessage, warnMessage, delay } from '@utogether/utils';
+import { VxeUI, VxeFormPropTypes } from 'vxe-pc-ui';
+import { isEmpty } from 'xe-utils';
+import { getServiceApi } from '../../../api';
+
+const data = reactive<IRecord>({
+  record: {},
+  listQuery: {},
+  dataList: [],
+  roleList: [],
+  submitLoading: false,
+  showModelView: false,
+  showUserRole: false,
+  showAuth: false,
+  dataStatus: ''
+});
+
+const serviceApi = getServiceApi();
+const { t } = useI18n();
+
+const rules: VxeFormPropTypes.Rules = {
+  userName: [
+    {
+      required: true,
+      message: `${t('message.required')}${t('message.userCode')}`
+    }
+  ],
+  name: [
+    {
+      required: true,
+      message: `${t('message.required')}${t('message.userName')}`
+    }
+  ],
+  unitId: [
+    {
+      required: true,
+      message: `${t('message.required')}${t('message.unitName')}`
+    }
+  ],
+  userPwd: [
+    {
+      required: true,
+      message: `${t('message.required')}${t('message.userPwd')}`
+    }
+  ]
+};
+const renderHook = useRender();
+const defaultParams = ref({});
+const treeList: IRecord[] = inject('treeList');
+const loading = ref(false);
+
+const url = '/uums/user';
+
+const xgrid = ref(null);
+
+const formItems = [
+  { field: 'name', title: 'message.udp.userName' },
+  { field: 'userName', title: 'message.udp.userCode' }
+];
+
+const columns = [
+  { type: 'checkbox', width: 40, align: 'center' },
+  { field: 'userName', title: 'message.udp.userCode', required: true, editRender: renderHook.renderInput() },
+  { field: 'name', title: 'message.udp.userName', required: true, editRender: renderHook.renderInput() },
+  {
+    field: 'type',
+    title: 'message.udp.userType',
+    formatter: ['formatDict', 'SU.USER.TYPE'],
+    editRender: renderHook.renderDict('SU.USER.TYPE')
+  },
+  {
+    field: 'userPwd',
+    required: true,
+    width: 150,
+    editRender: renderHook.renderInput(),
+    formatter: () => '*******'
+  },
+  { field: 'enabled', width: 80, cellRender: renderHook.renderEnabled(handleClick) },
+  {
+    field: 'operate',
+    width: 240,
+    fixed: 'right',
+    slots: {
+      default: ({ row }) => {
+        if (!row.id) return null;
+        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)} />
+          </>
+        ];
+      }
+    }
+  }
+];
+
+// 启用/禁用
+async function handleClick({ row }) {
+  await to(serviceApi.put(url, [row]));
+  xgrid.value.refreshData();
+}
+
+/**
+ * @description: 查看用户角色
+ * @param {*} 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(() => {
+  // });
+};
+/**
+ * @description: 密码重置
+ * @param {*} row 用户信息
+ * @return {*}
+ */
+const handleResetPwd = async (row: Object) => {
+  await serviceApi.put(url + '/resetPwd', row);
+  await VxeUI.modal.alert(t('message.tip.initPassword'));
+};
+// 启用/禁用
+// const handleUpdate = async (record: IRecord) => {
+//   record.enabled = record.enabled === '1' ? '0' : '1';
+//   await serviceApi.put(url, record);
+//   getDataList();
+// };
+/**
+ * @description: 用户权限
+ * @param {*} row 用户信息
+ * @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;
+    } 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);
+
+const onSubmit = () => {
+  xForm.value.validate(async valid => {
+    if (!valid) {
+      const { record, dataStatus } = data;
+      if (dataStatus === 'add') {
+        await serviceApi.post(url, record);
+      } else {
+        await serviceApi.put(url, record);
+      }
+      handleClose();
+    }
+  });
+};
+
+const handleClose = () => {
+  data.showModelView = false;
+};
+const getUnitList = () => {
+  serviceApi
+    .get('/uums/unit', { pageSize: 10 })
+    .then(async res => {
+      defaultParams.value = { unitId: res[0].id, enabled: '1' };
+      await delay(100);
+      xgrid.value.refreshData();
+    })
+    .catch(() => {
+      errorMessage('获取租户失败,刷新后重试');
+    });
+};
+
+onMounted(() => {
+  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-11 14:58:55
  * @Description: 托盘管理
 -->
 
@@ -13,10 +13,11 @@
       v-if="showModalForm"
       :record="record"
       :items="items"
-      :width="360"
-      :height="340"
+      :width="420"
+      :height="400"
       :title="$t('message.title.appAdd')"
       :url="url"
+      class="ut-app-form"
       data-status="add"
       @close="showModalForm = false"
       @confirm="onConfirm"
@@ -56,10 +57,16 @@ 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',
@@ -139,18 +146,29 @@ const onButtonClick = code => {
 };
 
 const items = [
-  { field: 'appVersion', title: 'mesage.udp.appVersion', required: true },
-  { field: 'buildNo', title: 'mesage.udp.buildNo', required: true },
+  { 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: 'mesage.udp.versionInfo',
+    title: 'message.udp.versionInfo',
     required: true,
     itemRender: renderHook.renderTextarea()
   },
   {
     field: 'downloadUrl',
     required: false,
-    title: 'mesage.udp.downloadUrl',
+    title: 'message.udp.downloadUrl',
     itemRender: { name: '#upload', props: { baseUrl: baseURL } }
   }
 ];
@@ -180,3 +198,10 @@ const onConfirm = () => {
   xgrid.value.refreshData();
 };
 </script>
+<style lang="scss" scoped>
+.ut-app-form {
+  ::v-deep(.vxe-switch--label) {
+    width: 100%;
+  }
+}
+</style>