Skip to content

D
dd_school
Commit affdbaa6 by zhaopanyu
Options

zpy 12.19

parent cc54d61f
Showing with 168 additions and 139 deletions
ruoyi-ui/src/views/smartSchool/electronicArchives/basicInformation/index.vue
......@@ -1428,6 +1428,7 @@ export default {
margin-top: -2px;
margin-bottom: -5px;
} */
.custom-margin {
margin: -6px 0px;
}
......
ruoyi-ui/src/views/smartSchool/electronicArchives/personalInformation/index copy.vue
......@@ -727,7 +727,7 @@ export default {
}
</script>
<style>
<style scoped>
.el-form-item {
margin-bottom: 0;
}
......
ruoyi-ui/src/views/smartSchool/electronicArchives/personalInformation/index.vue
......@@ -1023,7 +1023,7 @@ export default {
</script>
<style>
<style scoped>
.el-form-item {
margin-bottom: 0;
}
......
ruoyi-ui/src/views/smartSchool/personWork/personalInformation/index copy.vue
......@@ -727,7 +727,7 @@ export default {
}
</script>
<style>
<style scoped>
.el-form-item {
margin-bottom: 0;
}
......
ruoyi-ui/src/views/smartSchool/personWork/personalInformation/index.vue
......@@ -1007,7 +1007,7 @@ export default {
</script>
<style>
<style scoped>
.el-form-item {
margin-bottom: 0;
}
......
ruoyi-ui/src/views/tool/build/index.vue
......@@ -11,19 +11,11 @@
<div class="components-title">
<svg-icon icon-class="component" />输入型组件
</div>
<draggable
class="components-draggable"
:list="inputComponents"
:group="{ name: 'componentsGroup', pull: 'clone', put: false }"
:clone="cloneComponent"
draggable=".components-item"
:sort="false"
@end="onEnd"
>
<div
v-for="(element, index) in inputComponents" :key="index" class="components-item"
@click="addComponent(element)"
>
<draggable class="components-draggable" :list="inputComponents"
:group="{ name: 'componentsGroup', pull: 'clone', put: false }" :clone="cloneComponent"
draggable=".components-item" :sort="false" @end="onEnd">
<div v-for="(element, index) in inputComponents" :key="index" class="components-item"
@click="addComponent(element)">
<div class="components-body">
<svg-icon :icon-class="element.tagIcon" />
{{ element.label }}
......@@ -33,21 +25,11 @@
<div class="components-title">
<svg-icon icon-class="component" />选择型组件
</div>
<draggable
class="components-draggable"
:list="selectComponents"
:group="{ name: 'componentsGroup', pull: 'clone', put: false }"
:clone="cloneComponent"
draggable=".components-item"
:sort="false"
@end="onEnd"
>
<div
v-for="(element, index) in selectComponents"
:key="index"
class="components-item"
@click="addComponent(element)"
>
<draggable class="components-draggable" :list="selectComponents"
:group="{ name: 'componentsGroup', pull: 'clone', put: false }" :clone="cloneComponent"
draggable=".components-item" :sort="false" @end="onEnd">
<div v-for="(element, index) in selectComponents" :key="index" class="components-item"
@click="addComponent(element)">
<div class="components-body">
<svg-icon :icon-class="element.tagIcon" />
{{ element.label }}
......@@ -57,15 +39,11 @@
<div class="components-title">
<svg-icon icon-class="component" /> 布局型组件
</div>
<draggable
class="components-draggable" :list="layoutComponents"
<draggable class="components-draggable" :list="layoutComponents"
:group="{ name: 'componentsGroup', pull: 'clone', put: false }" :clone="cloneComponent"
draggable=".components-item" :sort="false" @end="onEnd"
>
<div
v-for="(element, index) in layoutComponents" :key="index" class="components-item"
@click="addComponent(element)"
>
draggable=".components-item" :sort="false" @end="onEnd">
<div v-for="(element, index) in layoutComponents" :key="index" class="components-item"
@click="addComponent(element)">
<div class="components-body">
<svg-icon :icon-class="element.tagIcon" />
{{ element.label }}
......@@ -90,25 +68,12 @@
</div>
<el-scrollbar class="center-scrollbar">
<el-row class="center-board-row" :gutter="formConf.gutter">
<el-form
:size="formConf.size"
:label-position="formConf.labelPosition"
:disabled="formConf.disabled"
:label-width="formConf.labelWidth + 'px'"
>
<el-form :size="formConf.size" :label-position="formConf.labelPosition" :disabled="formConf.disabled"
:label-width="formConf.labelWidth + 'px'">
<draggable class="drawing-board" :list="drawingList" :animation="340" group="componentsGroup">
<draggable-item
v-for="(element, index) in drawingList"
:key="element.renderKey"
:drawing-list="drawingList"
:element="element"
:index="index"
:active-id="activeId"
:form-conf="formConf"
@activeItem="activeFormItem"
@copyItem="drawingItemCopy"
@deleteItem="drawingItemDelete"
/>
<draggable-item v-for="(element, index) in drawingList" :key="element.renderKey" :drawing-list="drawingList"
:element="element" :index="index" :active-id="activeId" :form-conf="formConf" @activeItem="activeFormItem"
@copyItem="drawingItemCopy" @deleteItem="drawingItemDelete" />
</draggable>
<div v-show="!drawingList.length" class="empty-info">
从左侧拖入或点选组件进行表单设计
......@@ -118,19 +83,10 @@
</el-scrollbar>
</div>
<right-panel
:active-data="activeData"
:form-conf="formConf"
:show-field="!!drawingList.length"
@tag-change="tagChange"
/>
<code-type-dialog
:visible.sync="dialogVisible"
title="选择生成类型"
:show-file-name="showFileName"
@confirm="generate"
/>
<right-panel :active-data="activeData" :form-conf="formConf" :show-field="!!drawingList.length"
@tag-change="tagChange" />
<code-type-dialog :visible.sync="dialogVisible" title="选择生成类型" :show-file-name="showFileName" @confirm="generate" />
<input id="copyNode" type="hidden">
</div>
</template>
......@@ -370,31 +326,36 @@ export default {
}
</script>
<style lang='scss'>
body, html{
<style lang='scss' scoped>
body,
html {
margin: 0;
padding: 0;
background: #fff;
-moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased;
text-rendering: optimizeLegibility;
font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji;
font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji;
}
input, textarea{
font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji;
input,
textarea {
font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji;
}
.editor-tabs{
.editor-tabs {
background: #121315;
.el-tabs__header{
.el-tabs__header {
margin: 0;
border-bottom-color: #121315;
.el-tabs__nav{
.el-tabs__nav {
border-color: #121315;
}
}
.el-tabs__item{
.el-tabs__item {
height: 32px;
line-height: 32px;
color: #888a8e;
......@@ -403,15 +364,18 @@ input, textarea{
margin-right: 5px;
user-select: none;
}
.el-tabs__item.is-active{
.el-tabs__item.is-active {
background: #1e1e1e;
border-bottom-color: #1e1e1e!important;
border-bottom-color: #1e1e1e !important;
color: #fff;
}
.el-icon-edit{
.el-icon-edit {
color: #f1fa8c;
}
.el-icon-document{
.el-icon-document {
color: #a95812;
}
}
......@@ -422,29 +386,35 @@ input, textarea{
padding: 12px 18px 15px 15px;
}
}
.left-scrollbar .el-scrollbar__wrap {
box-sizing: border-box;
overflow-x: hidden !important;
margin-bottom: 0 !important;
}
.center-tabs{
.el-tabs__header{
margin-bottom: 0!important;
.center-tabs {
.el-tabs__header {
margin-bottom: 0 !important;
}
.el-tabs__item{
.el-tabs__item {
width: 50%;
text-align: center;
}
.el-tabs__nav{
.el-tabs__nav {
width: 100%;
}
}
.reg-item{
.reg-item {
padding: 12px 6px;
background: #f8f8f8;
position: relative;
border-radius: 4px;
.close-btn{
.close-btn {
position: absolute;
right: -6px;
top: -6px;
......@@ -459,18 +429,22 @@ input, textarea{
z-index: 1;
cursor: pointer;
font-size: 12px;
&:hover{
&:hover {
background: rgba(210, 23, 23, 0.5)
}
}
& + .reg-item{
&+.reg-item {
margin-top: 18px;
}
}
.action-bar{
.action-bar {
& .el-button+.el-button {
margin-left: 15px;
}
& i {
font-size: 20px;
vertical-align: middle;
......@@ -479,32 +453,37 @@ input, textarea{
}
}
.custom-tree-node{
.custom-tree-node {
width: 100%;
font-size: 14px;
.node-operation{
.node-operation {
float: right;
}
i[class*="el-icon"] + i[class*="el-icon"]{
i[class*="el-icon"]+i[class*="el-icon"] {
margin-left: 6px;
}
.el-icon-plus{
.el-icon-plus {
color: #409EFF;
}
.el-icon-delete{
.el-icon-delete {
color: #157a0c;
}
}
.left-scrollbar .el-scrollbar__view{
.left-scrollbar .el-scrollbar__view {
overflow-x: hidden;
}
.el-rate{
.el-rate {
display: inline-block;
vertical-align: text-top;
}
.el-upload__tip{
.el-upload__tip {
line-height: 1.2;
}
......@@ -521,6 +500,7 @@ $lighterBlue: #409EFF;
padding: 8px;
box-sizing: border-box;
height: 100%;
.components-item {
display: inline-block;
width: 48%;
......@@ -528,14 +508,17 @@ $lighterBlue: #409EFF;
transition: transform 0ms !important;
}
}
.components-draggable{
.components-draggable {
padding-bottom: 20px;
}
.components-title{
.components-title {
font-size: 14px;
color: #222;
margin: 6px 2px;
.svg-icon{
.svg-icon {
color: #666;
font-size: 18px;
}
......@@ -548,13 +531,16 @@ $lighterBlue: #409EFF;
cursor: move;
border: 1px dashed $selectedColor;
border-radius: 3px;
.svg-icon{
.svg-icon {
color: #777;
font-size: 15px;
}
&:hover {
border: 1px dashed #787be8;
color: #787be8;
.svg-icon {
color: #787be8;
}
......@@ -568,10 +554,12 @@ $lighterBlue: #409EFF;
top: 0;
height: 100vh;
}
.left-scrollbar{
.left-scrollbar {
height: calc(100vh - 42px);
overflow: hidden;
}
.center-scrollbar {
height: calc(100vh - 42px);
overflow: hidden;
......@@ -579,13 +567,15 @@ $lighterBlue: #409EFF;
border-right: 1px solid #f1e8e8;
box-sizing: border-box;
}
.center-board {
height: 100vh;
width: auto;
margin: 0 350px 0 260px;
box-sizing: border-box;
}
.empty-info{
.empty-info {
position: absolute;
top: 46%;
left: 0;
......@@ -595,27 +585,32 @@ $lighterBlue: #409EFF;
color: #ccb1ea;
letter-spacing: 4px;
}
.action-bar{
.action-bar {
position: relative;
height: 42px;
text-align: right;
padding: 0 15px;
box-sizing: border-box;;
box-sizing: border-box;
;
border: 1px solid #f1e8e8;
border-top: none;
border-left: none;
.delete-btn{
.delete-btn {
color: #F56C6C;
}
}
.logo-wrapper{
.logo-wrapper {
position: relative;
height: 42px;
background: #fff;
border-bottom: 1px solid #f1e8e8;
box-sizing: border-box;
}
.logo{
.logo {
position: absolute;
left: 12px;
top: 6px;
......@@ -624,16 +619,19 @@ $lighterBlue: #409EFF;
font-weight: 600;
font-size: 17px;
white-space: nowrap;
> img{
>img {
width: 30px;
height: 30px;
vertical-align: top;
}
.github{
.github {
display: inline-block;
vertical-align: sub;
margin-left: 15px;
> img{
>img {
height: 22px;
}
}
......@@ -642,23 +640,28 @@ $lighterBlue: #409EFF;
.center-board-row {
padding: 12px 12px 15px 12px;
box-sizing: border-box;
& > .el-form {
&>.el-form {
// 69 = 12+15+42
height: calc(100vh - 69px);
}
}
.drawing-board {
height: 100%;
position: relative;
.components-body {
padding: 0;
margin: 0;
font-size: 0;
}
.sortable-ghost {
position: relative;
display: block;
overflow: hidden;
&::before {
content: " ";
position: absolute;
......@@ -670,38 +673,48 @@ $lighterBlue: #409EFF;
z-index: 2;
}
}
.components-item.sortable-ghost {
width: 100%;
height: 60px;
background-color: $selectedColor;
}
.active-from-item {
& > .el-form-item{
&>.el-form-item {
background: $selectedColor;
border-radius: 6px;
}
& > .drawing-item-copy, & > .drawing-item-delete{
&>.drawing-item-copy,
&>.drawing-item-delete {
display: initial;
}
& > .component-name{
&>.component-name {
color: $lighterBlue;
}
}
.el-form-item{
.el-form-item {
margin-bottom: 15px;
}
}
.drawing-item{
.drawing-item {
position: relative;
cursor: move;
&.unfocus-bordered:not(.activeFromItem) > div:first-child {
&.unfocus-bordered:not(.activeFromItem)>div:first-child {
border: 1px dashed #ccc;
}
.el-form-item{
.el-form-item {
padding: 12px 10px;
}
}
.drawing-row-item{
.drawing-row-item {
position: relative;
cursor: move;
box-sizing: border-box;
......@@ -709,22 +722,28 @@ $lighterBlue: #409EFF;
border-radius: 3px;
padding: 0 2px;
margin-bottom: 15px;
.drawing-row-item {
margin-bottom: 2px;
}
.el-col{
.el-col {
margin-top: 22px;
}
.el-form-item{
.el-form-item {
margin-bottom: 0;
}
.drag-wrapper{
.drag-wrapper {
min-height: 80px;
}
&.active-from-item{
&.active-from-item {
border: 1px dashed $lighterBlue;
}
.component-name{
.component-name {
position: absolute;
top: 0;
left: 0;
......@@ -734,17 +753,23 @@ $lighterBlue: #409EFF;
padding: 0 6px;
}
}
.drawing-item, .drawing-row-item{
.drawing-item,
.drawing-row-item {
&:hover {
& > .el-form-item{
&>.el-form-item {
background: $selectedColor;
border-radius: 6px;
}
& > .drawing-item-copy, & > .drawing-item-delete{
&>.drawing-item-copy,
&>.drawing-item-delete {
display: initial;
}
}
& > .drawing-item-copy, & > .drawing-item-delete{
&>.drawing-item-copy,
&>.drawing-item-delete {
display: none;
position: absolute;
top: -10px;
......@@ -758,26 +783,29 @@ $lighterBlue: #409EFF;
cursor: pointer;
z-index: 1;
}
& > .drawing-item-copy{
&>.drawing-item-copy {
right: 56px;
border-color: $lighterBlue;
color: $lighterBlue;
background: #fff;
&:hover{
&:hover {
background: $lighterBlue;
color: #fff;
}
}
& > .drawing-item-delete{
&>.drawing-item-delete {
right: 24px;
border-color: #F56C6C;
color: #F56C6C;
background: #fff;
&:hover{
&:hover {
background: #F56C6C;
color: #fff;
}
}
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment