tzjy-code
/
DataRoom
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:gcpaas/DataRoom

Browse Source
main
zhu.yawen 1 year ago
parent 91d695f335 a6180a7434
commit 9b1a486459
4 changed files with 133 additions and 115 deletions
Show Stats Download Patch File Download Diff File

58
data-room-ui/packages/BasicComponents/DateTimePicker/setting.vue
Unescape Escape View File

@ -114,6 +114,35 @@
</div>
<SettingTitle>日期时间格式</SettingTitle>
<div class="lc-field-body">
<el-form-item label="时间数据类型">
<div class="description">
<el-select
v-model="config.customize.formatType"
class="bs-el-select"
popper-class="bs-el-select"
clearable
>
<el-option
v-for="(type) in formatTypeOptions"
:key="type.value"
:label="type.label"
:value="type.value"
/>
</el-select>
<el-tooltip
placement="top"
>
<span
class="el-icon-question"
style="color:#9e9e9e"
/>
<div slot="content">
时间戳：从1970年1月1日开始计算的秒数，数据类型为数值型，例如：1483326245000。<br>
自定义：通过输入特定的格式字符串来指定时间的数据格式，例如：yyyy-MM-dd HH:mm:ss对应数据为 2023-10-08 09:30:00。<br>
</div>
</el-tooltip>
</div>
</el-form-item>
<el-form-item label="时间显示格式化">
<div class="description">
<el-input
@ -151,35 +180,6 @@
</el-tooltip>
</div>
</el-form-item>
<el-form-item label="时间数据类型">
<div class="description">
<el-select
v-model="config.customize.formatType"
class="bs-el-select"
popper-class="bs-el-select"
clearable
>
<el-option
v-for="(type) in formatTypeOptions"
:key="type.value"
:label="type.label"
:value="type.value"
/>
</el-select>
<el-tooltip
placement="top"
>
<span
class="el-icon-question"
style="color:#9e9e9e"
/>
<div slot="content">
时间戳：从1970年1月1日开始计算的秒数，数据类型为数值型，例如：1483326245000。<br>
自定义：通过输入特定的格式字符串来指定时间的数据格式，例如：yyyy-MM-dd HH:mm:ss对应数据为 2023-10-08 09:30:00。<br>
</div>
</el-tooltip>
</div>
</el-form-item>
<el-form-item
v-if="config.customize.formatType === 'custom'"
label="时间数据格式化"

57
data-room-ui/packages/BasicComponents/TimePicker/setting.vue
Unescape Escape View File

@ -90,6 +90,34 @@
</div>
<SettingTitle>时间格式</SettingTitle>
<div class="lc-field-body">
<el-form-item label="时间数据类型">
<div class="description">
<el-select
v-model="config.customize.formatType"
class="bs-el-select"
popper-class="bs-el-select"
>
<el-option
v-for="(type) in formatTypeOptions"
:key="type.value"
:label="type.label"
:value="type.value"
/>
</el-select>
<el-tooltip
placement="top"
>
<span
class="el-icon-question"
style="color:#9e9e9e"
/>
<div slot="content">
时间戳：从1970年1月1日开始计算的秒数，数据类型为数值型，例如：1483326245000。<br>
自定义：通过输入特定的格式字符串来指定时间的数据格式，例如：HH:mm:ss对应数据为 09:30:00。<br>
</div>
</el-tooltip>
</div>
</el-form-item>
<el-form-item label="时间显示格式化">
<div class="description">
<el-input
@ -120,34 +148,7 @@
</el-tooltip>
</div>
</el-form-item>
<el-form-item label="时间数据类型">
<div class="description">
<el-select
v-model="config.customize.formatType"
class="bs-el-select"
popper-class="bs-el-select"
>
<el-option
v-for="(type) in formatTypeOptions"
:key="type.value"
:label="type.label"
:value="type.value"
/>
</el-select>
<el-tooltip
placement="top"
>
<span
class="el-icon-question"
style="color:#9e9e9e"
/>
<div slot="content">
时间戳：从1970年1月1日开始计算的秒数，数据类型为数值型，例如：1483326245000。<br>
自定义：通过输入特定的格式字符串来指定时间的数据格式，例如：HH:mm:ss对应数据为 09:30:00。<br>
</div>
</el-tooltip>
</div>
</el-form-item>
<el-form-item
v-if="config.customize.formatType === 'custom'"
label="时间数据格式化"

121
data-room-ui/packages/ColorMultipleSelect/index.vue
Unescape Escape View File

