对话框统一调整头部和底部风格

Author: zhontai

src/modules/admin/ZhonTai.Admin.Contracts/Domain/PrintTemplate/PrintTemplateEntity.cs

@@ -9,7 +9,8 @@ namespace ZhonTai.Admin.Domain.PrintTemplate;
 /// 打印模板
 /// </summary>
 [Table(Name = DbConsts.TableNamePrefix + "print_template")]
-[Index("idx_{tablename}_01", $"{nameof(Name)},{nameof(TenantId)}", true)]
+[Index("idx_{tablename}_01", $"{nameof(TenantId)},{nameof(Name)}", true)]
+[Index("idx_{tablename}_01", $"{nameof(TenantId)},{nameof(Code)}", true)]
 public partial class PrintTemplateEntity : EntityVersion, ITenant
 {
     /// <summary>

ui/zhontai.ui.admin.vue3/src/theme/element.scss

@@ -240,13 +240,22 @@
     width: 100%;
     height: 100%;
     .el-dialog {
+      --el-dialog-padding-primary: 0px;
       margin: 0 auto !important;
       position: absolute;
+      .el-dialog__header {
+        padding: 16px;
+        .el-dialog__headerbtn {
+          height: 56px;
+        }
+        border-bottom: 1px solid var(--el-border-color);
+      }
       .el-dialog__body {
         padding: 20px;
       }
       .el-dialog__footer {
-        padding: var(--el-dialog-padding-primary);
+        padding: 16px;
+        border-top: 1px solid var(--el-border-color);
       }
     }
   }

ui/zhontai.ui.admin.vue3/src/views/admin/task/components/json-editor-dialog.vue

@@ -10,7 +10,7 @@
         <el-button type="primary" @click="onJsonShell" size="default">Shell</el-button>
         <el-button type="primary" @click="onJsonHttp" size="default">Http</el-button>
       </div>
-      <MyJsonEditor ref="jsonEditorRef" v-model="state.content" :options="{}"></MyJsonEditor>
+      <MyJsonEditor ref="jsonEditorRef" v-model="state.content" :options="{ modes: [] }"></MyJsonEditor>
     </div>
     <template #footer>
       <div style="flex: auto; padding: 20px !important">

ui/zhontai.ui.admin.vue3/src/views/example/make/tableDemo/search.vue

@@ -2,7 +2,7 @@
   <div class="table-search-container" v-if="props.search.length > 0">
     <el-form ref="tableSearchRef" :model="state.form" size="default" label-width="100px" class="table-form">
       <el-row>
-        <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="4" class="mb20" v-for="(val, key) in search" :key="key" v-show="key === 0 || state.isToggle">
+        <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="4" class="mb20" v-for="(val, key) in search" :key="key" v-show="key <= 2 || state.isToggle">
           <template v-if="val.type !== ''">
             <el-form-item
               :label="val.label"