Commit e4d728ca by 无尘

style: 修改高度和颜色

parent 614787cc
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"name": "@gic-test/vue-gic-people", "name": "@gic-test/vue-gic-people",
"description": "vue-gic-people Plugin", "description": "vue-gic-people Plugin",
"author": "fairyly <498745097@qq.com>", "author": "fairyly <498745097@qq.com>",
"version": "1.2.3", "version": "1.2.8",
"license": "MIT", "license": "MIT",
"private": false, "private": false,
"main": "dist/vue-gic-people.js", "main": "dist/vue-gic-people.js",
......
...@@ -196,7 +196,7 @@ export default { ...@@ -196,7 +196,7 @@ export default {
border: 1px solid #e7e7eb; border: 1px solid #e7e7eb;
overflow: hidden; overflow: hidden;
padding-left: 4px; padding-left: 4px;
padding: 7px 2px; padding: 3px 2px;
cursor: text; cursor: text;
text-align: left; text-align: left;
-webkit-appearance: textfield; -webkit-appearance: textfield;
......
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
<!-- 加输入框 最后控件--> <!-- 加输入框 最后控件-->
<div class="gic-select-wrap inline-block" v-if="childCell.templateCode == 'com003'"> <div class="gic-select-wrap inline-block" v-if="childCell.templateCode == 'com003'">
<el-input v-model="childCell.levelModel" class="select-wrap-input" placeholder="请输入" @focus="selectFocus(index,key,ind)" @keyup.native="(value) => toInput(value)"></el-input><label></label> <el-input v-model="childCell.levelModel" class="select-wrap-input" placeholder="请输入" @focus="selectFocus(index,key,ind)" @keyup.native="(value) => toInput(value,index,key,ind)"></el-input><label></label>
</div> </div>
<!-- 加区间输入框 最后控件--> <!-- 加区间输入框 最后控件-->
...@@ -925,9 +925,9 @@ ...@@ -925,9 +925,9 @@
}, },
// 输入框输入的时候 // 输入框输入的时候
toInput(e) { toInput(e,index,key,ind) {
var that = this var that = this
console.log("输入值:",e.target.value) console.log("输入值:",e.target.value,index,key,ind)
var value = e.target.value var value = e.target.value
that.conditionsList[that.andIndex].children[that.orIndex].columnValue = String(value) that.conditionsList[that.andIndex].children[that.orIndex].columnValue = String(value)
}, },
...@@ -1047,8 +1047,9 @@ ...@@ -1047,8 +1047,9 @@
// date 选择的时候 // date 选择的时候
changeDate(e,index,key,ind) { changeDate(e,index,key,ind) {
var that = this var that = this
console.log("选择 date:",e,index,key,ind) console.log("选择 date:",e,index,key,ind,)
that.conditionsList[that.andIndex].children[that.orIndex].columnValue = String(e) that.conditionsList[index].children[key].columnValue = String(e) =='null'? '': String(e)
console.log(that.conditionsList[index].children[key].columnValue.length)
}, },
...@@ -1106,7 +1107,7 @@ ...@@ -1106,7 +1107,7 @@
changeRemote(e,index,key,ind){ changeRemote(e,index,key,ind){
var that = this var that = this
console.log(e,index,key,ind) console.log(e,index,key,ind)
that.conditionsList[that.andIndex].children[that.orIndex].columnValue = e.join(' ');//String(e) that.conditionsList[index].children[key].columnValue = e.join(' ');//String(e)
}, },
// 选择 tree 树形结构 // 选择 tree 树形结构
...@@ -1824,14 +1825,14 @@ ...@@ -1824,14 +1825,14 @@
width: 100px; width: 100px;
text-align: right; text-align: right;
margin-right: 30px; margin-right: 30px;
line-height: 40px; line-height: 32px;
} }
.el-select { .el-select {
width: 195px; width: 195px;
/*height: 40px;*/ /*height: 40px;*/
border-radius: 2px; border-radius: 2px;
line-height: 40px; line-height: 32px;
/*border: 1px solid #e7e7eb;*/ /*border: 1px solid #e7e7eb;*/
position: relative; position: relative;
cursor: pointer; cursor: pointer;
...@@ -2029,8 +2030,8 @@ ...@@ -2029,8 +2030,8 @@
.fliter-message-title { .fliter-message-title {
margin-right: 7px; margin-right: 7px;
line-height: 40px; line-height: 32px;
height: 40px; height: 32px;
font-size: 14px; font-size: 14px;
margin: 0; margin: 0;
} }
...@@ -2083,7 +2084,7 @@ ...@@ -2083,7 +2084,7 @@
cursor: pointer; cursor: pointer;
position: absolute; position: absolute;
right: 10px; right: 10px;
top: 24px; top: 20px;
} }
.filter-guanbi:hover { .filter-guanbi:hover {
...@@ -2186,7 +2187,7 @@ ...@@ -2186,7 +2187,7 @@
width: 217px; width: 217px;
/deep/ .vue-treeselect__control { /deep/ .vue-treeselect__control {
height: 40px; height: 32px;
/*line-height: 36px;*/ /*line-height: 36px;*/
cursor: pointer; cursor: pointer;
} }
...@@ -2200,7 +2201,7 @@ ...@@ -2200,7 +2201,7 @@
} }
.vue-treeselect__placeholder { .vue-treeselect__placeholder {
line-height: 40px; line-height: 32px;
font-size: 13.3333px; font-size: 13.3333px;
} }
......
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