diff --git a/build.sh b/build.sh
index 5bbf1f2e..6ead7b78 100644
--- a/build.sh
+++ b/build.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
-docker build -t registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-vue:2.2.0-SNAPSHOT .
-docker push registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-vue:2.2.0-SNAPSHOT
+docker build -t registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-vue:2.1.0-TEST .
+docker push registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-vue:2.1.0-TEST
diff --git a/package-lock.json b/package-lock.json
index bd0c8c2a..022d589e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,6 +21,7 @@
         "event-source-polyfill": "^1.0.31",
         "global": "^4.4.0",
         "jetlinks-store": "^0.0.3",
+        "jetlinks-ui-components": "^1.0.37",
         "js-cookie": "^3.0.1",
         "jsencrypt": "^3.3.2",
         "less": "^4.1.3",
@@ -5216,6 +5217,30 @@
       "resolved": "https://registry.npmjs.org/jetlinks-store/-/jetlinks-store-0.0.3.tgz",
       "integrity": "sha512-AZf/soh1hmmwjBZ00fr1emuMEydeReaI6IBTGByQYhTmK1Zd5pQAxC7WLek2snRAn/HHDgJfVz2hjditKThl6Q=="
     },
+    "node_modules/jetlinks-ui-components": {
+      "version": "1.0.37",
+      "resolved": "https://registry.npmjs.org/jetlinks-ui-components/-/jetlinks-ui-components-1.0.37.tgz",
+      "integrity": "sha512-Zhjz5/Zs02Jy40eLmh/zgF9zQlDKUpeHptTYzb9LQjszqAUAV3XjWPcNoyMqE4nP8Q3uagyw1yxJfWvzxDf62Q==",
+      "dependencies": {
+        "@vueuse/core": "^9.12.0",
+        "@vueuse/router": "^9.13.0",
+        "ant-design-vue": "^3.2.15",
+        "colorpicker-v3": "^2.10.2",
+        "lodash-es": "^4.17.21",
+        "monaco-editor": "^0.40.0",
+        "onigasm": "^2.2.5",
+        "sortablejs": "^1.15.0",
+        "vuedraggable": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=18.14.0"
+      }
+    },
+    "node_modules/jetlinks-ui-components/node_modules/monaco-editor": {
+      "version": "0.40.0",
+      "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.40.0.tgz",
+      "integrity": "sha512-1wymccLEuFSMBvCk/jT1YDW/GuxMLYwnFwF9CDyYCxoTw2Pt379J3FUhwy9c43j51JdcxVPjwk0jm0EVDsBS2g=="
+    },
     "node_modules/js-cookie": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.1.tgz",
@@ -8823,8 +8848,11 @@
       "version": "2.0.5",
       "resolved": "http://registry.jetlinks.cn/init-package-json/-/init-package-json-2.0.5.tgz",
       "integrity": "sha512-u1uGAtEFu3VA6HNl/yUWw57jmKEMx8SKOxHhxjGnOFUiIlFnohKDFg4ZrPpv9wWqk44nDxGJAtqjdQFm+9XXQA==",
+<<<<<<< HEAD
+=======
       "resolved": "http://registry.jetlinks.cn/init-package-json/-/init-package-json-2.0.5.tgz",
       "integrity": "sha512-u1uGAtEFu3VA6HNl/yUWw57jmKEMx8SKOxHhxjGnOFUiIlFnohKDFg4ZrPpv9wWqk44nDxGJAtqjdQFm+9XXQA==",
+>>>>>>> dev-bug
       "inBundle": true,
       "license": "ISC",
       "dependencies": {
@@ -17472,6 +17500,29 @@
       "resolved": "https://registry.npmjs.org/jetlinks-store/-/jetlinks-store-0.0.3.tgz",
       "integrity": "sha512-AZf/soh1hmmwjBZ00fr1emuMEydeReaI6IBTGByQYhTmK1Zd5pQAxC7WLek2snRAn/HHDgJfVz2hjditKThl6Q=="
     },
