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

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

@@ -1,136 +1,139 @@
-<template>
-  <div v-spinning="data.loading" class="page-content">
-    <ut-grid
-      ref="xgrid"
-      :items="formItems"
-      :columns="gridCol"
-      :default-params="data.fetchExtParam"
-      :buttons="buttons"
-      :auto-load="false"
-      :url="url"
-      mode="form"
-      @buttonClick="onButtonClick"
-    />
-    <ut-modal-grid
-      v-if="data.showModalView"
-      ref="xmodal"
-      :items="formItems"
-      :columns="columns"
-      :show-footer="true"
-      :editable="false"
-      url="/uums/role"
-      width="60%"
-      @close="data.showModalView = false"
-      @confirm="onConfirm"
-    />
-  </div>
-</template>
-
-<script setup lang="tsx">
-import { useI18n } from 'vue-i18n';
-import { ref, reactive, watch, inject, nextTick } from 'vue';
-import { clone } from 'xe-utils';
-import { VxeUI } from 'vxe-pc-ui';
-import to from 'await-to-js';
-import { successMessage } from '@utogether/utils';
-import { getServiceApi } from '../../../api';
-
-const data = reactive<IRecord>({
-  record: {},
-  loading: false,
-  showModalView: false
-});
-const { t } = useI18n();
-
-const xgrid = ref(null);
-const xmodal = ref(null);
-const active: IRecord = inject('active');
-
-const url = '/uums/orgRole';
-watch(
-  () => active.value,
-  () => {
-    if (!active?.value.id) return;
-    data.fetchExtParam = { orgId: active?.value.id };
-    nextTick(() => {
-      xgrid.value.refreshData();
-    });
-  }
-);
-
-const buttons = [{ code: 'del', auth: '/' }];
-
-const formItems = [
-  { field: 'roleName', title: 'message.udp.roleName' },
-  { field: 'roleCode', title: 'message.udp.roleCode' }
-];
-
-const columns = [
-  { type: 'checkbox', width: 40 },
-  { field: 'roleCode', title: 'message.udp.roleCode' },
-  { field: 'roleName', title: 'message.udp.roleName' },
-  { field: 'roleDesc', title: 'message.udp.roleDesc' },
-  { field: 'enabled', width: 100, formatter: ['formatDict', 'SU.ENABLE'] }
-];
-
-const gridCol: any[] = clone(columns, true);
-gridCol.push({
-  field: 'operate',
-  width: 80,
-  fixed: 'right',
-  slots: {
-    default: ({ row }) => {
-      return [
-        <ut-button
-          icon="ri-delete-bin-5-fill"
-          content="del"
-          status="danger"
-          auth="del"
-          onTap={() => handleDel(row)}
-        />
-      ];
-    }
-  }
-});
-
-// 新增
-const handleAdd = () => {
-  data.record = {};
-  data.record.orgId = active.value.id;
-  data.showModalView = true;
-};
-// 删除
-const handleDel = async row => {
-  const type = await VxeUI.modal.confirm(t('message.tip.del'));
-  if (type === 'confirm') {
-    const param = { orgId: active.value.id, roleId: row.id };
-    data.loading = true;
-    const [err] = await to(getServiceApi().delete(url, param));
-    if (!err) {
-      successMessage(t('message.operateSuccess'));
-    }
-    xgrid.value.refreshData();
-    data.loading = false;
-  }
-};
-const onConfirm = async records => {
-  const orgRoleList = [];
-  records.forEach(m => {
-    m.orgId = active.value.id;
-    m.roleId = m.id;
-    orgRoleList.push(m);
-  });
-  const param = { orgRoleList };
-  xmodal.value.showLoading();
-  const [err] = await to(getServiceApi().post(url, param));
-  if (!err) {
-    successMessage();
-    xgrid.value.refreshData();
-    data.showModalView = false;
-  }
-};
-
-const onButtonClick = code => {
-  code === 'add' && handleAdd();
-};
-</script>
+<template>
+  <div v-spinning="data.loading" class="page-content">
+    <ut-grid
+      ref="xgrid"
+      :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"
+    />
+    <ut-modal-grid
+      v-if="data.showModalView"
+      ref="xmodal"
+      :items="formItems"
+      :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"
+    />
+  </div>
+</template>
+
+<script setup lang="tsx">
+import { useI18n } from 'vue-i18n';
+import { ref, reactive, watch, inject, nextTick } from 'vue';
+import { clone } from 'xe-utils';
+import { VxeUI } from 'vxe-pc-ui';
+import to from 'await-to-js';
+import { successMessage } from '@utogether/utils';
+import { getServiceApi } from '../../../api';
+
+const data = reactive<IRecord>({
+  record: {},
+  loading: false,
+  showModalView: false
+});
+const { t } = useI18n();
+
+const xgrid = ref(null);
+const xmodal = ref(null);
+const active: IRecord = inject('active');
+
+const url = '/uums/orgRole';
+watch(
+  () => active.value,
+  () => {
+    if (!active?.value.id) return;
+    data.fetchExtParam = { orgId: active?.value.id };
+    nextTick(() => {
+      xgrid.value.refreshData();
+    });
+  }
+);
+
+const buttons = [{ code: 'del', auth: '/' }];
+
+const formItems = [
+  { field: 'roleName', title: 'message.udp.roleName', span: 9 },
+  { field: 'roleCode', title: 'message.udp.roleCode', span: 9 }
+];
+
+const columns = [
+  { type: 'checkbox', width: 40 },
+  { field: 'roleCode', title: 'message.udp.roleCode' },
+  { field: 'roleName', title: 'message.udp.roleName' },
+  { field: 'roleDesc', title: 'message.udp.roleDesc' },
+  { field: 'enabled', width: 100, formatter: ['formatDict', 'SU.ENABLE'] }
+];
+
+const gridCol: any[] = clone(columns, true);
+gridCol.push({
+  field: 'operate',
+  width: 80,
+  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)} />
+      ];
+    }
+  }
+});
+
+// 新增
+const handleAdd = () => {
+  data.record = {};
+  data.record.orgId = active.value.id;
+  data.showModalView = true;
+};
+// 删除
+const handleDel = async row => {
+  const type = await VxeUI.modal.confirm(t('message.tip.del'));
+  if (type === 'confirm') {
+    const param = { orgId: active.value.id, roleId: row.id };
+    data.loading = true;
+    const [err] = await to(getServiceApi().delete(url, param));
+    if (!err) {
+      successMessage(t('message.operateSuccess'));
+    }
+    xgrid.value.refreshData();
+    data.loading = false;
+  }
+};
+const onConfirm = async records => {
+  const orgRoleList = [];
+  records.forEach(m => {
+    m.orgId = active.value.id;
+    m.roleId = m.id;
+    orgRoleList.push(m);
+  });
+  const param = { orgRoleList };
+  xmodal.value.showLoading();
+  const [err] = await to(getServiceApi().post(url, param));
+  if (!err) {
+    successMessage();
+    xgrid.value.refreshData();
+    data.showModalView = false;
+  }
+};
+
+const checkMethod = row => {
+  return row.roleCode !== 'admin';
+};
+
+const onButtonClick = code => {
+  code === 'add' && handleAdd();
+};
+</script>

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

