From 180787ef1a1f491549f2ebe94fdcc924a276e599 Mon Sep 17 00:00:00 2001 From: "wu.jian2" Date: Thu, 12 Oct 2023 09:15:32 +0800 Subject: [PATCH 1/3] =?UTF-8?q?refactor:=20=E8=87=AA=E5=8A=A9=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=9B=86=EF=BC=8C=E6=95=B0=E6=8D=AE=E7=BC=93=E5=AD=98?= =?UTF-8?q?=3D>=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue index 2713e5e4..c31669dc 100644 --- a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue +++ b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue @@ -157,7 +157,7 @@ Date: Thu, 12 Oct 2023 09:52:03 +0800 Subject: [PATCH 2/3] =?UTF-8?q?refactor:=20=E8=B0=83=E6=95=B4=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E9=80=89=E6=8B=A9=E5=99=A8=E3=80=81=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=80=89=E6=8B=A9=E5=99=A8=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B=E9=85=8D=E7=BD=AE=E7=9A=84?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DateTimePicker/setting.vue | 58 +++++++++---------- .../BasicComponents/TimePicker/setting.vue | 57 +++++++++--------- 2 files changed, 58 insertions(+), 57 deletions(-) diff --git a/data-room-ui/packages/BasicComponents/DateTimePicker/setting.vue b/data-room-ui/packages/BasicComponents/DateTimePicker/setting.vue index 5523bbaf..6341de5a 100644 --- a/data-room-ui/packages/BasicComponents/DateTimePicker/setting.vue +++ b/data-room-ui/packages/BasicComponents/DateTimePicker/setting.vue @@ -108,6 +108,35 @@ 日期时间格式
+ +
+ + + + + +
+ 时间戳：从1970年1月1日开始计算的秒数，数据类型为数值型，例如：1483326245000。
+ 自定义：通过输入特定的格式字符串来指定时间的数据格式，例如：yyyy-MM-dd HH:mm:ss对应数据为 2023-10-08 09:30:00。
+
+ +
+
- -
- - - - - -
- 时间戳：从1970年1月1日开始计算的秒数，数据类型为数值型，例如：1483326245000。
- 自定义：通过输入特定的格式字符串来指定时间的数据格式，例如：yyyy-MM-dd HH:mm:ss对应数据为 2023-10-08 09:30:00。
-
- -
- 时间格式
+ +
+ + + + + +
+ 时间戳：从1970年1月1日开始计算的秒数，数据类型为数值型，例如：1483326245000。
+ 自定义：通过输入特定的格式字符串来指定时间的数据格式，例如：HH:mm:ss对应数据为 09:30:00。
+
+ +
+
- -
- - - - - -
- 时间戳：从1970年1月1日开始计算的秒数，数据类型为数值型，例如：1483326245000。
- 自定义：通过输入特定的格式字符串来指定时间的数据格式，例如：HH:mm:ss对应数据为 09:30:00。
-
- -
- + Date: Thu, 12 Oct 2023 10:39:47 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=99=A8=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../packages/ColorMultipleSelect/index.vue | 131 ++++++++++-------- 1 file changed, 74 insertions(+), 57 deletions(-) diff --git a/data-room-ui/packages/ColorMultipleSelect/index.vue b/data-room-ui/packages/ColorMultipleSelect/index.vue index 0bd81492..98001ca2 100644 --- a/data-room-ui/packages/ColorMultipleSelect/index.vue +++ b/data-room-ui/packages/ColorMultipleSelect/index.vue @@ -7,47 +7,28 @@ -
- - - - - - -  ... - - -
- - -   + {{ item.label }} + + + +   + @@ -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) } } }