From 1a3c10b18ddd75879dc932e80c7549ca92e2f12c Mon Sep 17 00:00:00 2001
From: leiqiaochu <leiqiaochu@aossci.com>
Date: Thu, 16 Mar 2023 15:29:13 +0800
Subject: [PATCH] fix: bug#10455 10451 10448

---
 .../Category/components/modifyModal/index.vue    | 10 ++++++++--
 src/views/device/Category/index.vue              | 16 ++++++++++++----
 .../device/Product/Detail/DeviceAccess/index.vue |  6 +++++-
 src/views/device/Product/Save/index.vue          |  1 +
 src/views/device/Product/index.vue               |  2 +-
 5 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/views/device/Category/components/modifyModal/index.vue b/src/views/device/Category/components/modifyModal/index.vue
index 0d94cb56..b3137349 100644
--- a/src/views/device/Category/components/modifyModal/index.vue
+++ b/src/views/device/Category/components/modifyModal/index.vue
@@ -93,7 +93,13 @@ const formModel = ref<formState>({
     description: '',
 });
 const rules = ref({
-    name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+    name: [
+        { required: true, message: '请输入名称', trigger: 'blur' },
+        {
+            max: 64,
+            message: '最多可输入64个字符',
+        },
+    ],
     sortIndex: [{ required: true, message: '请输入排序', trigger: 'blur' }],
 });
 const visible = ref(false);
@@ -112,7 +118,7 @@ const submitData = async () => {
                 addParams.value = {
                     ...formModel.value,
                     // sortIndex:
-                        // childArr.value[childArr.value.length - 1].sortIndex + 1,
+                    // childArr.value[childArr.value.length - 1].sortIndex + 1,
                     parentId: addObj.value.id,
                 };
             } else if (props.isChild === 2) {
diff --git a/src/views/device/Category/index.vue b/src/views/device/Category/index.vue
index 5feb2ee1..928266d5 100644
--- a/src/views/device/Category/index.vue
+++ b/src/views/device/Category/index.vue
@@ -10,7 +10,7 @@
             ref="tableRef"
             :columns="table.columns"
             :dataSource="dataSource"
-            model="table"
+            model="TABLE"
             :defaultParams="{
                 paging: false,
                 sorts: [
@@ -35,7 +35,7 @@
                 </PermissionButton>
             </template>
             <template #action="slotProps">
-                <j-space :size="16">
+                <j-space>
                     <template
                         v-for="i in getActions(slotProps, 'table')"
                         :key="i.key"
@@ -222,23 +222,31 @@ const getActions = (
 
 const table = reactive({
     columns: [
-        { title: '名称', dataIndex: 'name', key: 'name' },
+        {
+            title: '名称',
+            dataIndex: 'name',
+            key: 'name',
+            ellipsis: true,
+            width:600
+        },
         {
             title: '排序',
             dataIndex: 'sortIndex',
             key: 'sortIndex',
             scopedSlots: true,
+            width:200
         },
         {
             title: '说明',
             dataIndex: 'description',
             key: 'description',
+            width:700
         },
         {
             title: '操作',
             key: 'action',
             fixed: 'right',
-            width: 250,
+            ellipsis: true,
             scopedSlots: true,
         },
     ],
diff --git a/src/views/device/Product/Detail/DeviceAccess/index.vue b/src/views/device/Product/Detail/DeviceAccess/index.vue
index 024c7de9..5f8d872d 100644
--- a/src/views/device/Product/Detail/DeviceAccess/index.vue
+++ b/src/views/device/Product/Detail/DeviceAccess/index.vue
@@ -269,7 +269,8 @@
     <!-- 选择设备 -->
     <j-modal
         title="设备接入配置"
-        :visible="visible"
+        v-if="visible"
+        visible
         width="1200px"
         okText="确定"
         cancelText="取消"
@@ -280,6 +281,7 @@
             :columns="query.columns"
             target="deviceModal"
             @search="search"
+            type='simple'
         />
         <JProTable
             :columns="query.columns"
@@ -442,6 +444,7 @@ const showModal = () => {
  * 关闭弹窗
  */
 const cancel = () => {
+    queryParams.value = {};
     visible.value = false;
 };
 /**
@@ -968,6 +971,7 @@ const submitData = async () => {
                     message.success('操作成功！');
                 }
                 visible.value = false;
+                queryParams.value = {};
             });
         }
     } else {
diff --git a/src/views/device/Product/Save/index.vue b/src/views/device/Product/Save/index.vue
index fb35ffc1..56d37d43 100644
--- a/src/views/device/Product/Save/index.vue
+++ b/src/views/device/Product/Save/index.vue
@@ -125,6 +125,7 @@
                         placeholder="请选择产品分类"
                         :tree-data="treeList"
                         @change="valueChange"
+                        allow-clear
                         :fieldNames="{ label: 'name', value: 'id' }"
                         :filterTreeNode="
                             (v, option) => filterSelectNode(v, option)
diff --git a/src/views/device/Product/index.vue b/src/views/device/Product/index.vue
index 1277a802..92056e92 100644
--- a/src/views/device/Product/index.vue
+++ b/src/views/device/Product/index.vue
@@ -202,7 +202,7 @@ const columns = [
         scopedSlots: true,
     },
     {
-        title: '名称',
+        title: '产品名称',
         dataIndex: 'name',
         key: 'name',
     },