From daef6b7f1f84244917218e79f45dfcd94b5d86b0 Mon Sep 17 00:00:00 2001
From: 100011797 <2642441182@qq.com>
Date: Fri, 7 Jul 2023 14:04:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/account/Center/bind/index.vue       |  4 +--
 .../Center/components/EditInfo/index.vue      |  4 +--
 .../Detail/Function/components/Simple.vue     |  5 ++--
 .../Detail/Running/Property/Detail/Table.vue  |  2 +-
 .../Detail/Running/Property/index.vue         |  1 +
 src/views/init-home/data/baseMenu.ts          |  6 +++++
 src/views/link/plugin/Save.vue                | 27 ++++++++++---------
 src/views/system/Basis/index.vue              |  2 +-
 .../system/User/components/EditUserDialog.vue |  6 ++++-
 9 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/src/views/account/Center/bind/index.vue b/src/views/account/Center/bind/index.vue
index dc2583b4..c035a514 100644
--- a/src/views/account/Center/bind/index.vue
+++ b/src/views/account/Center/bind/index.vue
@@ -1,7 +1,7 @@
 <!-- 第三方账户绑定 -->
 <template>
   <div class='page-container'>
-    <div class='content'>
+    <div class='content-bind'>
       <div class='title'>第三方账户绑定</div>
       <!-- 已登录-绑定三方账号 -->
       <template v-if='!!token'>