@ -7,48 +7,29 @@
<el-select
ref="colorSelect"
v-model="myColor"
value-key="value"
class="bs-el-select select"
popper-class="bs-el-select"
placeholder=""
style="width: 100%"
@change="handleChange"
>
<div slot="prefix">
<span style="float: left"></span>
<span
v-for="(item, index) in colorValue"
:key="index"
>
<span
v-if="index <= 14"
:style="'float: left ;background-color:' + item + ';width:15px;border-radius:1px;display:inline-block;height:15px;margin-top:8px;'"
/>
<span
v-if="index <= 14"
style="float: left"
>
</span>
<span
v-if="index === 15"
style="float: left"
>
&nbsp;...
</span>
</span>
</div>
<el-option
v-for="(item, index) in colorList"
:key="index"
label=" "
:value="item"
:label="item.label"
:value="item.value"
>
<span style="float: left">{{ item.label }}</span>
<span style="float: right">
<span
v-for="(co, ind) in item"
v-for="(co, ind) in JSON.parse(item.value)"
:key="ind"
>
<span :style="'float: left ;background-color:' + co + ';width:15px;border-radius:1px;display:inline-block;height:15px;margin-top:9px;'" />
<span :style="'float: left ;background-color:' + co + ';width:10px;border-radius:1px;display:inline-block;height:15px;margin-top:9px;'" />
<span style="float: left">&nbsp; </span>
</span>
</span>
</el-option>
</el-select>
</template>
@ -61,18 +42,6 @@ export default {
event: 'update'
},
props: {
// 颜色数组
colorList: {
type: Array,
default: () => {
return [
['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'],
['#FF6B3B', '#626681', '#FFC100', '#9FB40F', '#76523B', '#DAD5B5', '#0E8E89', '#E19348', '#F383A2', '#247FEA'],
['#025DF4', '#DB6BCF', '#2498D1', '#BBBDE6', '#4045B2', '#21A97A', '#FF745A', '#007E99', '#FFA8A8', '#2391FF'],
['#FF4500', '#1AAF8B', '#406C85', '#F6BD16', '#B40F0F', '#2FB8FC', '#4435FF', '#FF5CA2', '#BBE800', '#FE8A26']
]
}
},
// 父组件绑定的值
color: {
type: Array,
@ -81,32 +50,80 @@ export default {
},
data () {
return {
colorValue: [],
myColor: undefined
colorList: [
{
label: '配色1',
value: JSON.stringify(['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'])
},
{
label: '配色2',
value: JSON.stringify(['#FF6B3B', '#626681', '#FFC100', '#9FB40F', '#76523B', '#DAD5B5', '#0E8E89', '#E19348', '#F383A2', '#247FEA'])
},
{
label: '配色3',
value: JSON.stringify(['#025DF4', '#DB6BCF', '#2498D1', '#BBBDE6', '#4045B2', '#21A97A', '#FF745A', '#007E99', '#FFA8A8', '#2391FF'])
},
{
label: '配色4',
value: JSON.stringify(['#FF4500', '#1AAF8B', '#406C85', '#F6BD16', '#B40F0F', '#2FB8FC', '#4435FF', '#FF5CA2', '#BBE800', '#FE8A26'])
}
],
colorValue: []
// myColor: undefined
}
},
watch: {
color: function (val) {
this.setSelectColor(val)
this.init(val)
}
},
created () {
if (this.color) {
this.myColor = this.color
this.setSelectColor(this.color)
computed: {
myColor: {
get () {
return JSON.stringify(this.color) || JSON.stringify(['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9', '#6DC8EC', '#945FB9', '#FF9845', '#1E9493', '#FF99C3'])
},
set (val) {
}
}
},
created () {
},
mounted () {
this.init(this.color)
},
methods: {
// 设置颜色选择框中颜色
setSelectColor (color) {
this.$nextTick(() => {
this.colorValue = this.color
// 初始化colorList,当绑定的颜色跟预设的颜色不一致时
init (color) {
// ,当绑定的颜色跟预设的颜色是否一致
const flag = this.colorList.some(co => co.value === JSON.stringify(color))
// colorList是否存在自定义选项
const f = this.colorList.some(co => co.label === '自定义')
if (!flag) {
if (f) {
this.colorList = this.colorList.map(co => {
if (co.label === '自定义') {
return {
label: '自定义',
value: JSON.stringify(color)
}
} else {
return co
}
})
} else {
this.colorList.push({
label: '自定义',
value: JSON.stringify(color)
})
}
}
},
handleChange (val) {
this.setSelectColor(val)
const colors = JSON.parse(val)
// 触发update事件更新父组件绑定值
this.$emit('update', val)
this.$emit('update', colors)
}
}
}

2
data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue
Unescape Escape View File

@ -157,7 +157,7 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item
label="数据缓存"
label="缓存"
prop="cache"
>
<el-radio-group

Write Preview
Loading…
Cancel
Save