fix: bug fix

Author: dataeaseShu

frontend/src/style.less

@@ -164,6 +164,10 @@ body {
   .tip {
     margin-top: 24px;
   }
+
+  .ed-message-box__message {
+    width: 95%;
+  }
 }
 
 .form-content_error {

frontend/src/views/system/permission/auth-tree/FilterFiled.vue

@@ -152,7 +152,22 @@ const emits = defineEmits(['update:item', 'del'])
           >
           </el-option>
         </el-select>
+        <el-select
+          v-if="['null', 'empty'].includes(item.term)"
+          v-model="item.term"
+          style="max-width: 280px; margin-left: 8px"
+          :placeholder="t('datasource.Please_select')"
+        >
+          <el-option
+            v-for="ele in operators"
+            :key="ele.value"
+            :label="t(ele.label)"
+            :value="ele.value"
+          >
+          </el-option>
+        </el-select>
         <el-input
+          v-else
           v-model="item.value"
           style="max-width: 280px; margin-left: 8px"
           :placeholder="$t('datasource.please_enter')"

frontend/src/views/system/permission/index.vue

@@ -25,8 +25,8 @@ const termFormRef = ref()
 const columnFormRef = ref()
 const drawerTitle = ref('')
 const dialogTitle = ref('')
-const activeDs = ref({})
-const activeTable = ref({})
+const activeDs = ref(null)
+const activeTable = ref(null)
 const ruleList = ref<any[]>([])
 
 const defaultPermission = {
@@ -146,8 +146,8 @@ const saveAuthTree = (val: any) => {
   dialogFormVisible.value = false
 }
 const getDsList = (row: any) => {
-  activeDs.value = {}
-  activeTable.value = {}
+  activeDs.value = null
+  activeTable.value = null
   datasourceApi
     .list()
     .then((res: any) => {
@@ -211,6 +211,17 @@ const handleColumnPermission = (row: any) => {
     : t('permission.add_column_permission')
 }
 
+const handleInitDsIdChange = (val: any) => {
+  columnForm.ds_id = val.id
+  columnForm.ds_name = val.name
+  datasourceApi.tableList(val.id).then((res: any) => {
+    tableListOptions.value = res || []
+    activeTable.value = null
+    fieldListOptions.value = []
+    columnForm.permissions = []
+  })
+}
+
 const handleDsIdChange = (val: any) => {
   columnForm.ds_id = val.id
   columnForm.ds_name = val.name
@@ -598,6 +609,8 @@ const columnRules = {
         >
           <el-form-item prop="name" :label="t('permission.rule_group_name')">
             <el-input
+              maxlength="50"
+              clearable
               v-model="currentPermission.name"
               :placeholder="
                 $t('datasource.please_enter') +
@@ -741,6 +754,8 @@ const columnRules = {
         <el-form-item prop="name" :label="t('permission.rule_name')">
           <el-input
             v-model="columnForm.name"
+            maxlength="50"
+            clearable
             :placeholder="
               $t('datasource.please_enter') + $t('common.empty') + $t('permission.rule_name')
             "
@@ -750,12 +765,13 @@ const columnRules = {
         <el-form-item prop="table_id" :label="t('permission.data_table')">
           <el-select
             v-model="activeDs"
+            filterable
             style="width: 416px"
             value-key="id"
             :placeholder="
               $t('datasource.Please_select') + $t('common.empty') + $t('permission.data_source')
             "
-            @change="handleDsIdChange"
+            @change="handleInitDsIdChange"
           >
             <el-option
               v-for="item in dsListOptions"
@@ -766,6 +782,7 @@ const columnRules = {
           </el-select>
           <el-select
             v-model="activeTable"
+            filterable
             style="width: 416px; margin-left: auto"
             :disabled="!columnForm.ds_id"
             value-key="id"