diff --git a/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_List.vue.vm b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_List.vue.vm index 7cea7b3a..2aeab8c8 100644 --- a/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_List.vue.vm +++ b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_List.vue.vm @@ -202,40 +202,33 @@ import { onMounted, reactive, ref } from 'vue'; import { ElMessageBox, ElMessage } from "element-plus"; import { useUserInfo } from '/@@/stores/userInfo'; - import { VxeGridInstance, VxeGridListeners, VxeGridPropTypes } from 'vxe-table'; import { useVxeTable } from '/@@/hooks/useVxeTableOptionsHook'; import { Local } from '/@@/utils/storage'; import { auth } from '/@@/utils/authFunction'; +import EditDialog from '/@@/views/@(@Model.PagePath)/@(@Model.LowerClassName)/component/editDialog.vue'; +import ModifyRecord from '/@@/components/table/modifyRecord.vue'; @if(@Model.TableField.Any(x=>x.EffectType == "DatePicker")){ +@:// 日历控件 @:import { formatDate } from '/@@/utils/formatTime'; } @if(@Model.PrintType != "off"){ -@:// 推荐设置操作 width 为 200 +@://打印控件 @:import { hiprint } from 'vue-plugin-hiprint'; -@:import { SysPrintApi } from '/@@/api-services/api'; -@:import { SysPrint } from '/@@/api-services/models'; -} -// 子窗口 -@if(@Model.PrintType != "off") { +@:import { SysPrintApi } from '/@@/api-monkey/api'; +@:import { SysPrint } from '/@@/api-monkey/models'; @:import PrintDialog from '/@@/views/system/print/component/hiprint/preview.vue'; } -import EditDialog from '/@@/views/@(@Model.PagePath)/@(@Model.LowerClassName)/component/editDialog.vue'; -import ModifyRecord from '/@@/components/table/modifyRecord.vue'; @if (@Model.IsApiService) { -// 接口函数 +@://接口控件 @:import { getAPI } from '/@@/utils/axios-utils'; - -// 接口 @:import { @(@Model.ClassName)Api } from '/@@/api-services/api'; - -// 模型 @:import { @(@Model.ClassName), @(@Model.ClassName)Input, @(@Model.ClassName)Output } from '/@@/api-services/models'; - } else { +//下面这个是废弃的 @:import { page@(@Model.ClassName), delete@(@Model.ClassName), get@(@Model.ClassName)TotalSum } from '/@@/api/@(@Model.PagePath)/@(@Model.LowerClassName)'; foreach (var column in Model.QueryWhetherList){ if(@column.EffectType == "ForeignKey"){ @@ -247,24 +240,26 @@ foreach (var column in Model.QueryWhetherList){ } } -// 子窗口对象 +//基础变量 const xGrid = ref(); -@if(@Model.PrintType != "off") { -@:const printDialogRef = ref>(); -} const editDialogRef = ref>(); const userStore = useUserInfo(); - +@if(@Model.PrintType != "off") { +@://打印控件 +@:const printDialogRef = ref>(); +} @if(@Model.TableField.Any(x=>x.EffectType == "ConstSelector")){ +@://常量控件 @:const codeToName = userStore.codeToName; } @if(@Model.TableField.Any(x=>x.EffectType == "DictSelector") || @Model.TableField.Any(x=>x.EffectType == "EnumSelector")){ +@//字典枚举控件 @:const dc = userStore.getDictItemByValue; @:const dv = userStore.getDictItemByLabel; @:const dl = userStore.getDictDataByCode; } -// 变量 +// 变量赋值 const state = reactive({ showAdvanceQueryUI: false, queryParams: { @@ -339,7 +334,7 @@ const checkTableColumnVisible = (tableColumnName: any) => { } } @if(@Model.TableField.Any(t => t.ColumnName == "CreateTime") && @Model.TableField.Any(t => t.ColumnName == "UpdateTime") && @Model.TableField.Any(t => t.ColumnName == "CreateUserId")){ - @:{ title: '修改记录', width: 100, showOverflow: 'tooltip', slots: { default: 'row_record' } }, + @:{ field: 'record', title: '修改记录', width: 100, showOverflow: 'tooltip', slots: { default: 'row_record' } }, } { field: 'buttons', title: '操作', fixed: 'right', width: 180, showOverflow: true, slots: { default: 'row_buttons' } }, ], @@ -427,6 +422,7 @@ const listhandleQuery= async (qparams: any) => { if(qparams) state.queryParams=qparams; await handleQuery(true); }; + // 重置操作 const resetQuery = async () => { state.queryParams.searchKey = undefined; @@ -569,13 +565,3 @@ const listClick = (row: any,column:any) => { defineExpose({ listhandleQuery }); - diff --git a/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_TreeList.vue.vm b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_TreeList.vue.vm index f781c7b9..82788ea4 100644 --- a/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_TreeList.vue.vm +++ b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_TreeList.vue.vm @@ -179,9 +179,9 @@ } } } - + - - - diff --git a/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_editDialog.vue.vm b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_editDialog.vue.vm index 7a1e0434..931bc9b6 100644 --- a/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_editDialog.vue.vm +++ b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_editDialog.vue.vm @@ -134,7 +134,7 @@ @::src="state.ruleForm.@(@column.LowerPropertyName)" @:@@click="state.ruleForm.@(@column.LowerPropertyName)=''" @:style="width: 100%; height: 100%; object-fit: contain"/> - @: + @: @@ -170,35 +170,25 @@ - - - -