dev #8

Merged
hy merged 45 commits from dev into master 2025-08-26 19:03:29 +08:00
4 changed files with 117 additions and 8 deletions
Showing only changes of commit 8510bc124c - Show all commits

View File

@ -107,7 +107,7 @@ export interface TableColumn {
/* 列宽度 */
width?: string;
/* 字段类型 */
type?: string;
type?: "string" | "dropdown" | "switch" | "img" | "datetime" | "textarea";
/** 是否多选 */
multiple?: boolean;
/** 编辑时显示列 */

View File

@ -75,10 +75,10 @@ function handleSubmitForm() {
}
editData.value.loading = true;
let form = {};
let form: any = {};
if (editData.value.isedit) {
form = props.row;
}
} else form.id = 0;
for (const key in column.value) {
const element = column.value[key];
if (element.valueE !== null && element.valueE !== "") {
@ -154,9 +154,9 @@ function fetchFormData() {
<div v-if="o.type.trim() == 'datetime'">
<el-date-picker
v-model="o.valueE as Date"
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetime"
type="date"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
:placeholder="o.label"
style="width: 100%"
@change="o.change"

View File

@ -380,9 +380,9 @@ function fetchPagedData() {
<el-date-picker
v-if="o.type.trim() == 'datetime'"
v-model="o.value as Date"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
type="date"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
:placeholder="o.label"
style="width: 100%"
/>

109
src/views/admin/role.vue Normal file
View File

@ -0,0 +1,109 @@
<script setup lang="ts">
import ahTable from "@/components/hTable/index.vue";
import { TableConfig } from "@/components/hTable/hTable";
import { onMounted, ref } from "vue";
import { fa } from "element-plus/es/locales.mjs";
import { hTableAPI } from "@/api/hTable";
const ControllerName = "AdminRole";
defineOptions({
name: ControllerName
});
function searchCallback(data) {}
const RoleApi = new hTableAPI("AdminRole");
const table = ref<{ initTable: (config: TableConfig) => void }>(null);
const tableData: TableConfig = {
apiUrl: ControllerName,
selectColumn: false, //
border: false, //
searchCallback: searchCallback,
search: {
//
show: true,
PageIndex: 0,
PageSize: 20,
OrderBy: "CreateTime", //
defaultConditions: [], //
Conditions: []
},
operationColumn: true, //
operationColumnData: [
{
//
topBtn: false, //
label: "修改",
btnType: "edit" // add edit del custom
},
{
//
topBtn: true, //
label: "添加",
btnStyle: "success",
btnType: "add" // add edit del custom
},
{
topBtn: false, //
show: true,
label: "删除",
btnType: "del", // add edit del
btnStyle: "danger" // topBtn: true success danger
}
],
column: {
//
id: {
label: "编号",
search: true,
add: false, //
edit: false, //
width: "150px"
},
name: {
label: "角色名称",
width: "180px",
search: true,
searchType: "Like",
add: true, //
edit: true //
},
enable: {
label: "启用",
type: "switch",
search: false,
add: false, //
edit: true, //
valueE: true //
},
createTime: {
label: "创建时间",
type: "datetime",
search: true,
add: false, //
edit: false //
},
remark: {
label: "备注",
search: false,
add: true, //
edit: true //
}
},
data: [],
pageData: {
total: 0
},
selectRows: []
};
const showTable = ref(false);
onMounted(async () => {
//
showTable.value = true;
});
</script>
<template>
<div><ahTable v-if="showTable" ref="table" :tableConfig="tableData" /></div>
</template>