+    "jetlinks-ui-components": {
+      "version": "1.0.37",
+      "resolved": "https://registry.npmjs.org/jetlinks-ui-components/-/jetlinks-ui-components-1.0.37.tgz",
+      "integrity": "sha512-Zhjz5/Zs02Jy40eLmh/zgF9zQlDKUpeHptTYzb9LQjszqAUAV3XjWPcNoyMqE4nP8Q3uagyw1yxJfWvzxDf62Q==",
+      "requires": {
+        "@vueuse/core": "^9.12.0",
+        "@vueuse/router": "^9.13.0",
+        "ant-design-vue": "^3.2.15",
+        "colorpicker-v3": "^2.10.2",
+        "lodash-es": "^4.17.21",
+        "monaco-editor": "^0.40.0",
+        "onigasm": "^2.2.5",
+        "sortablejs": "^1.15.0",
+        "vuedraggable": "^4.1.0"
+      },
+      "dependencies": {
+        "monaco-editor": {
+          "version": "0.40.0",
+          "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.40.0.tgz",
+          "integrity": "sha512-1wymccLEuFSMBvCk/jT1YDW/GuxMLYwnFwF9CDyYCxoTw2Pt379J3FUhwy9c43j51JdcxVPjwk0jm0EVDsBS2g=="
+        }
+      }
+    },
     "js-cookie": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.1.tgz",
diff --git a/src/views/device/Firmware/Save/FileUpload.vue b/src/views/device/Firmware/Save/FileUpload.vue
index 60ca6653..6b8eb9e4 100644
--- a/src/views/device/Firmware/Save/FileUpload.vue
+++ b/src/views/device/Firmware/Save/FileUpload.vue
@@ -4,7 +4,7 @@
             placeholder="请上传文件"
             v-model:value="fileValue"
             style="width: calc(100% - 110px)"
-            :disabled="true"
+            @change="fileValueChange"
         />
         <j-upload
             name="file"
@@ -79,6 +79,10 @@ const handleChange = async (info: UploadChangeParam) => {
     }
 };
 