@@ -323,7 +323,7 @@ onMounted(() => {
   align-items: center;
   justify-content: center;
 
-  .content {
+  .content-bind {
     box-sizing: border-box;
     width: 928px;
     min-height: 510px;
diff --git a/src/views/account/Center/components/EditInfo/index.vue b/src/views/account/Center/components/EditInfo/index.vue
index 76b934ce..f2e52dff 100644
--- a/src/views/account/Center/components/EditInfo/index.vue
+++ b/src/views/account/Center/components/EditInfo/index.vue
@@ -41,7 +41,7 @@
                             :value="
                                 form.roleList.map((item) => item.name).join(',')
                             "
-                            placeholder="请输入角色"
+                            placeholder="请选择角色"
                             disabled
                         />
                     </j-form-item>
@@ -52,7 +52,7 @@
                             :value="
                                 form.orgList.map((item) => item.name).join(',')
                             "
-                            placeholder="请输入组织"
+                            placeholder="请选择组织"
                             disabled
                         />
                     </j-form-item>
diff --git a/src/views/device/Instance/Detail/Function/components/Simple.vue b/src/views/device/Instance/Detail/Function/components/Simple.vue
index add55c46..f42db925 100644
--- a/src/views/device/Instance/Detail/Function/components/Simple.vue
+++ b/src/views/device/Instance/Detail/Function/components/Simple.vue
@@ -49,7 +49,7 @@
                                         <j-form-item
                                             :name="['table', index, 'value']"
                                             :rules="{
-                                                required: true,
+                                                required: record.required,
                                                 message: '该字段为必填字段',
                                             }"
                                             has-feedback
@@ -172,9 +172,10 @@ const newFunctions = computed(() => {
                         ? tableItem['json']?.['properties'][0]
                         : undefined,
                 value: undefined,
+                required: tableItem.expands?.required
             });
         }
-
+        
         result.push({
             ...func,
             table: array,
diff --git a/src/views/device/Instance/Detail/Running/Property/Detail/Table.vue b/src/views/device/Instance/Detail/Running/Property/Detail/Table.vue
index bd831b5e..17cc953e 100644
--- a/src/views/device/Instance/Detail/Running/Property/Detail/Table.vue
+++ b/src/views/device/Instance/Detail/Running/Property/Detail/Table.vue
@@ -22,7 +22,7 @@
                     <ValueRender
                         type="table"
                         :data="_props.data"
-                        :value="{ formatValue: record.value }"
+                        :value="{ ...record }"
                     />
                 </template>
                 <template v-else-if="column.key === 'action'">
diff --git a/src/views/device/Instance/Detail/Running/Property/index.vue b/src/views/device/Instance/Detail/Running/Property/index.vue
index b416464c..9c5a9156 100644
--- a/src/views/device/Instance/Detail/Running/Property/index.vue
+++ b/src/views/device/Instance/Detail/Running/Property/index.vue
@@ -95,6 +95,7 @@ const columns = [
         title: '名称',
         dataIndex: 'name',
         key: 'name',
+        ellipsis: true
     },
     {
         title: '值',
diff --git a/src/views/init-home/data/baseMenu.ts b/src/views/init-home/data/baseMenu.ts
index 61c8a4e9..788fd7a6 100644
--- a/src/views/init-home/data/baseMenu.ts
+++ b/src/views/init-home/data/baseMenu.ts
@@ -13,6 +13,12 @@ export const USER_CENTER_MENU_DATA = {
   sortIndex: 9999,
   granted: true,
   owner: 'iot',
+  permissions: [
+    {
+      permission: 'system_config',
+      actions: ['query'],
+    },
+  ],
   buttons: [
     {
       id: USER_CENTER_MENU_BUTTON_CODE,
diff --git a/src/views/link/plugin/Save.vue b/src/views/link/plugin/Save.vue
index d209d9d7..b54b0ea5 100644
--- a/src/views/link/plugin/Save.vue
+++ b/src/views/link/plugin/Save.vue
@@ -15,26 +15,26 @@
           :rules='IdRules'
         >
           <template #label>
-                                <span>
-                                    插件ID
-                                    <j-tooltip
-                                      title='若不填写，系统将自动生成唯一ID'
-                                    >
-                                        <AIcon
-                                          type='QuestionCircleOutlined'
-                                          style='margin-left: 2px'
-                                        />
-                                    </j-tooltip>
-                                </span>
+            <span>
+                插件ID
+                <j-tooltip
+                  title='若不填写，系统将自动生成唯一ID'
+                >
+                    <AIcon
+                      type='QuestionCircleOutlined'
+                      style='margin-left: 2px'
+                    />
+                </j-tooltip>
+            </span>
           </template>
-          <j-input v-model:value='modelRef.id' :disabled='!!data.id' />
+          <j-input placeholder="请输入插件ID" v-model:value='modelRef.id' :disabled='!!data.id' />
         </j-form-item>
         <j-form-item
           label='插件名称'
           name='name'
           :rules="nameRules"
         >
-          <j-input v-model:value='modelRef.name' />
+          <j-input placeholder="请输入插件名称" v-model:value='modelRef.name' />
         </j-form-item>
         <j-form-item
           label='文件'
@@ -135,6 +135,7 @@ const handleSave = async () => {
   const data = await formRef.value.validate()
   if (data) {
     loading.value = true
+    modelRef.id = modelRef.id ? modelRef.id : null;
     const resp = props.data.id ? await update(modelRef).catch(() => { success: false }) : await add(modelRef).catch(() => { success: false })
     loading.value = false
     if (resp.success) {
diff --git a/src/views/system/Basis/index.vue b/src/views/system/Basis/index.vue
index 19b12fee..1e46fe8a 100644
--- a/src/views/system/Basis/index.vue
+++ b/src/views/system/Basis/index.vue
@@ -353,7 +353,7 @@ const form = reactive<formType>({
         title: [
             {
                 required: true,
-                message: '名称必填',
+                message: '请输入系统名称',
             },
             {
                 max: 64,
diff --git a/src/views/system/User/components/EditUserDialog.vue b/src/views/system/User/components/EditUserDialog.vue
index 1c381935..90f9b1a3 100644
--- a/src/views/system/User/components/EditUserDialog.vue
+++ b/src/views/system/User/components/EditUserDialog.vue
@@ -94,7 +94,11 @@
             </j-row>
             <j-row :gutter="24" v-if="form.IsShow('add', 'edit')">
                 <j-col :span="12">
-                    <j-form-item name="roleIdList" label="角色" class="flex">
+                    <j-form-item name="roleIdList" label="角色" class="flex" 
+                        :rules="[
+                            { required: true, message: '请选择角色' },
+                        ]"
+                    >
                         <j-select
                             v-model:value="form.data.roleIdList"
                             mode="multiple"