Merge branch 'master' into net6.0

ZR.CodeGenerator/CodeGenerateTemplate.cs

@@ -166,97 +166,6 @@ namespace ZR.CodeGenerator
             return sb.ToString();
         }
 
-        ///// <summary>
-        ///// Vue 查询表单
-        ///// </summary>
-        ///// <param name="dbFieldInfo"></param>
-        ///// <returns></returns>
-        //public static string TplQueryFormHtml(GenTableColumn dbFieldInfo)
-        //{
-        //    StringBuilder sb = new();
-        //    string columnName = dbFieldInfo.CsharpFieldFl;
-        //    string labelName = CodeGeneratorTool.GetLabelName(dbFieldInfo.ColumnComment, dbFieldInfo.CsharpField);
-        //    if (!dbFieldInfo.IsQuery) return sb.ToString();
-        //    if (dbFieldInfo.HtmlType == GenConstants.HTML_DATETIME)
-        //    {
-        //        sb.AppendLine($"      <el-form-item label=\"{labelName}\">");
-        //        sb.AppendLine($"        <el-date-picker v-model=\"dateRange{dbFieldInfo.CsharpField}\" style=\"width: 240px\" value-format=\"yyyy-MM-dd\" type=\"daterange\" range-separator=\"-\" start-placeholder=\"开始日期\"");
-        //        sb.AppendLine($"          end-placeholder=\"结束日期\" placeholder=\"请选择{dbFieldInfo.ColumnComment}\" :picker-options=\"{{ firstDayOfWeek: 1}}\"></el-date-picker>");
-        //        sb.AppendLine("      </el-form-item>");
-        //    }
-        //    else if (dbFieldInfo.HtmlType == GenConstants.HTML_SELECT || dbFieldInfo.HtmlType == GenConstants.HTML_RADIO)
-        //    {
-        //        sb.AppendLine($"      <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
-        //        sb.AppendLine($"        <el-select v-model=\"queryParams.{columnName}\" placeholder=\"请选择{dbFieldInfo.ColumnComment}\" >");
-        //        sb.AppendLine($"          <el-option v-for=\"item in {columnName}Options\" :key=\"item.dictValue\" :label=\"item.dictLabel\" :value=\"item.dictValue\"></el-option>");
-        //        sb.AppendLine("        </el-select>");
-        //        sb.AppendLine("      </el-form-item>");
-        //    }
-        //    else
-        //    {
-        //        string inputNumTxt = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? ".number" : "";
-        //        sb.AppendLine($"      <el-form-item label=\"{ labelName}\" prop=\"{columnName}\">");
-        //        sb.AppendLine($"        <el-input v-model{inputNumTxt}=\"queryParams.{columnName}\" placeholder=\"请输入{dbFieldInfo.ColumnComment}\" />");
-        //        sb.AppendLine("      </el-form-item>");
-        //    }
-
-        //    return sb.ToString();
-        //}
-
-        ///// <summary>
-        ///// Vue 查询列表
-        ///// </summary>
-        ///// <param name="dbFieldInfo"></param>
-        ///// <param name="genTable"></param>
-        ///// <returns></returns>
-        //public static string TplTableColumn(GenTableColumn dbFieldInfo, GenTable genTable)
-        //{
-        //    string columnName = dbFieldInfo.CsharpFieldFl;
-        //    string label = CodeGeneratorTool.GetLabelName(dbFieldInfo.ColumnComment, columnName);
-        //    string showToolTip = ShowToolTip(dbFieldInfo);
-        //    string formatter = GetFormatter(dbFieldInfo.HtmlType, columnName);
-        //    StringBuilder sb = new StringBuilder();
-        //    //自定义排序字段
-        //    if (GenConstants.HTML_CUSTOM_INPUT.Equals(dbFieldInfo.HtmlType) && !dbFieldInfo.IsPk)
-        //    {
-        //        sb.AppendLine($@"      <el-table-column prop=""{columnName}"" label=""{label}"" width=""90"" sortable align=""center"">");
-        //        sb.AppendLine(@"        <template slot-scope=""scope"">");
-        //        sb.AppendLine($@"          <span v-show=""editIndex != scope.$index"" @click=""editCurrRow(scope.$index,'rowkeY')"">{{{{scope.row.{columnName}}}}}</span>");
-        //        sb.AppendLine(@"          <el-input :id=""scope.$index+'rowkeY'"" size=""mini"" v-show=""(editIndex == scope.$index)""");
-        //        sb.AppendLine($@"            v-model=""scope.row.{columnName}"" @blur=""handleChangeSort(scope.row)""></el-input>");
-        //        sb.AppendLine(@"        </template>");
-        //        sb.AppendLine(@"      </el-table-column>");
-        //    }
-        //    else if (dbFieldInfo.IsList && dbFieldInfo.HtmlType.Equals(GenConstants.HTML_IMAGE_UPLOAD))
-        //    {
-        //        sb.AppendLine($"      <el-table-column prop=\"{columnName}\" align=\"center\" label=\"{label}\">");
-        //        sb.AppendLine("         <template slot-scope=\"scope\">");
-        //        sb.AppendLine($"            <el-image class=\"table-td-thumb\" fit=\"contain\" :src=\"scope.row.{columnName}\" :preview-src-list=\"[scope.row.{columnName}]\">");
-        //        sb.AppendLine("              <div slot=\"error\"><i class=\"el-icon-document\" /></div>");
-        //        sb.AppendLine("            </el-image>");
-        //        sb.AppendLine("         </template>");
-        //        sb.AppendLine("       </el-table-column>");
-        //    }
-        //    else if (dbFieldInfo.IsList && !string.IsNullOrEmpty(formatter))
-        //    {
-        //        sb.AppendLine($@"      <el-table-column label=""{label}"" align=""center"" prop=""{columnName}"">");
-        //        sb.AppendLine(@"        <template slot-scope=""scope"">");
-        //        string checkboxHtml = string.Empty;
-        //        if (dbFieldInfo.HtmlType == GenConstants.HTML_CHECKBOX)
-        //        {
-        //            checkboxHtml = $" ? scope.row.{columnName}.split(',') : []";
-        //        }
-        //        sb.AppendLine($"          <dict-tag :options=\"{columnName}Options\" :value=\"scope.row.{columnName}{checkboxHtml}\"/>");
-        //        sb.AppendLine(@"        </template>");
-        //        sb.AppendLine(@"      </el-table-column>");
-        //    }
-        //    else if (dbFieldInfo.IsList)
-        //    {
-        //        sb.AppendLine($"      <el-table-column prop=\"{columnName}\" label=\"{label}\" align=\"center\"{showToolTip}{formatter}/>");
-        //    }
-        //    return sb.ToString();
-        //}
-
         #endregion
 
         //模板调用