+const fileValueChange = () =>{
+    emit('update:modelValue',fileValue.value)
+}
+
 watch(
     () => props.modelValue,
     (value) => {
diff --git a/src/views/device/Instance/Detail/Function/components/Advance.vue b/src/views/device/Instance/Detail/Function/components/Advance.vue
index 18623077..d7eaf12d 100644
--- a/src/views/device/Instance/Detail/Function/components/Advance.vue
+++ b/src/views/device/Instance/Detail/Function/components/Advance.vue
@@ -9,9 +9,14 @@
             >
                 <j-tab-pane v-for="func in newFunctions" :key="func.id">
                     <template #tab>
-                        <div style="width: 100px; text-align: left">
-                            <j-ellipsis>{{ func.name }}</j-ellipsis>
-                        </div>
+                        <j-tooltip>
+                            <template #title>
+                                {{ func.name }}
+                            </template>
+                            <div style="max-width: 100px" class="tabTitle">
+                                {{ func.name }}
+                            </div>
+                        </j-tooltip>
                     </template>
                 </j-tab-pane>
             </j-tabs>
@@ -34,10 +39,7 @@
                             >
                                 执行
                             </j-button>
-                            <j-button
-                                type="default"
-                                @click="handleClear()"
-                            >
+                            <j-button type="default" @click="handleClear()">
                                 清空
                             </j-button>
                         </j-space>
@@ -76,7 +78,7 @@ const newFunctions = ref<any[]>([]);
  * @param type
  * @param json
  */
- const setInitValue = (type: string, json?: any) => {
+const setInitValue = (type: string, json?: any) => {
     let initVal: any = '';
     if (['int', 'long', 'float', 'double'].includes(type)) {
         initVal = 0;
@@ -122,8 +124,8 @@ watch(
     },
     {
         immediate: true,
-        deep: true
-    }
+        deep: true,
+    },
 );
 
 const onTabChange = (_key: string) => {
@@ -148,7 +150,8 @@ const handleExecute = async (func: any) => {
             loading.value = false;
         });
     if (resp.success) {
-        executeResult.value = resp?.result instanceof Array ? resp?.result?.[0] : resp.result;
+        executeResult.value =
+            resp?.result instanceof Array ? resp?.result?.[0] : resp.result;
         onlyMessage('操作成功');
     }
 };
@@ -181,4 +184,9 @@ const handleClear = () => {
         overflow: auto;
     }
 }
+.tabTitle {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
 </style>
diff --git a/src/views/device/Instance/Detail/Function/components/Simple.vue b/src/views/device/Instance/Detail/Function/components/Simple.vue
index 0d3aadc5..f336564f 100644
--- a/src/views/device/Instance/Detail/Function/components/Simple.vue
+++ b/src/views/device/Instance/Detail/Function/components/Simple.vue
@@ -6,12 +6,22 @@
                 <span>精简模式下参数只支持输入框的方式录入</span>
             </j-space>
         </div>
-        <j-tabs v-model="activeKey" tab-position="left" @change="onTabChange" :destroyInactiveTabPane="true">
+        <j-tabs
+            v-model="activeKey"
+            tab-position="left"
+            @change="onTabChange"
+            :destroyInactiveTabPane="true"
+        >
             <j-tab-pane v-for="func in newFunctions" :key="func.id">
                 <template #tab>
-                    <Ellipsis style="width: 100px; text-align: left">
-                        {{ func.name }}
-                    </Ellipsis>
+                    <j-tooltip>
+                        <template #title>
+                            {{ func.name }}
+                        </template>
+                        <div style="max-width: 150px" class="tabTitle">
+                            {{ func.name }}
+                        </div>
+                    </j-tooltip>
                 </template>
                 <j-row :gutter="30">
                     <j-col :span="15">
@@ -137,7 +147,7 @@ const columns = ref([
     },
 ]);
 
-const executeResult = ref('')
+const executeResult = ref('');
 
 // 设备功能数据处理
 const newFunctions = computed(() => {
@@ -174,7 +184,7 @@ const newFunctions = computed(() => {
                         ? tableItem['json']?.['properties'][0]
                         : undefined,
                 value: undefined,
-                required: tableItem.expands?.required
+                required: tableItem.expands?.required,
             });
         }
 
@@ -203,17 +213,18 @@ const handleExecute = async (func: any) => {
                     obj[item.id] = item.value;
                 }
             });
-            loading.value = true
+            loading.value = true;
             const { success, result } = await execute(
                 route.params.id as string,
                 func.id,
                 obj,
-            ).catch(() => {
-                loading.value = false
-            })
-            .finally(() => {
-                loading.value = false
-            })
+            )
+                .catch(() => {
+                    loading.value = false;
+                })
+                .finally(() => {
+                    loading.value = false;
+                });
             if (!success) return;
             onlyMessage('操作成功');
             executeResult.value = result instanceof Array ? result[0] : result;
@@ -227,13 +238,13 @@ const handleExecute = async (func: any) => {
  * 清空
  */
 const handleClear = (func: any) => {
-    executeResult.value = ''
+    executeResult.value = '';
     proxy?.$refs[`${func.id}Ref`][0].resetFields();
 };
 
 const onTabChange = (_key: string) => {
-    executeResult.value = ''
-}
+    executeResult.value = '';
+};
 </script>
 
 <style lang="less" scoped>
@@ -263,4 +274,9 @@ const onTabChange = (_key: string) => {
         overflow: auto;
     }
 }
