staging #25

Merged
hy merged 2 commits from staging into master 2025-10-14 15:44:52 +08:00
2 changed files with 28 additions and 21 deletions
Showing only changes of commit 154c113c6b - Show all commits

View File

@ -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,
add: false, //
edit: false, //
search: new TableColumnSearch(true),
width: "150px",
},
name: {
label: "角色名称",
width: "180px",
search: true,
searchType: ConditionalType.Like,
add: true, //
edit: true, //
search: new TableColumnSearch(true, ConditionalType.Like),
edit: {
add: true,
},
},
enable: {
label: "启用",
type: "switch",
search: false,
add: true, //
edit: true, //
valueE: true, //
search: new TableColumnSearch(true),
edit: {
add: true,
edit: true,
valueE: true,
},
},
createTime: {
label: "创建时间",
type: "datetime",
search: true,
add: false, //
edit: false, //
search: new TableColumnSearch(true),
},
remark: {
label: "备注",
type: "textarea",
editRows: 3,
search: false,
add: true, //
edit: true, //
search: new TableColumnSearch(true),
edit: {
add: true,
edit: true,
editRows: 3,
valueE: true,
},
},
},
data: [],
@ -110,7 +116,7 @@ const tableData: TableConfig = {
total: 0,
},
selectRows: [],
};
});
const showTable = ref(false);
onMounted(async () => {

View File

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