ZR.Model/PagedInfo.cs

@@ -40,7 +40,7 @@ namespace ZR.Model
             set { }
         }
         public List<T> Result { get; set; }
-
+        public Dictionary<string, object> Extra { get; set; } = new Dictionary<string, object>();
         public PagedInfo()
         {
         }

ZR.Repository/BaseRepository.cs

@@ -45,75 +45,14 @@ namespace ZR.Repository
             return Context.Insertable(t).IgnoreColumns(true).ExecuteCommand();
         }
 
-        //public int Insert(SqlSugarClient client, T t)
-        //{
-        //    return client.Insertable(t).ExecuteCommand();
-        //}
-
         public int Insert(List<T> t)
         {
             return Context.Insertable(t).ExecuteCommand();
         }
-        //public long InsertReturnBigIdentity(T t)
-        //{
-        //    return Context.Insertable(t).ExecuteReturnBigIdentity();
-        //}
-
-        //public int InsertIgnoreNullColumn(List<T> t)
-        //{
-        //    return base.Context.Insertable(t).IgnoreColumns(true).ExecuteCommand();
-        //}
-
-        //public int InsertIgnoreNullColumn(List<T> t, params string[] columns)
-        //{
-        //    return base.Context.Insertable(t).IgnoreColumns(columns).ExecuteCommand();
-        //}
         public int Insert(T parm, Expression<Func<T, object>> iClumns = null, bool ignoreNull = true)
         {
             return Context.Insertable(parm).InsertColumns(iClumns).IgnoreColumns(ignoreNullColumn: ignoreNull).ExecuteCommand();
         }
