@utogether/udp-core 1.0.1-beta.2 → 1.0.1-beta.21

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,23 @@
         <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
+          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 +104,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 +119,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 +128,10 @@ const record = reactive({
   defaultLanguage: 'zh',
   title: 'U-DP',
   ispTitle: 'U-DP',
-  i18nEnabled: 'Y',
+  baseColor: '#FFF',
+  i18nEnabled: 'N',
+  orgTaggle: 'Y',
+  techSupport: 'Y',
   copyright: '深圳友聚信息技术有限公司',
   logo: [],
   backgroundImg: [],
@@ -134,6 +146,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 +187,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 +309,8 @@ onMounted(() => {
 </script>
 <style lang="scss">
 .u-system-config {
+  padding-top: 48px;
+
   .el-select,
   .el-select--small {
     width: 100%;

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

@@ -5,7 +5,9 @@
       :columns="columns"
       :items="formItems"
       :url="url"
-      :default-params="paramExt"
+      :auto-load="false"
+      :default-params="defaultParams"
+      :default-value="defaultParams"
       :events="onGridEvents"
     />
     <!-- 编辑用户信息 -->
@@ -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,13 +54,20 @@
         </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>
@@ -78,9 +77,9 @@
 
 <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 } from '@utogether/utils';
 import { VxeUI, VxeFormPropTypes } from 'vxe-pc-ui';
 import { isEmpty } from 'xe-utils';
 import { getServiceApi } from '../../../api';
@@ -127,26 +126,28 @@ 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';
 
 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', required: true, editRender: renderHook.renderInput() },
+  { field: 'name', title: 'message.udp.userName', required: true, editRender: renderHook.renderInput() },
   {
     field: 'type',
-    title: 'message.sysType',
-    formatter: ['formatDict', 'SU.ENABLE'],
+    title: 'message.udp.userType',
+    formatter: ['formatDict', 'SU.USER.TYPE'],
     editRender: renderHook.renderDict('SU.USER.TYPE')
   },
   {
@@ -163,21 +164,12 @@ const columns = [
     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)}
-            />
+            <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)} />
           </>
         ];
       }
@@ -197,11 +189,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: 密码重置
@@ -224,11 +219,15 @@ 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'));
     }
@@ -264,8 +263,10 @@ const handleClose = () => {
 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('获取租户失败,刷新后重试');

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>