From 809a66956c81f280a7a1cb39d968e4dd96c6e6cc Mon Sep 17 00:00:00 2001
From: qiaochuLei <124648559+qiaochuLei@users.noreply.github.com>
Date: Sat, 25 Nov 2023 17:33:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E4=B8=8D=E5=8C=85=E5=90=AB=E4=B8=AD?=
 =?UTF-8?q?=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: 用户管理用户名不包含中文
---
 .../device/components/Metadata/Base/Base.vue  | 45 ++++++++++++++++---
 .../system/User/components/EditUserDialog.vue | 14 +++++-
 2 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/src/views/device/components/Metadata/Base/Base.vue b/src/views/device/components/Metadata/Base/Base.vue
index 09b5e9c2..b17608dd 100644
--- a/src/views/device/components/Metadata/Base/Base.vue
+++ b/src/views/device/components/Metadata/Base/Base.vue
@@ -1,5 +1,6 @@
 <template>
-    <j-data-table
+    <div ref="tableContainer">
+      <j-data-table
         ref="tableRef"
         :data-source="dataSource"
         :columns="columns"
@@ -12,7 +13,7 @@
         @change="(data) => dataSourceCache = data"
     >
         <template #expand>
-          <PermissionButton
+          <!-- <PermissionButton
               type="primary"
               v-if="!showSave"
               :hasPermission="`${permission}:update`"
@@ -30,12 +31,11 @@
               placement="topRight"
           >
             新增
-          </PermissionButton>
+          </PermissionButton> -->
           <PermissionButton
               type="primary"
               :hasPermission="`${permission}:update`"
               key="update"
-              v-else
               :loading="loading"
 
               :disabled="hasOperate('add', type) || !editStatus"
@@ -202,7 +202,26 @@
             </PermissionButton>
           </j-space>
         </template>
-    </j-data-table>
+      </j-data-table>
+      <PermissionButton
+              type="dashed"
+              block
+              :hasPermission="`${permission}:update`"
+              key="add"
+              :disabled="hasOperate('add', type)"
+              :tooltip="{
+                    placement: hasOperate('add', type) ? 'topRight' : 'top',
+                    title: hasOperate('add', type)
+                        ? '当前的存储方式不支持新增'
+                        : '新增',
+                        getPopupContainer: getPopupContainer,
+                }"
+              @click="handleAddClick()"
+              placement="topRight"
+          >
+            新增
+      </PermissionButton>
+    </div>
     <PropertiesModal
         v-if="type === 'properties' && detailData.visible"
         :data="detailData.data"
@@ -278,6 +297,7 @@ const props = defineProps({
 
 const _target = inject<'device' | 'product'>('_metadataType', props.target);
 
+const tableContainer = ref()
 const system = useSystem();
 const {basicLayout} = storeToRefs(system);
 const router = useRouter()
@@ -402,6 +422,11 @@ const handleAddClick = async (_data?: any, index?: number) => {
   const newObject = _data || getDataByType()
 
   const _addData = await tableRef.value.addItem(newObject, index)
+  nextTick(()=>{
+    if(tableContainer.value.classList.value === 'tableContainer'){
+      tableContainer.value.classList.remove('tableContainer')
+    }
+  })
   // if (_addData.length === 1) {
   //   showLastDelete.value = true
   // }
@@ -534,6 +559,11 @@ onUnmounted(() => {
 
 watch(() => metadata.value, () => {
   dataSource.value = metadata.value
+  if(!dataSource.value.length){
+    nextTick(()=>{
+      tableContainer.value.classList.add('tableContainer')
+    })
+  }
 }, { immediate: true })
 
 onBeforeRouteUpdate((to, from, next) => { // 设备管理内路由跳转
@@ -552,4 +582,9 @@ onBeforeRouteLeave((to, from, next) => { // 设备管理外路由跳转
     justify-content: space-between;
     padding-bottom: 16px;
 }
+.tableContainer{
+  :deep(.ant-table-body){
+    display: none;
+  }
+}
 </style>
diff --git a/src/views/system/User/components/EditUserDialog.vue b/src/views/system/User/components/EditUserDialog.vue
index 2154f31e..2cc59751 100644
--- a/src/views/system/User/components/EditUserDialog.vue
+++ b/src/views/system/User/components/EditUserDialog.vue
@@ -147,7 +147,10 @@
                             {
                                 validator: form.rules.checkUserName,
                                 trigger: 'blur',
-                            },
+                            },{
+                                validator: form.rules.checkCh,
+                                trigger: 'change'
+                            }
                         ]"
                     >
                         <j-input
@@ -189,6 +192,9 @@
                                 validator: form.rules.checkAgainPassword,
                                 trigger: 'blur',
                             },
+                            {
+
+                            }
                         ]"
                     >
                         <j-input-password
@@ -261,10 +267,14 @@ const form = reactive({
     data: {} as formType,
 
     rules: {
+        checkCh: (_rule:Rule,value:string): Promise<any> => 
+            new Promise((resolve,reject) => {
+                if (/[\u4e00-\u9fa5]/.test(value)) return reject('用户名不能包含中文');
+                else return resolve('')
+            }),
         checkUserName: (_rule: Rule, value: string): Promise<any> =>
             new Promise((resolve, reject) => {
                 if (props.type === 'edit') return resolve('');
-
                 if (!value) return reject('请输入用户名');
                 else if (value.length > 64) return reject('最多可输入64个字符');
                 validateField_api('username', value).then((resp: any): any => {