@@ -17,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>
@@ -32,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')"
@@ -55,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" />
@@ -64,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>
@@ -80,7 +77,7 @@
 
 <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, delay } from '@utogether/utils';
 import { VxeUI, VxeFormPropTypes } from 'vxe-pc-ui';
@@ -131,6 +128,7 @@ const rules: VxeFormPropTypes.Rules = {
 const renderHook = useRender();
 const defaultParams = ref({});
 const treeList: IRecord[] = inject('treeList');
+const loading = ref(false);
 
 const url = '/uums/user';
 
@@ -165,21 +163,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)} />
           </>
         ];
       }
@@ -199,11 +188,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: 密码重置
@@ -226,11 +218,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'));
     }

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>

package/src/views/udev/dict/DictView.vue

@@ -11,8 +11,9 @@
       ref="xgrid"
       :items="formItems"
       :columns="columns"
-      url="/upfm/v1/lov"
+      :check-method="checkMethod"
       :events="onGridEvents"
+      url="/upfm/v1/lov"
     />
     <child-view v-if="shouDrawer" :show="shouDrawer" :record="record" @onClose="handleClose" />
   </div>
@@ -103,4 +104,8 @@ const onGridEvents = {
 // function onFocus(e) {
 //   console.log('onFocus', e);
 // }
+
+const checkMethod = row => {
+  return row.dictType !== '0';
+};
 </script>

package/src/views/udev/dict/childView.vue

@@ -46,12 +46,7 @@
             <template #default="{ row }">
               <ut-button status="primary" content="edit" @tap="onEdit(row)" />
               <ut-button status="warning" content="delete" @tap="onDel(row)" />
-              <ut-button
-                status="success"
-                content="add"
-                :disabled="row.enabled !== '1'"
-                @tap="onChildren(row)"
-              />
+              <ut-button status="success" content="add" :disabled="row.enabled !== '1'" @tap="onChildren(row)" />
             </template>
           </vxe-table-column>
         </vxe-table>

package/src/views/urpt/design/DesignPanel.vue

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2022-03-21 10:36:15
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-04-08 15:38:16
+ * @LastEditTime: 2025-08-12 09:57:22
  * @Description: 设计面板
 -->
 <template>
@@ -45,21 +45,12 @@
                 <div class="flex justify-center mb-1" style="width: 100%">
                   <vxe-input v-model="paperSize.width" type="number" class="w-40" placeholder="宽(mm)" />
                   <div class="flex items-center justify-center w-8">~</div>
-                  <vxe-input
-                    v-model="paperSize.height"
-                    type="number"
-                    class="w-40"
-                    placeholder="高(mm)"
-                  />
+                  <vxe-input v-model="paperSize.height" type="number" class="w-40" placeholder="高(mm)" />
                 </div>
                 <ut-button style="width: 100%" content="confirm" @tap="handleCustomSize" />
               </div>
               <template #reference>
-                <ut-button
-                  icon="ri-font-size"
-                  content="customSize"
-                  @click.stop="paperPopVisible = true"
-                />
+                <ut-button icon="ri-font-size" content="customSize" @tap.stop="paperPopVisible = true" />
               </template>
             </el-popover>
             <ut-button
@@ -69,22 +60,9 @@
               auth="import"
               @tap="handleShowImport()"
             />
-            <vxe-button
-              icon="ri-indeterminate-circle-line "
-              class="design-custom-button"
-              @click="handleScale('N')"
-            />
-            <vxe-input
-              v-model="scale.ration"
-              disabled
-              align="center"
-              style="width: 70px; margin-left: 10px"
-            />
-            <vxe-button
-              icon="ri-add-circle-fill "
-              class="design-custom-button"
-              @click="handleScale('Y')"
-            />
+            <vxe-button icon="ri-indeterminate-circle-line " class="design-custom-button" @click="handleScale('N')" />
+            <vxe-input v-model="scale.ration" disabled align="center" style="width: 70px; margin-left: 10px" />
+            <vxe-button icon="ri-add-circle-fill " class="design-custom-button" @click="handleScale('Y')" />
             <ut-button
               status="danger"
               icon="ri-delete-bin-5-fill"
@@ -99,8 +77,7 @@
           </div>
         </div>
         <div style="font-size: 12px; color: red; text-align: center">
-          温馨提示:
-          蓝色线(页眉)以下,每张纸打印都会重复打印到页面底部;红色线(页尾)以下,每张纸打印都会重复打印到页面底部
+          温馨提示: 蓝色线(页眉)以下,每张纸打印都会重复打印到页面底部;红色线(页尾)以下,每张纸打印都会重复打印到页面底部
         </div>
       </el-space>
       <el-row>
@@ -216,7 +193,7 @@
 
 <script setup lang="ts">
 import { onMounted, reactive, ref, nextTick, onBeforeUnmount } from 'vue';
-import { VXETable } from 'vxe-table';
+import { VxeUI } from 'vxe-pc-ui';
 import { useGlobal } from '@utogether/utils';
 import to from 'await-to-js';
 import { clone } from 'xe-utils';
@@ -320,7 +297,7 @@ const handleScale = max => {
  * @Desc: 参数设置drawer回调,将参数设置dom添加到弹出层中
  */
 const handleClearPaper = async () => {
-  const type = await VXETable.modal.confirm('重绘操作不可逆,您确定继续吗?', '温馨提示');
+  const type = await VxeUI.modal.confirm('重绘操作不可逆,您确定继续吗?', '温馨提示');
   if (type === 'confirm') {
     hiprintTemplate.clear();
   }
@@ -329,7 +306,7 @@ const handleShowImport = async () => {
   showImportView.value = true;
 };
 const handleImportJson = async () => {
-  const type = await VXETable.modal.confirm('导入后将覆盖原有的模板,您确定继续吗?', '温馨提示');
+  const type = await VxeUI.modal.confirm('导入后将覆盖原有的模板,您确定继续吗?', '温馨提示');
   if (type === 'confirm') {
     handleSave(handleClose);
     showImportView.value = false;