diff --git a/ZR.CodeGenerator/CodeGenerateTemplate.cs b/ZR.CodeGenerator/CodeGenerateTemplate.cs index def1212..03fcdbc 100644 --- a/ZR.CodeGenerator/CodeGenerateTemplate.cs +++ b/ZR.CodeGenerator/CodeGenerateTemplate.cs @@ -166,97 +166,6 @@ namespace ZR.CodeGenerator return sb.ToString(); } - ///// - ///// Vue 查询表单 - ///// - ///// - ///// - //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($" "); - // sb.AppendLine($" "); - // sb.AppendLine(" "); - // } - // else if (dbFieldInfo.HtmlType == GenConstants.HTML_SELECT || dbFieldInfo.HtmlType == GenConstants.HTML_RADIO) - // { - // sb.AppendLine($" "); - // sb.AppendLine($" "); - // sb.AppendLine($" "); - // sb.AppendLine(" "); - // sb.AppendLine(" "); - // } - // else - // { - // string inputNumTxt = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? ".number" : ""; - // sb.AppendLine($" "); - // sb.AppendLine($" "); - // sb.AppendLine(" "); - // } - - // return sb.ToString(); - //} - - ///// - ///// Vue 查询列表 - ///// - ///// - ///// - ///// - //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($@" "); - // sb.AppendLine(@" "); - // sb.AppendLine(@" "); - // } - // else if (dbFieldInfo.IsList && dbFieldInfo.HtmlType.Equals(GenConstants.HTML_IMAGE_UPLOAD)) - // { - // sb.AppendLine($" "); - // sb.AppendLine(" "); - // sb.AppendLine(" "); - // } - // else if (dbFieldInfo.IsList && !string.IsNullOrEmpty(formatter)) - // { - // sb.AppendLine($@" "); - // sb.AppendLine(@" "); - // sb.AppendLine(@" "); - // } - // else if (dbFieldInfo.IsList) - // { - // sb.AppendLine($" "); - // } - // return sb.ToString(); - //} - #endregion //模板调用 diff --git a/ZR.Model/PagedInfo.cs b/ZR.Model/PagedInfo.cs index ee2ea0e..08ea554 100644 --- a/ZR.Model/PagedInfo.cs +++ b/ZR.Model/PagedInfo.cs @@ -40,7 +40,7 @@ namespace ZR.Model set { } } public List Result { get; set; } - + public Dictionary Extra { get; set; } = new Dictionary(); public PagedInfo() { } diff --git a/ZR.Repository/BaseRepository.cs b/ZR.Repository/BaseRepository.cs index 19d59f6..48a9f49 100644 --- a/ZR.Repository/BaseRepository.cs +++ b/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) { return Context.Insertable(t).ExecuteCommand(); } - //public long InsertReturnBigIdentity(T t) - //{ - // return Context.Insertable(t).ExecuteReturnBigIdentity(); - //} - - //public int InsertIgnoreNullColumn(List t) - //{ - // return base.Context.Insertable(t).IgnoreColumns(true).ExecuteCommand(); - //} - - //public int InsertIgnoreNullColumn(List t, params string[] columns) - //{ - // return base.Context.Insertable(t).IgnoreColumns(columns).ExecuteCommand(); - //} public int Insert(T parm, Expression> iClumns = null, bool ignoreNull = true) { return Context.Insertable(parm).InsertColumns(iClumns).IgnoreColumns(ignoreNullColumn: ignoreNull).ExecuteCommand(); } - //public DbResult InsertTran(T t) - //{ - // var result = base.Context.Ado.UseTran(() => - // { - // base.Context.Insertable(t).ExecuteCommand(); - // }); - // return result; - //} - - //public DbResult InsertTran(List 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 parameters) - //{ - // return base.Context.Ado.ExecuteCommand(sql, parameters) > 0; - //} public IInsertable Insertable(T t) { return Context.Insertable(t); diff --git a/ZR.Vue/src/assets/styles/btn.scss b/ZR.Vue/src/assets/styles/btn.scss index e6ba1a8..6730c40 100644 --- a/ZR.Vue/src/assets/styles/btn.scss +++ b/ZR.Vue/src/assets/styles/btn.scss @@ -39,61 +39,4 @@ .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; -} +} \ No newline at end of file diff --git a/ZR.Vue/src/assets/styles/index.scss b/ZR.Vue/src/assets/styles/index.scss index 8d568f1..b9c6097 100644 --- a/ZR.Vue/src/assets/styles/index.scss +++ b/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; } diff --git a/ZR.Vue/src/components/Pagination/index.vue b/ZR.Vue/src/components/Pagination/index.vue index 5f9dbad..e51c145 100644 --- a/ZR.Vue/src/components/Pagination/index.vue +++ b/ZR.Vue/src/components/Pagination/index.vue @@ -93,7 +93,7 @@ export default { diff --git a/ZR.Vue/src/views/system/article/publish.vue b/ZR.Vue/src/views/system/article/publish.vue index 3c8af18..6f58bd6 100644 --- a/ZR.Vue/src/views/system/article/publish.vue +++ b/ZR.Vue/src/views/system/article/publish.vue @@ -31,7 +31,7 @@ - 发布文章 + 发布文章 存为草稿 diff --git a/ZR.Vue/src/views/system/role/index.vue b/ZR.Vue/src/views/system/role/index.vue index aefbb47..c6c1f79 100644 --- a/ZR.Vue/src/views/system/role/index.vue +++ b/ZR.Vue/src/views/system/role/index.vue @@ -436,7 +436,7 @@ export default { this.form.deptCheckStrictly = !!value } }, - //菜单筛选 + // 菜单筛选 menuFilterNode(value, data) { if (!value) return true return data.label.indexOf(value) !== -1 @@ -589,3 +589,12 @@ export default { } } + \ No newline at end of file diff --git a/ZR.Vue/src/views/system/user/profile/index.vue b/ZR.Vue/src/views/system/user/profile/index.vue index 5e88fed..477fd87 100644 --- a/ZR.Vue/src/views/system/user/profile/index.vue +++ b/ZR.Vue/src/views/system/user/profile/index.vue @@ -64,39 +64,65 @@ + \ No newline at end of file diff --git a/ZR.Vue/src/views/system/user/profile/userAvatar.vue b/ZR.Vue/src/views/system/user/profile/userAvatar.vue index 9c30a63..1340685 100644 --- a/ZR.Vue/src/views/system/user/profile/userAvatar.vue +++ b/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; +} +