Merge pull request 'staging' (#25) from staging into master

Reviewed-on: #25

src/views/admin/role.vue

@@ -1,6 +1,11 @@
 <script setup lang="ts">
 import ahTable from "@/components/hTable/index.vue";
-import { ConditionalType, TableConfig } from "@/components/hTable/hTable";
+import {
+  ConditionalType,
+  intTableData,
+  TableColumnSearch,
+  TableConfig,
+} from "@/components/hTable/hTable";
 import { onMounted, ref, defineOptions } from "vue";
 import { fa } from "element-plus/es/locales.mjs";
 import { hTableAPI } from "@/api/hTable";
@@ -12,7 +17,7 @@ defineOptions({
 
 function searchCallback(data) {}
 const table = ref<{ initTable: (config: TableConfig) => void }>(null);
-const tableData: TableConfig = {
+const tableData: TableConfig = intTableData({
   apiUrl: ControllerName,
   selectColumn: false, // 列表选择
   border: false, // 是否显示表格边框
@@ -68,41 +73,42 @@ const tableData: TableConfig = {
     // 行数据
     id: {
       label: "编号",
-      search: true,
+      search: new TableColumnSearch(true),
-      add: false, // 字段允许添加
-      edit: false, // 字段允许修改
       width: "150px",
     },
     name: {
       label: "角色名称",
       width: "180px",
-      search: true,
+      search: new TableColumnSearch(true, ConditionalType.Like),
-      searchType: ConditionalType.Like,
+      edit: {
-      add: true, // 字段允许添加
+        add: true,
-      edit: true, // 字段允许修改
+      },
     },
     enable: {
       label: "启用",
       type: "switch",
-      search: false,
+      search: new TableColumnSearch(true),
-      add: true, // 字段允许添加
+      edit: {
-      edit: true, // 字段允许修改
+        add: true,
-      valueE: true, // 编辑时的默认值
+        edit: true,
+        valueE: true,
+      },
     },
     createTime: {
       label: "创建时间",
       type: "datetime",
-      search: true,
+      search: new TableColumnSearch(true),
-      add: false, // 字段允许添加
-      edit: false, // 字段允许修改
     },
     remark: {
       label: "备注",
       type: "textarea",
-      editRows: 3,
+      search: new TableColumnSearch(true),
-      search: false,
+      edit: {
-      add: true, // 字段允许添加
+        add: true,
-      edit: true, // 字段允许修改
+        edit: true,
+        editRows: 3,
+        valueE: true,
+      },
     },
   },
   data: [],
@@ -110,7 +116,7 @@ const tableData: TableConfig = {
     total: 0,
   },
   selectRows: [],
-};
+});
 
 const showTable = ref(false);
 onMounted(async () => {

src/views/school/index.vue

@@ -43,6 +43,7 @@ const tableData: TableConfig = intTableData({
     },
     {
       topBtn: true, // 头部按钮
+      show: false,
       label: "新增学校",
       perms: "学校新增",
       btnType: "custom", // 按钮类型 add edit del custom