-        //public DbResult<bool> InsertTran(T t)
-        //{
-        //    var result = base.Context.Ado.UseTran(() =>
-        //    {
-        //        base.Context.Insertable(t).ExecuteCommand();
-        //    });
-        //    return result;
-        //}
-
-        //public DbResult<bool> InsertTran(List<T> t)
-        //{
-        //    var result = base.Context.Ado.UseTran(() =>
-        //    {
-        //        base.Context.Insertable(t).ExecuteCommand();
-        //    });
-        //    return result;
-        //}
-
-        //public T InsertReturnEntity(T t)
-        //{
-        //    return base.Context.Insertable(t).ExecuteReturnEntity();
-        //}
-
-        //public T InsertReturnEntity(T t, string sqlWith = SqlWith.UpdLock)
-        //{
-        //    return base.Context.Insertable(t).With(sqlWith).ExecuteReturnEntity();
-        //}
-
-        //public bool ExecuteCommand(string sql, object parameters)
-        //{
-        //    return base.Context.Ado.ExecuteCommand(sql, parameters) > 0;
-        //}
-
-        //public bool ExecuteCommand(string sql, params SugarParameter[] parameters)
-        //{
-        //    return base.Context.Ado.ExecuteCommand(sql, parameters) > 0;
-        //}
-
-        //public bool ExecuteCommand(string sql, List<SugarParameter> parameters)
-        //{
-        //    return base.Context.Ado.ExecuteCommand(sql, parameters) > 0;
-        //}
         public IInsertable<T> Insertable(T t)
         {
             return Context.Insertable<T>(t);

ZR.Vue/src/assets/styles/btn.scss

@@ -40,60 +40,3 @@
 .yellow-btn {
   @include colorBtn($yellow)
 }
-
-.pan-btn {
-  font-size: 14px;
-  color: #fff;
-  padding: 14px 36px;
-  border-radius: 8px;
-  border: none;
-  outline: none;
-  transition: 600ms ease all;
-  position: relative;
-  display: inline-block;
-
-  &:hover {
-    background: #fff;
-
-    &:before,
-    &:after {
-      width: 100%;
-      transition: 600ms ease all;
-    }
-  }
-
-  &:before,
-  &:after {
-    content: '';
-    position: absolute;
-    top: 0;
-    right: 0;
-    height: 2px;
-    width: 0;
-    transition: 400ms ease all;
-  }
-
-  &::after {
-    right: inherit;
-    top: inherit;
-    left: 0;
-    bottom: 0;
-  }
-}
-
-.custom-button {
-  display: inline-block;
-  line-height: 1;
-  white-space: nowrap;
-  cursor: pointer;
-  background: #fff;
-  color: #fff;
-  -webkit-appearance: none;
-  text-align: center;
-  box-sizing: border-box;
-  outline: 0;
-  margin: 0;
-  padding: 10px 15px;
-  font-size: 14px;
-  border-radius: 4px;
-}

ZR.Vue/src/assets/styles/index.scss

@@ -96,71 +96,15 @@ div:focus {
   }
 }
 
-aside {
-  background: #eef1f6;
-  padding: 8px 24px;
-  margin-bottom: 20px;
-  border-radius: 2px;
-  display: block;
-  line-height: 32px;
-  font-size: 16px;
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
-  color: #2c3e50;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-
-  a {
-    color: #337ab7;
-    cursor: pointer;
-
-    &:hover {
-      color: rgb(32, 160, 255);
-    }
-  }
-}
-
 //main-container全局样式
 .app-container {
   padding: 20px;
 }
 
-.components-container {
-  margin: 30px 50px;
-  position: relative;
-}
-
-.pagination-container {
-  margin-top: 30px;
-}
-
 .text-center {
   text-align: center
 }
 
-.sub-navbar {
-  height: 50px;
-  line-height: 50px;
-  position: relative;
-  width: 100%;
-  text-align: right;
-  padding-right: 20px;
-  transition: 600ms ease position;
-  background: linear-gradient(90deg, rgba(32, 182, 249, 1) 0%, rgba(32, 182, 249, 1) 0%, rgba(33, 120, 241, 1) 100%, rgba(33, 120, 241, 1) 100%);
-
-  .subtitle {
-    font-size: 20px;
-    color: #fff;
-  }
-
-  &.draft {
-    background: #d0d0d0;
-  }
-
-  &.deleted {
-    background: #d0d0d0;
-  }
-}
-
 .link-type,
 .link-type:focus {
   color: #337ab7;
@@ -171,15 +115,6 @@ aside {
   }
 }
 
