fix: 修复主题样式问题,增加只有日期没有时间,时间选择器,格式化时间错误问题
This commit is contained in:
@@ -347,7 +347,7 @@
|
||||
width: 100px;
|
||||
text-align: left;
|
||||
font-size: 14px;
|
||||
color: #666666;
|
||||
color: $--color-text-regular;
|
||||
letter-spacing: 0;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
@@ -36,6 +36,10 @@
|
||||
.el-cascader__tags {
|
||||
height: calc(100% - 10px);
|
||||
width: 100%;
|
||||
span {
|
||||
background-color: $--background-color-base !important;
|
||||
color: $--color-text-regular;
|
||||
}
|
||||
}
|
||||
.right-box-module .el-cascader .el-input__inner {
|
||||
height: 150px;
|
||||
|
||||
@@ -36,6 +36,10 @@
|
||||
.el-cascader__tags {
|
||||
height: calc(100% - 10px);
|
||||
width: 100%;
|
||||
span {
|
||||
background-color: $--background-color-base !important;
|
||||
color: $--color-text-regular;
|
||||
}
|
||||
}
|
||||
.right-box-module .el-cascader .el-input__inner {
|
||||
height: 150px;
|
||||
@@ -176,6 +180,9 @@
|
||||
.module-box-add.value-mapping-add {
|
||||
height: 30px;
|
||||
width: 30px;
|
||||
.nz-icon.nz-icon-plus {
|
||||
padding-right: 3px;
|
||||
}
|
||||
}
|
||||
.value-mapping-add {
|
||||
margin-bottom: 10px;
|
||||
@@ -206,6 +213,11 @@
|
||||
font-weight: 600;
|
||||
text-transform: Capitalize;
|
||||
}
|
||||
.pipeline-option {
|
||||
i {
|
||||
color: $--color-text-regular;
|
||||
}
|
||||
}
|
||||
}
|
||||
.el-input-group__append {
|
||||
background-color: $--border-color-light;
|
||||
|
||||
@@ -74,9 +74,8 @@
|
||||
popper-class="right-box-select-top"
|
||||
style="width: 100%"
|
||||
type="date"
|
||||
:value-format="timeFormatStrToDatePickFormat(timeFormatMain)"
|
||||
:format="timeFormatStrToDatePickFormat(timeFormatMain)"
|
||||
value-format="yyyy-MM-dd">
|
||||
:value-format="timeFormatStrToDatePickFormat(timeFormatMain, 1)"
|
||||
:format="timeFormatStrToDatePickFormat(timeFormatMain, 1)">
|
||||
</my-date-picker>
|
||||
</el-form-item>
|
||||
<!-- labels -->
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
</el-option>
|
||||
</el-option-group>
|
||||
</el-select>
|
||||
<i style="padding-right: 3px;" class="nz-icon nz-icon-plus" @click="addPipelineShow"></i>
|
||||
<i class="nz-icon nz-icon-plus" @click="addPipelineShow"></i>
|
||||
</span>
|
||||
</template>
|
||||
|
||||
|
||||
@@ -161,13 +161,22 @@ Vue.mixin({
|
||||
translation (key) {
|
||||
return i18n.t(key)
|
||||
},
|
||||
timeFormatStrToDatePickFormat (str) {
|
||||
// str.replace(//)
|
||||
timeFormatStrToDatePickFormat (str, index) {
|
||||
if (index === 1) {
|
||||
const reg = /Y/g
|
||||
str = str.replace(reg, 'y')
|
||||
const reg1 = /D/g
|
||||
str = str.replace(reg1, 'd')
|
||||
const reg2 = /[H,m,s,:]/g
|
||||
str = str.replace(reg2, '')
|
||||
return str
|
||||
} else {
|
||||
const reg = /Y/g
|
||||
str = str.replace(reg, 'y')
|
||||
const reg1 = /D/g
|
||||
str = str.replace(reg1, 'd')
|
||||
return str
|
||||
}
|
||||
},
|
||||
copyRow (row, rightBoxValKey, idKey = 'id', show = false, format, callback) {
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user