@utogether/udp-core 1.0.1 → 1.0.3

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,26 @@
         <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 :label="$t('message.udp.showTitle')" prop="showTitle">
+          <el-switch v-model="record.showTitle" 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 +107,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 +122,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 +131,11 @@ const record = reactive({
   defaultLanguage: 'zh',
   title: 'U-DP',
   ispTitle: 'U-DP',
-  i18nEnabled: 'Y',
+  baseColor: '#FFF',
+  i18nEnabled: 'N',
+  orgTaggle: 'Y',
+  showTitle: 'Y',
+  techSupport: 'Y',
   copyright: '深圳友聚信息技术有限公司',
   logo: [],
   backgroundImg: [],
@@ -134,6 +150,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 +191,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 +313,8 @@ onMounted(() => {
 </script>
 <style lang="scss">
 .u-system-config {
+  padding-top: 48px;
+
   .el-select,
   .el-select--small {
     width: 100%;