From 9f7be4333ed0cc69e52b261caccf149e48ea74ac Mon Sep 17 00:00:00 2001 From: lygoing Date: Mon, 6 Jun 2022 09:14:41 +0800 Subject: [PATCH 01/63] =?UTF-8?q?element-plus=E7=89=88=E6=9C=AC=E4=BB=8E2.?= =?UTF-8?q?2.3=E5=8D=87=E7=BA=A7=E5=88=B02.2.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c905b820..9623ac43 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "cropperjs": "1.5.12", "crypto-js": "4.1.1", "echarts": "5.3.2", - "element-plus": "2.2.3", + "element-plus": "2.2.4", "nprogress": "0.2.0", "qrcodejs2": "0.0.2", "sortablejs": "1.15.0", From 64bca664367975a9d78097cd21dd55c3cb89e15e Mon Sep 17 00:00:00 2001 From: sc Date: Mon, 6 Jun 2022 18:01:31 +0800 Subject: [PATCH 02/63] =?UTF-8?q?=E9=87=8D=E6=9E=84=20scIconSelect=20?= =?UTF-8?q?=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/scIconSelect/index.vue | 115 ++++++++++++++++---------- src/views/vab/iconselect.vue | 2 +- 2 files changed, 73 insertions(+), 44 deletions(-) diff --git a/src/components/scIconSelect/index.vue b/src/components/scIconSelect/index.vue index d1988478..ab562222 100644 --- a/src/components/scIconSelect/index.vue +++ b/src/components/scIconSelect/index.vue @@ -1,35 +1,47 @@ @@ -40,27 +52,28 @@ export default { props: { modelValue: { type: String, default: "" }, - placeholder: { type: String, default: "请输入或者选择图标" }, - clearable: { type: Boolean, default: false }, disabled: { type: Boolean, default: false }, }, data() { return { - defaultValue: '', + value: "", dialogVisible: false, - data: [] + data: [], + searchText: "" } }, watch:{ modelValue(val){ - this.defaultValue = val + this.value = val }, - defaultValue(val){ + value(val){ this.$emit('update:modelValue', val) + }, + searchText(val){ + this.search(val) } }, mounted() { - this.defaultValue = this.modelValue this.data.push(...config.icons) }, methods: { @@ -74,25 +87,41 @@ if(e.target.tagName != 'SPAN'){ return false } - this.defaultValue = e.target.dataset.icon + this.value = e.target.dataset.icon this.dialogVisible = false - this.$emit('update:modelValue', this.defaultValue); + }, + clear(){ + this.value = "" + this.dialogVisible = false + }, + search(text){ + if(text){ + const filterData = JSON.parse(JSON.stringify(config.icons)) + filterData.forEach(t => { + t.icons = t.icons.filter(n => n.includes(text)) + }) + this.data = filterData + }else{ + this.data = JSON.parse(JSON.stringify(config.icons)) + } } } } diff --git a/src/views/vab/iconselect.vue b/src/views/vab/iconselect.vue index 6931639f..0774d5d9 100644 --- a/src/views/vab/iconselect.vue +++ b/src/views/vab/iconselect.vue @@ -13,7 +13,7 @@ - + 保存 From 1636abd48a677776beb998d6b90b812c343ad01e Mon Sep 17 00:00:00 2001 From: sakuya <81883387@qq.com> Date: Mon, 6 Jun 2022 22:20:08 +0800 Subject: [PATCH 03/63] =?UTF-8?q?UP=20scTableSelect=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=8F=82=E6=95=B0=20&=20FIX=20=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E6=BB=9A=E5=8A=A8=E6=9D=A1=E8=87=B3=E9=A1=B6=E6=97=A0?= =?UTF-8?q?=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/scTableSelect/index.vue | 13 +++++++++---- src/views/vab/tableselect.vue | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/components/scTableSelect/index.vue b/src/components/scTableSelect/index.vue index e3186dee..772a7cc3 100644 --- a/src/components/scTableSelect/index.vue +++ b/src/components/scTableSelect/index.vue @@ -1,14 +1,14 @@