-//refine vue-multiselect plugin
-.multiselect {
-  line-height: 16px;
-}
-
-.multiselect--active {
-  z-index: 1000 !important;
-}
-
 /** 基础通用 **/
 .pt5 {
   padding-top: 5px;
@@ -265,27 +200,6 @@ aside {
   margin-top: 6vh !important;
 }
 
-/** 表格布局 **/
-.pagination-container {
-  position: relative;
-  height: 25px;
-  margin-top: 5px;
-  padding: 10px 20px !important;
-}
-
-/* tree border */
-.tree-border {
-  margin-top: 5px;
-  border: 1px solid #e5e6e7;
-  background: #FFFFFF none;
-  border-radius: 4px;
-}
-
-.pagination-container .el-pagination {
-  right: 0;
-  position: absolute;
-}
-
 .pull-right {
   float: right !important;
 }
@@ -336,139 +250,12 @@ aside {
   border-radius: 50%;
 }
 
-.img-lg {
-  width: 120px;
-  height: 120px;
-}
-
-.vue-treeselect.mini {
-  font-size: 12px !important;
-}
-
-.vue-treeselect.small {
-  font-size: 13px !important;
-}
-
-.vue-treeselect.medium {
-  font-size: 14px !important;
-}
-
-.vue-treeselect.mini .vue-treeselect__control {
-  height: 28px;
-}
-
-.vue-treeselect.small .vue-treeselect__control {
-  height: 32px;
-}
-
-.vue-treeselect.medium .vue-treeselect__control {
-  height: 34px;
-}
-
-.vue-treeselect.mini .vue-treeselect__single-value {
-  line-height: 28px;
-}
-
-.vue-treeselect.small .vue-treeselect__single-value {
-  line-height: 32px;
-}
-
-.vue-treeselect.medium .vue-treeselect__single-value {
-  line-height: 34px;
-}
-
-
-.list-group-striped>.list-group-item {
-  border-left: 0;
-  border-right: 0;
-  border-radius: 0;
-  padding-left: 0;
-  padding-right: 0;
-}
-
-.list-group {
-  padding-left: 0px;
-  list-style: none;
-}
-
-.list-group-item {
-  border-bottom: 1px solid #e7eaec;
-  border-top: 1px solid #e7eaec;
-  margin-bottom: -1px;
-  padding: 11px 0px;
-  font-size: 13px;
-}
-
-.pull-right {
-  float: right !important;
-}
-
-.el-card__header {
-  padding: 14px 15px 7px;
-  min-height: 40px;
-}
-
-.el-card__body {
-  padding: 15px 20px 20px 20px;
-}
-
 .card-box {
   padding-right: 15px;
   padding-left: 15px;
   margin-bottom: 10px;
 }
 
-/* button color */
-.el-button--cyan.is-active,
-.el-button--cyan:active {
-  background: #20B2AA;
-  border-color: #20B2AA;
-  color: #FFFFFF;
-}
-
-.el-button--cyan:focus,
-.el-button--cyan:hover {
-  background: #48D1CC;
-  border-color: #48D1CC;
-  color: #FFFFFF;
-}
-
-.el-button--cyan {
-  background-color: #20B2AA;
-  border-color: #20B2AA;
-  color: #FFFFFF;
-}
-
-
-.img-lg {
-  width: 120px;
-  height: 120px;
-}
-
-// 导航栏头像
-.avatar-upload-preview {
-  position: absolute;
-  top: 50%;
-  transform: translate(50%, -50%);
-  width: 180px;
-  height: 180px;
-  border-radius: 50%;
-  box-shadow: 0 0 4px #ccc;
-  overflow: hidden;
-}
-
-/* 拖拽列样式 */
-.sortable-ghost {
-  opacity: .8;
-  color: #fff !important;
-  background: #42b983 !important;
-}
-
-.top-right-btn {
-  position: relative;
-  float: right;
-}
-
 .icon {
   width: 100px;
 }

ZR.Vue/src/components/Pagination/index.vue

@@ -93,7 +93,7 @@ export default {
 <style scoped>
 .pagination-container {
   background: #fff;
-  padding: 32px 16px;
+  padding: 16px 16px;
 }
 .pagination-container.hidden {
   display: none;

ZR.Vue/src/components/RightToolbar/index.vue

@@ -86,4 +86,10 @@ export default {
 .el-dropdown-item {
   padding: 5px;
 }
+
+.top-right-btn {
+  position: relative;
+  float: right;
+}
+
 </style>

ZR.Vue/src/views/system/article/publish.vue

@@ -31,7 +31,7 @@
         </el-col>
         <el-col :lg="24">
           <el-form-item label="" style="text-align:right;">
-            <el-button type="cyan" size="mini" @click="handlePublish('1')">发布文章</el-button>
+            <el-button size="mini" @click="handlePublish('1')">发布文章</el-button>
             <el-button type="success" size="mini" @click="handlePublish('2')">存为草稿</el-button>
           </el-form-item>
         </el-col>

ZR.Vue/src/views/system/role/index.vue

@@ -589,3 +589,12 @@ export default {
   }
 }
 </script>
+<style scoped>
+/* tree border */
+.tree-border {
+  margin-top: 5px;
+  border: 1px solid #e5e6e7;
+  background: #ffffff none;
+  border-radius: 4px;
+}
+</style>

ZR.Vue/src/views/system/user/profile/index.vue

@@ -64,39 +64,65 @@
 </template>
 
 <script>
-import userAvatar from "./userAvatar";
+import userAvatar from './userAvatar'
-import userInfo from "./userInfo";
+import userInfo from './userInfo'
-import resetPwd from "./resetPwd";
+import resetPwd from './resetPwd'
-import operLog from "./operLog.vue";
+import operLog from './operLog.vue'
-import { getUserProfile } from "@/api/system/user";
+import { getUserProfile } from '@/api/system/user'
 
 export default {
-  name: "Profile",
+  name: 'Profile',
   components: { userAvatar, userInfo, resetPwd, operLog },
   data() {
     return {
       user: {},
       roles: [],
-      postGroup: "",
+      postGroup: '',
-      activeTab: "userinfo",
+      activeTab: 'userinfo',
-      activeName: "first",
+      activeName: 'first'
-    };
+    }
   },
   created() {
-    this.getUser();
+    this.getUser()
   },
   methods: {
     getUser() {
       getUserProfile().then((response) => {
-        this.user = response.data.user;
+        this.user = response.data.user
-        this.roles = response.data.roles;
+        this.roles = response.data.roles
-        this.roleGroup = response.data.roleGroup;
+        this.roleGroup = response.data.roleGroup
-        this.postGroup = response.data.postGroup;
+        this.postGroup = response.data.postGroup
-      });
+      })
     },
     handleTabClick(tab, event) {
-      console.log(tab, event);
+      console.log(tab, event)
-    },
+    }
-  },
+  }
-};
+}
 </script>
+<style scoped>
+.list-group-striped > .list-group-item {
+  border-left: 0;
+  border-right: 0;
+  border-radius: 0;
+  padding-left: 0;
+  padding-right: 0;
+}
+
+.list-group {
+  padding-left: 0px;
+  list-style: none;
+}
+
+.list-group-item {
+  border-bottom: 1px solid #e7eaec;
+  border-top: 1px solid #e7eaec;
+  margin-bottom: -1px;
+  padding: 11px 0px;
+  font-size: 13px;
+}
+
+.pull-right {
+  float: right !important;
+}
+</style>

ZR.Vue/src/views/system/user/profile/userAvatar.vue

@@ -154,4 +154,22 @@ export default {
   line-height: 110px;
   border-radius: 50%;
 }
+
+.img-lg {
+  width: 120px;
+  height: 120px;
+}
+
+// 导航栏头像
+.avatar-upload-preview {
+  position: absolute;
+  top: 50%;
+  transform: translate(50%, -50%);
+  width: 180px;
+  height: 180px;
+  border-radius: 50%;
+  box-shadow: 0 0 4px #ccc;
+  overflow: hidden;
+}
+
 </style>