+.tabTitle {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
 </style>
diff --git a/src/views/device/Instance/Detail/Running/Property/Indicators.vue b/src/views/device/Instance/Detail/Running/Property/Indicators.vue
index 95f7218f..b6d27253 100644
--- a/src/views/device/Instance/Detail/Running/Property/Indicators.vue
+++ b/src/views/device/Instance/Detail/Running/Property/Indicators.vue
@@ -160,8 +160,19 @@ watch(
                                 );
                                 modelRef.metrics = list || [];
                             } else {
-                                modelRef.metrics =
-                                    props.data.expands?.metrics || [];
+                                modelRef.metrics = (
+                                    props.data.expands?.metrics || []
+                                ).map((item: any) => {
+                                    const val = Array.isArray(item?.value)
+                                        ? item?.value
+                                        : isNumber(item?.value)
+                                        ? [item.value]
+                                        : item?.value?.split(',');
+                                    return {
+                                        ...item,
+                                        value: val,
+                                    };
+                                });
                             }
                         }
                     }
diff --git a/src/views/device/Instance/Detail/Running/index.vue b/src/views/device/Instance/Detail/Running/index.vue
index 3ff066df..bdbb953a 100644
--- a/src/views/device/Instance/Detail/Running/index.vue
+++ b/src/views/device/Instance/Detail/Running/index.vue
@@ -16,7 +16,18 @@
                 :tabBarStyle="{ width: '200px' }"
                 @change="tabChange"
             >
-                <j-tab-pane v-for="i in tabList" :key="i.key" :tab="i.tab" />
+                <j-tab-pane v-for="i in tabList" :key="i.key">
+                    <template #tab>
+                        <j-tooltip>
+                            <template #title>
+                                {{ i.tab }}
+                            </template>
+                            <div style="max-width: 150px" class="tabTitle">
+                                {{ i.tab }}
+                            </div>
+                        </j-tooltip>
+                    </template>
+                </j-tab-pane>
             </j-tabs>
             <JEmpty v-else style="margin: 180px 0" />
         </div>
@@ -129,4 +140,9 @@ const tabChange = (key: string) => {
         flex: 1;
     }
 }
-</style>
\ No newline at end of file
+.tabTitle {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+</style>
diff --git a/src/views/device/Instance/Import/file.vue b/src/views/device/Instance/Import/file.vue
index 0a002e14..6340dcfe 100644
--- a/src/views/device/Instance/Import/file.vue
+++ b/src/views/device/Instance/Import/file.vue
@@ -161,7 +161,6 @@ const submitData = async (fileUrl: string) => {
                     errCount.value = et;
                 }
             }
-            flag.value=false;
             disabled.value = false;
         };
         source.onerror = (e: { status: number }) => {
diff --git a/src/views/device/Instance/index.vue b/src/views/device/Instance/index.vue
index 394f893d..94c07aa2 100644
--- a/src/views/device/Instance/index.vue
+++ b/src/views/device/Instance/index.vue
@@ -720,7 +720,10 @@ const getActions = (
                     const resp = await _delete(data.id);
                     if (resp.status === 200) {
                         onlyMessage('操作成功！');
-                        _selectedRowKeys.value=[];
+                        const index = _selectedRowKeys.value.findIndex((id: any) => id === data.id);
+                        if (index !== -1) {
+                            _selectedRowKeys.value.splice(index, 1);
+                        }
                         instanceRef.value?.reload();
                     } else {
                         onlyMessage('操作失败！', 'error');
diff --git a/src/views/device/components/Metadata/Base/Base.vue b/src/views/device/components/Metadata/Base/Base.vue
index 8ac4a951..c205eb04 100644
--- a/src/views/device/components/Metadata/Base/Base.vue
+++ b/src/views/device/components/Metadata/Base/Base.vue
@@ -210,7 +210,7 @@
               key="add"
               :disabled="hasOperate('add', type)"
               :tooltip="{
-                    placement: hasOperate('add', type) ? 'topRight' : 'top',
+                    placement:'top',
                     title: hasOperate('add', type)
                         ? '当前的存储方式不支持新增'
                         : '新增',
diff --git a/src/views/iot-card/CardManagement/index.vue b/src/views/iot-card/CardManagement/index.vue
index 13e22f63..f562be3a 100644
--- a/src/views/iot-card/CardManagement/index.vue
+++ b/src/views/iot-card/CardManagement/index.vue
@@ -680,7 +680,10 @@ const getActions = (
                     const resp: any = await del(data.id);
                     if (resp.status === 200) {
                         onlyMessage('操作成功');
-                        _selectedRowKeys.value=[];
+                        const index = _selectedRowKeys.value.findIndex((id: any) => id === data.id);
+                        if (index !== -1) {
+                            _selectedRowKeys.value.splice(index, 1);
+                        }
                         cardManageRef.value?.reload();
                     } else {
                         onlyMessage('操作失败！', 'error');
diff --git a/src/views/link/AccessConfig/index.vue b/src/views/link/AccessConfig/index.vue
index 2dc716a1..1b888329 100644
--- a/src/views/link/AccessConfig/index.vue
+++ b/src/views/link/AccessConfig/index.vue
@@ -205,7 +205,6 @@ const tableRef = ref<Record<string, any>>({});
 const params = ref<Record<string, any>>({});
 
 let providersList = ref<Record<string, any>>([]);
-const providersOptions = ref<Record<string, any>>([]);
 
 const statusMap = new Map();
 statusMap.set('enabled', 'success');
@@ -227,7 +226,13 @@ const columns = [
         key: 'provider',
         search: {
             type: 'select',
-            options: providersOptions,
+            options: async() =>{
+                const res: any = await getProviders();
+               const providersOptions = accessConfigTypeFilter(res.result || []);
+                return providersOptions.filter((i:any)=>{
+                    return i.id !== 'modbus-tcp' && i.id !== 'opc-ua'
+                })
+            },
         },
     },
     {
@@ -331,10 +336,6 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
 const getProvidersList = async () => {
     const res: any = await getProviders();
     providersList.value = res.result;
-    providersOptions.value = accessConfigTypeFilter(res.result || []);
-    providersOptions.value =  providersOptions.value.filter((i:any)=>{
-        return i.id !== 'modbus-tcp' && i.id !== 'opc-ua'
-    })
 };
 getProvidersList();
 
diff --git a/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue b/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue
index b0881082..6781f17f 100644
--- a/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue
+++ b/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue
@@ -303,7 +303,7 @@ watch(
 
 const showDouble = computed(() => {
     const isRange = paramsValue.termType
-        ? doubleParamsKey.includes(paramsValue.termType)
+        ? arrayParamsKey.includes(paramsValue.termType)
         : false;
     const isSourceMetric = paramsValue.value?.source === 'metric';
     if (metricsCacheOption.value.length) {
@@ -324,13 +324,7 @@ const showDouble = computed(() => {
 });
 
 const showArray = computed(()=>{
-    const isRange = paramsValue.termType ?   [
-                            'in',
-                            'nin',
-                            'contains_all',
-                            'contains_any',
-                            'not_contains',
-                        ].includes(paramsValue.termType) : false;
+    const isRange = paramsValue.termType ? arrayParamsKey.includes(paramsValue.termType) : false;
                         const isSourceMetric = paramsValue.value?.source === 'metric';
     if (metricsCacheOption.value.length) {
         metricOption.value = metricsCacheOption.value.filter((item) =>
@@ -458,6 +452,8 @@ const termsTypeSelect = (e: { key: string; name: string }) => {
         if (arrayParamsKey.includes(e.key) !== isArray) {
             // 有变化
             newValue.value = undefined;
+        }else{
+            newValue.value = paramsValue.value!.value
         }
     }
     if (['isnull', 'notnull'].includes(e.key)) {
diff --git a/src/views/system/Apply/index.vue b/src/views/system/Apply/index.vue
index 440cbbf9..a15bb1c9 100644
--- a/src/views/system/Apply/index.vue
+++ b/src/views/system/Apply/index.vue
@@ -53,10 +53,16 @@
                                 </slot>
                             </template>
                             <template #content>
-                                <Ellipsis>
-                                    <h3 class="card-item-content-title">
+                                <Ellipsis
+                                    style="
+                                        width: calc(100% - 100px);
+                                        font-size: 16px;
+                                        color: rgb(49, 94, 251);
+                                        font-weight: 700;
+                                        margin-bottom: 8px;
+                                    "
+                                >
                                         {{ slotProps.name }}
-                                    </h3>
                                 </Ellipsis>
                                 <j-row>
                                     <j-col :span="12">
diff --git a/src/views/system/Basis/index.vue b/src/views/system/Basis/index.vue
index 3dafe4cc..ac63c1f1 100644
--- a/src/views/system/Basis/index.vue
+++ b/src/views/system/Basis/index.vue
@@ -457,7 +457,7 @@ const uploader: uploaderType = {
             uploader.imageTypes
                 .map((m: string) => m.split('.')[1])
                 .filter((typeStr) => file.type.includes(typeStr)).length > 0;
-        const sizeBool = file.size / 1024 / 1024 < 2;
+        const sizeBool = file.size / 1024 / 1024 < 4;
         if (!typeBool) {
             onlyMessage(`请上传.jpg.png.jfif.pjp.pjpeg.jpeg格式的图片`, 'error');
         } else if (!sizeBool) {
diff --git a/src/views/system/Role/RoleLeft/index.vue b/src/views/system/Role/RoleLeft/index.vue
index 9f916e61..4aa60f5b 100644
--- a/src/views/system/Role/RoleLeft/index.vue
+++ b/src/views/system/Role/RoleLeft/index.vue
@@ -1,6 +1,11 @@
 <template>
     <div class="left-contain">
-        <j-input placeholder="分组名称" v-model:value="searchValue" @pressEnter="search" @change="searchChange">
+        <j-input
+            placeholder="分组名称"
+            v-model:value="searchValue"
+            @pressEnter="search"
+            @change="searchChange"
+        >
             <template #suffix>
                 <AIcon type="SearchOutlined" @click="search" />
             </template>
@@ -11,150 +16,207 @@
             </j-button>
         </div>
         <div class="listBox">
-            <j-tree :tree-data="listData" v-if="listData.length" :fieldNames="{ title: 'name', key: 'id', children: 'children' }"
-                blockNode :selectedKeys="selectedKeys" :default-expanded-keys="['global_role']"
-                :showLine="{ showLeafIcon: false }">
+            <j-tree
+                :tree-data="listData"
+                v-if="listData.length"
+                :fieldNames="{ title: 'name', key: 'id', children: 'children' }"
+                blockNode
+                :selectedKeys="selectedKeys"
+                :default-expanded-keys="['global_role']"
+                :showLine="{ showLeafIcon: false }"
+            >
                 <template #title="item">
                     <div v-if="selectId === item.data.id">
-                        <j-input v-model:value="addName" @blur="() => saveGroup(item.data)" ref="inputRef"
-                            :maxlength="64"></j-input>
+                        <j-input
+                            v-model:value="addName"
+                            @blur="() => saveGroup(item.data)"
+                            ref="inputRef"
+                            :maxlength="64"
+                        ></j-input>
                     </div>
-                    <div class="treeItem" @click="() => selectGroup(item.data.id)" v-else>
+                    <div
+                        class="treeItem"
+                        @click="() => selectGroup(item.data.id)"
+                        v-else
+                    >
                         <template v-if="!item?.children">
                             <div class="itemText">
-                                <Ellipsis style="width: calc(100%-100px)">{{ item.name }}</Ellipsis>
+                                <Ellipsis style="width: calc(100%-100px)">{{
+                                    item.name
+                                }}</Ellipsis>
                             </div>
-                            <div @click="(e) => e.stopPropagation()" v-if="item.id !== 'default_group'">
-                                <PermissionButton type="text" hasPermission="system/Role:groupDelete" :popConfirm="{
-                                    title: `确定要删除？`,
-                                    onConfirm: () => deleteGroup(item.id),
-                                }" :disabled="item.id === 'default_group'">
+                            <div
+                                @click="(e) => e.stopPropagation()"
+                                v-if="item.id !== 'default_group'"
+                            >
+                                <PermissionButton
+                                    type="text"
+                                    hasPermission="system/Role:groupDelete"
+                                    :popConfirm="{
+                                        title: `确定要删除？`,
+                                        onConfirm: () => deleteGroup(item.id),
+                                    }"
+                                    :disabled="item.id === 'default_group'"
+                                >
                                     删除
                                 </PermissionButton>
-                                <PermissionButton type="text" hasPermission="system/Role:groupUpdate"
-                                    @click="editGroup(item.data)" :disabled="item.id === 'default_group'">
+                                <PermissionButton
+                                    type="text"
+                                    hasPermission="system/Role:groupUpdate"
+                                    @click="editGroup(item.data)"
+                                    :disabled="item.id === 'default_group'"
+                                >
                                     编辑
                                 </PermissionButton>
                             </div>
                         </template>
                         <template v-else>
-                            <Ellipsis style="width: calc(100%-100px)">{{ item.name }}</Ellipsis>
+                            <Ellipsis style="width: calc(100%-100px)">{{
+                                item.name
+                            }}</Ellipsis>
                         </template>
-                    </div> 
+                    </div>
                 </template>
             </j-tree>
-            <j-empty v-else style="margin-top: 100px;" />
+            <j-empty v-else style="margin-top: 100px" />
         </div>
     </div>
 </template>
-  
+
 <script lang="ts" setup>
 import { onlyMessage } from '@/utils/comm';
-import { queryRoleGroup, saveRoleGroup, deleteRoleGroup } from '@/api/system/role';
+import {
+    queryRoleGroup,
+    saveRoleGroup,
+    deleteRoleGroup,
+} from '@/api/system/role';
 import { randomString } from '@/utils/utils';
 import { useUserInfo } from '@/store/userInfo';
 import { storeToRefs } from 'pinia';
-const emit = defineEmits(['selectData'])
-const userInfoStore = useUserInfo()
-const { userInfos } = storeToRefs(userInfoStore)
+const emit = defineEmits(['selectData']);
+const userInfoStore = useUserInfo();
+const { userInfos } = storeToRefs(userInfoStore);
 const admin = computed(() => {
     return userInfos.value?.username === 'admin';
-})
-const listData: any = ref([{
-    name: '全局角色',
-    id: 'global_role',
-    children: []
-}])
-const selectedKeys = ref<string[]>(['global_role'])
-const searchValue = ref()
-const inputRef = ref()
-const addName = ref()
-const selectId = ref()
+});
+const listData: any = ref([
+    {
+        name: '全局角色',
+        id: 'global_role',
+        children: [],
+    },
+]);
+const selectedKeys = ref<string[]>(['global_role']);
+const searchValue = ref();
+const inputRef = ref();
+const addName = ref();
+const selectId = ref();
 const queryGroup = async (select?: Boolean, searchName?: string) => {
-    const params = searchName ? { sorts: [{ name: 'createTime', order: 'desc' }], terms: [{ terms: [{ value: '%' + searchName + '%', termType: 'like', column: 'name' }] }] } : { sorts: [{ name: 'createTime', order: 'desc' }] }
-    const req: any = await queryRoleGroup(params)
+    const params = searchName
+        ? {
+              sorts: [{ name: 'createTime', order: 'desc' }],
+              terms: [
+                  {
+                      terms: [
+                          {
+                              value: '%' + searchName + '%',
+                              termType: 'like',
+                              column: 'name',
+                          },
+                      ],
+                  },
+              ],
+          }
+        : { sorts: [{ name: 'createTime', order: 'desc' }] };
+    const req: any = await queryRoleGroup(params);
     if (req.status === 200) {
-        listData.value[0].children = req.result
-        if(req.result[req.result.length - 1].id === 'default_group'){
-            req.result.unshift(req.result[req.result.length - 1])
-            req.result.pop()
+        listData.value[0].children = req.result;
+        if (req.result[req.result.length - 1].id === 'default_group') {
+            req.result.unshift(req.result[req.result.length - 1]);
+            req.result.pop();
         }
         // if(req.result.length && select){
         //     selectGroup(req.result[0].id)
         // }
     }
-}
+};
 const addGroup = () => {
-    addName.value = ''
-    const newId = randomString()
-    listData.value[0].children.splice(1, 0, ({
+    addName.value = '';
+    const newId = randomString();
+    listData.value[0].children.splice(1, 0, {
         name: '',
-        id: newId
-    }))
-    selectId.value = newId
+        id: newId,
+    });
+    selectId.value = newId;
     nextTick(() => {
-        inputRef.value.focus()
-    })
-}
+        inputRef.value.focus();
+    });
+};
 const saveGroup = async (data: any) => {
-    if (addName.value === '') {
-        listData.value[0].children.splice(1,1)
-    } else {
+    if (addName.value === '' ) {
+        if(data.name===''){
+            listData.value[0].children.splice(1, 1);
+        }
+    }
+    else {
         const saveData = {
             name: addName.value,
-            id: data.id
-        }
-        const res = await saveRoleGroup(saveData)
+            id: data.id,
+        };
+        const res = await saveRoleGroup(saveData);
         if (res.status === 200) {
-            onlyMessage('操作成功!')
-            queryGroup()
+            onlyMessage('操作成功!');
+            queryGroup();
         } else {
-            onlyMessage('操作失败!')
+            onlyMessage('操作失败!');
         }
     }
-    setTimeout(()=>{
-        selectId.value = ''
-    },300)
-}
+    setTimeout(() => {
+        selectId.value = '';
+    }, 300);
+};
+
 const search = () => {
-    queryGroup(true, searchValue.value)
-}
+    queryGroup(true, searchValue.value);
+};
 const searchChange = () => {
     if (searchValue.value === '') {
-        queryGroup()
+        queryGroup();
     }
-}
+};
 const selectGroup = (id: string) => {
-    selectedKeys.value = [id]
-    id === 'global_role' ? emit('selectData', '') : emit('selectData', selectedKeys.value)
-}
+    selectedKeys.value = [id];
+    id === 'global_role'
+        ? emit('selectData', '')
+        : emit('selectData', selectedKeys.value);
+};
 const deleteGroup = async (id: string) => {
-    const res: any = await deleteRoleGroup(id)
+    const res: any = await deleteRoleGroup(id);
     if (res.status === 200) {
-        onlyMessage('操作成功!')
-        queryGroup(true)
+        onlyMessage('操作成功!');
+        queryGroup(true);
     } else {
-        onlyMessage('操作失败!')
+        onlyMessage('操作失败!');
     }
-}
+};
 const editGroup = (data: any) => {
-        if(!selectId.value){
-            selectId.value = data.id
-            addName.value = data.name
-            listData.value[0].children.forEach((item: any) => {
-                if (item.id === data.id) {
-                    item.edit = true
-                }
-            })
-            nextTick(() => {
-                inputRef.value.focus()
-            })
-        }
-       
-}
+    if (!selectId.value) {
+        selectId.value = data.id;
+        addName.value = data.name;
+        listData.value[0].children.forEach((item: any) => {
+            if (item.id === data.id) {
+                item.edit = true;
+            }
+        });
+        nextTick(() => {
+            inputRef.value.focus();
+        });
+    }
+};
+
 onMounted(() => {
-    queryGroup(true)
-})
+    queryGroup(true);
+});
 </script>
 <style lang="less" scoped>
 .controls {
@@ -167,11 +229,11 @@ onMounted(() => {
 
     .itemText {
         line-height: 32px;
-        max-width: 40%
+        max-width: 40%;
     }
 }
 
 .listBox {
     margin: 10px 0;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/user/Login/index.vue b/src/views/user/Login/index.vue
index fb7a43e4..f37bd2ea 100644
--- a/src/views/user/Login/index.vue
+++ b/src/views/user/Login/index.vue
@@ -145,7 +145,7 @@
                                                             class="more-button-item"
                                                             v-for="(
                                                                 item, index
-                                                            ) in bindings"
+                                                            ) in bindings.slice(4,bindings.length-1)"
                                                             :key="index"
                                                             @click="
                                                                 handleClickOther(