From 7606e5c3ebf704aee4b7f3aadcf45d9a2c0c4e88 Mon Sep 17 00:00:00 2001 From: ln1778 <465410291@qq.com> Date: Tue, 3 Sep 2024 10:34:06 +0800 Subject: [PATCH 01/47] 22 --- packages/agInput/src/index.vue | 69 +++++----------- packages/agMultifunctionSearch/src/index.vue | 84 ++++++++++---------- packages/agSelect/src/index.vue | 30 ++++--- src/App.vue | 33 ++++---- 4 files changed, 93 insertions(+), 123 deletions(-) diff --git a/packages/agInput/src/index.vue b/packages/agInput/src/index.vue index e2d8eb2..f214265 100644 --- a/packages/agInput/src/index.vue +++ b/packages/agInput/src/index.vue @@ -1,23 +1,18 @@ - diff --git a/packages/agMultifunctionSearch/src/index.vue b/packages/agMultifunctionSearch/src/index.vue index 8ff5fb8..5f1e832 100644 --- a/packages/agMultifunctionSearch/src/index.vue +++ b/packages/agMultifunctionSearch/src/index.vue @@ -1,24 +1,24 @@ @@ -138,6 +145,7 @@ export default { checkvalue:[], value: "选项1", a_value: "59584", + datevalues:["4",["2022-12-12","2022-12-13 "]], values: ["4",""], options: [ { From 083a5bf7d6ae1652a4b5db34110d23c1a73acb98 Mon Sep 17 00:00:00 2001 From: ln1778 <465410291@qq.com> Date: Thu, 12 Sep 2024 16:45:08 +0800 Subject: [PATCH 32/47] jjj --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a9c8d6b..c7ec658 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ag-element-ui", - "version": "0.1.9", + "version": "0.1.10", "main": "packages/index.js", "scripts": { "dev": "vue-cli-service serve", From b631f64cbb33030612513a8b558394a3cb53df78 Mon Sep 17 00:00:00 2001 From: ln1778 <465410291@qq.com> Date: Thu, 12 Sep 2024 16:57:41 +0800 Subject: [PATCH 33/47] 22 --- package.json | 2 +- packages/agForm/src/index.vue | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index c7ec658..3bcb690 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ag-element-ui", - "version": "0.1.10", + "version": "0.1.11", "main": "packages/index.js", "scripts": { "dev": "vue-cli-service serve", diff --git a/packages/agForm/src/index.vue b/packages/agForm/src/index.vue index 8f9a7a1..1e55d41 100644 --- a/packages/agForm/src/index.vue +++ b/packages/agForm/src/index.vue @@ -37,8 +37,9 @@ - - + + + @@ -64,11 +65,13 @@ import agColorPicker from './../../agColorPicker/src/index.vue'; import agNumberRange from './../../agNumberRange/src/index.vue'; import agMultifunctionSearch from './../../agMultifunctionSearch/src/index.vue'; import agQuery from './../../agQuery/src/index.vue'; +import agMultionDattePicker from '../../agMultionDattePicker'; export default{ name:"agForm", components:{ + agMultionDattePicker, agInput:agInput, agDatePicker, agSelect, From 3bbf8a51dcbf8c42a1b2a97bf9928ac949c2d397 Mon Sep 17 00:00:00 2001 From: ln1778 <465410291@qq.com> Date: Thu, 12 Sep 2024 17:08:07 +0800 Subject: [PATCH 34/47] 22 --- package.json | 2 +- packages/agMultifunctionSearch/src/index.vue | 13 +- packages/agMultionDattePicker/src/index.vue | 424 +++++++++---------- 3 files changed, 214 insertions(+), 225 deletions(-) diff --git a/package.json b/package.json index 3bcb690..129128a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ag-element-ui", - "version": "0.1.11", + "version": "0.1.12", "main": "packages/index.js", "scripts": { "dev": "vue-cli-service serve", diff --git a/packages/agMultifunctionSearch/src/index.vue b/packages/agMultifunctionSearch/src/index.vue index 4d81229..87d537d 100644 --- a/packages/agMultifunctionSearch/src/index.vue +++ b/packages/agMultifunctionSearch/src/index.vue @@ -3,7 +3,8 @@ { return [null, '']; }, - }, - options: { - type: Array, - default: () => { - return []; - }, - }, + }, showExtra: { type: Boolean, default: false, @@ -137,7 +132,7 @@ export default { throw new Error("请传入数组"); } let newselectValue=newVal[0]; - const find=this.options.find((f)=>f.value==newselectValue); + const find=this.$attrs.options&&this.$attrs.options.find((f)=>f.value==newselectValue); if(find){ let fontwidth=this.getStringWidth(find.label); this.swidth=fontwidth>165?165:fontwidth; diff --git a/packages/agMultionDattePicker/src/index.vue b/packages/agMultionDattePicker/src/index.vue index e18c56c..5938bca 100644 --- a/packages/agMultionDattePicker/src/index.vue +++ b/packages/agMultionDattePicker/src/index.vue @@ -1,228 +1,222 @@ - - - + - \ No newline at end of file + } + \ No newline at end of file From f91a8c0c7ade9fa91033a56e627f3156fca35e21 Mon Sep 17 00:00:00 2001 From: ln1778 <465410291@qq.com> Date: Thu, 12 Sep 2024 17:10:28 +0800 Subject: [PATCH 35/47] 22 --- package.json | 2 +- packages/agMultifunctionSearch/src/index.vue | 2 +- packages/agMultionDattePicker/src/index.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 129128a..33dd3ba 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ag-element-ui", - "version": "0.1.12", + "version": "0.1.13", "main": "packages/index.js", "scripts": { "dev": "vue-cli-service serve", diff --git a/packages/agMultifunctionSearch/src/index.vue b/packages/agMultifunctionSearch/src/index.vue index 87d537d..0ed14c9 100644 --- a/packages/agMultifunctionSearch/src/index.vue +++ b/packages/agMultifunctionSearch/src/index.vue @@ -157,7 +157,7 @@ export default { }, onInputChange(val){ if(this.$listeners.change){ - this.$emit("change", [this.values[0] ||"",val]); + this.$emit("change", [this.value[0] ||"",val]); } }, getStringWidth(text) { diff --git a/packages/agMultionDattePicker/src/index.vue b/packages/agMultionDattePicker/src/index.vue index 5938bca..49b4dab 100644 --- a/packages/agMultionDattePicker/src/index.vue +++ b/packages/agMultionDattePicker/src/index.vue @@ -86,7 +86,7 @@ export default { }, onInputChange(val){ if(this.$listeners.change){ - this.$emit("change", [this.values[0] ||"",val]); + this.$emit("change", [this.value[0] ||"",val]); } }, getStringWidth(text) { From 1d6e67d6ed0286ad746ec0b2148b963742c59156 Mon Sep 17 00:00:00 2001 From: ln1778 <465410291@qq.com> Date: Thu, 12 Sep 2024 17:38:23 +0800 Subject: [PATCH 36/47] 22 --- packages/agDatePicker/src/index.vue | 1 + packages/agInput/src/index.vue | 2 +- packages/agSelect/src/index.vue | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/agDatePicker/src/index.vue b/packages/agDatePicker/src/index.vue index 26ad253..0193304 100644 --- a/packages/agDatePicker/src/index.vue +++ b/packages/agDatePicker/src/index.vue @@ -7,6 +7,7 @@ v-model="dateArr" v-bind="attrs" v-on="Listeners" + :size="$attrs.size||'small'" :value="value" :type="datetype" @mouseenter.native="mousetrue = true" diff --git a/packages/agInput/src/index.vue b/packages/agInput/src/index.vue index 2a6ab1d..cbd669d 100644 --- a/packages/agInput/src/index.vue +++ b/packages/agInput/src/index.vue @@ -1,7 +1,7 @@ - +
diff --git a/packages/agUpload/src/index.vue b/packages/agUpload/src/index.vue index 7c92cae..8500109 100644 --- a/packages/agUpload/src/index.vue +++ b/packages/agUpload/src/index.vue @@ -208,8 +208,10 @@ this.$emit('onRemove',file,this.imageList); }, handlePictureCardPreview(file) { - this.dialogImageUrl = file.url; - this.dialogVisible = true; + if(file.type.indexOf('image/')>-1){ + this.dialogImageUrl = file.url; + this.dialogVisible = true; + } }, onUpdate(e){ if(this.limit<=this.imageList.length){ diff --git a/packages/index.js b/packages/index.js index 070eb24..898fc1f 100644 --- a/packages/index.js +++ b/packages/index.js @@ -15,7 +15,7 @@ import agMutionCheckbox from './agMutionCheckbox'; import agMultifunctionSearch from './agMultifunctionSearch'; import agDatePicker from "./agDatePicker"; import agNumberRange from "./agNumberRange"; -import agMultionDattePicker from "./agMultionDattePicker"; +import agMultionDatePicker from "./agMultionDatePicker"; // 注册组件 @@ -38,7 +38,7 @@ import agMultionDattePicker from "./agMultionDattePicker"; agMutionCheckbox, agMultifunctionSearch, agNumberRange, - agMultionDattePicker + agMultionDatePicker ] // 定义 install 方法,接收 Vue 作为参数(使用 use 注册插件,那么所有的组件都会被注册) diff --git a/src/App.vue b/src/App.vue index 0617890..d9f45d5 100644 --- a/src/App.vue +++ b/src/App.vue @@ -68,7 +68,7 @@ --> - Date: Thu, 12 Sep 2024 19:26:51 +0800 Subject: [PATCH 38/47] 33 --- packages/agForm/src/index.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/agForm/src/index.vue b/packages/agForm/src/index.vue index be8aa1e..2b9dc5a 100644 --- a/packages/agForm/src/index.vue +++ b/packages/agForm/src/index.vue @@ -16,7 +16,7 @@ {{it.label}} - + @@ -24,9 +24,11 @@ From c99120819ffbcb28e5555da1dda85baebf12f1ec Mon Sep 17 00:00:00 2001 From: ln1778 <465410291@qq.com> Date: Thu, 12 Sep 2024 19:27:09 +0800 Subject: [PATCH 39/47] 22 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dcb1c2e..c70e66e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ag-element-ui", - "version": "0.1.17", + "version": "0.1.18", "main": "packages/index.js", "scripts": { "dev": "vue-cli-service serve", From 0d1f9fc8452132bf4176141509c46cbb4e249d9a Mon Sep 17 00:00:00 2001 From: ln1778 <465410291@qq.com> Date: Thu, 12 Sep 2024 19:47:55 +0800 Subject: [PATCH 40/47] 22 --- packages/agForm/src/index.vue | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/packages/agForm/src/index.vue b/packages/agForm/src/index.vue index 2b9dc5a..aaa4578 100644 --- a/packages/agForm/src/index.vue +++ b/packages/agForm/src/index.vue @@ -109,18 +109,25 @@ export default{ } }, mounted(){ - this.formValue=this.$attrs.value; + this.formValue=this.$attrs.value; + setTimeout(()=>{ + this.$refs.formref.clearValidate(); + },1); if(this.$refs.formref){ - for(const key in this.$refs.formref){ - if(!this[key]&&key!='value'){ - this[key]=this.$refs.formref[key]; - } - } - } + for(const key in this.$refs.formref){ + if(!this[key]&&key!='value'){ + this[key]=this.$refs.formref[key]; + } + } + } + }, watch:{ value(val){ this.formValue = val; + setTimeout(()=>{ + this.$refs.formref.clearValidate(); + },1); } }, methods:{ From 829d0a2b63ba5510c1825ec46360b3bc77ae49bf Mon Sep 17 00:00:00 2001 From: ln1778 <465410291@qq.com> Date: Thu, 12 Sep 2024 19:56:31 +0800 Subject: [PATCH 41/47] 22 --- package.json | 2 +- packages/agMultionDatePicker/src/index.vue | 20 +++++++++++++++++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index c70e66e..3a6c0c1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ag-element-ui", - "version": "0.1.18", + "version": "0.1.19", "main": "packages/index.js", "scripts": { "dev": "vue-cli-service serve", diff --git a/packages/agMultionDatePicker/src/index.vue b/packages/agMultionDatePicker/src/index.vue index 3fd681b..9eceb38 100644 --- a/packages/agMultionDatePicker/src/index.vue +++ b/packages/agMultionDatePicker/src/index.vue @@ -170,8 +170,7 @@ export default { justify-content: space-between; } - ::v-deep{ - + ::v-deep{ .ag_select_group{ .el-input__inner{ border:1px solid #e5e5e5; @@ -183,9 +182,24 @@ export default { } } } + .el-range-editor.is-active, .el-range-editor.is-active:hover, .el-select .el-input.is-focus .el-input__inner{ + border-color:#e5e5e5; + } + .el-range-editor.el-input__inner{ + border:1px solid #e5e5e5; + border-left:0px; + border-bottom-left-radius: 0; + border-top-left-radius: 0; + border-left:none; + outline:none; + &:focus{ + border-color:#e5e5e5; + } + } .ag_input_group{ .el-input__inner{ border:1px solid #e5e5e5; + border-left:0px; border-bottom-left-radius: 0; border-top-left-radius: 0; border-left:none; @@ -193,7 +207,7 @@ export default { &:focus{ border-color:#e5e5e5; } - } + } } .el-select{ .el-input{ From 578004cdb75e1a8f2aea13fea2649af484ae508f Mon Sep 17 00:00:00 2001 From: ln1778 <465410291@qq.com> Date: Fri, 13 Sep 2024 11:15:27 +0800 Subject: [PATCH 42/47] 333 --- packages/agForm/src/index.vue | 14 +- packages/agMultifunctionSearch/index.js | 9 - packages/agMultifunctionSearch/src/index.vue | 293 ------------------- packages/agMultionInput/index.js | 9 + packages/agMultionInput/src/index.vue | 293 +++++++++++++++++++ packages/agSearch/index.js | 9 + packages/agSearch/src/index.vue | 229 +++++++++++++++ packages/index.js | 9 +- src/App.vue | 57 ++-- 9 files changed, 579 insertions(+), 343 deletions(-) delete mode 100644 packages/agMultifunctionSearch/index.js delete mode 100644 packages/agMultifunctionSearch/src/index.vue create mode 100644 packages/agMultionInput/index.js create mode 100644 packages/agMultionInput/src/index.vue create mode 100644 packages/agSearch/index.js create mode 100644 packages/agSearch/src/index.vue diff --git a/packages/agForm/src/index.vue b/packages/agForm/src/index.vue index aaa4578..20d219e 100644 --- a/packages/agForm/src/index.vue +++ b/packages/agForm/src/index.vue @@ -37,7 +37,7 @@ - + @@ -65,7 +65,7 @@ import agCol from './../../agCol/src/index.vue'; import agUpload from './../../agUpload/src/index.vue'; import agColorPicker from './../../agColorPicker/src/index.vue'; import agNumberRange from './../../agNumberRange/src/index.vue'; -import agMultifunctionSearch from './../../agMultifunctionSearch/src/index.vue'; +import agMultionInput from './../../agMultionInput/src/index.vue'; import agQuery from './../../agQuery/src/index.vue'; import agMultionDatePicker from '../../agMultionDatePicker'; @@ -82,7 +82,7 @@ export default{ agUpload:agUpload, agColorPicker, agNumberRange, - agMultifunctionSearch, + agMultionInput, agQuery }, props:{ @@ -161,14 +161,20 @@ export default{ display: flex; align-items: stretch; } + .flexcenter{ + display: flex; + align-items: stretch; + } ::v-deep{ .el-form--inline{ .el-form-item{ display:flex; } .el-form-item__content{ + display:flex; flex:1; width:100%; + margin-left:0; } } .el-form-item{ @@ -177,7 +183,9 @@ export default{ } .el-form-item__content{ flex:1; + display:flex; width:100%; + margin-left:0!important; } } diff --git a/packages/agMultifunctionSearch/index.js b/packages/agMultifunctionSearch/index.js deleted file mode 100644 index 373c9a0..0000000 --- a/packages/agMultifunctionSearch/index.js +++ /dev/null @@ -1,9 +0,0 @@ -import agMultifunctionSearch from './src' - -// 为组件提供 install 安装方法,供按需引入 -agMultifunctionSearch.install = function (Vue) { - Vue.component(agMultifunctionSearch.name, agMultifunctionSearch) -} - -// 导出组件 -export default agMultifunctionSearch diff --git a/packages/agMultifunctionSearch/src/index.vue b/packages/agMultifunctionSearch/src/index.vue deleted file mode 100644 index 0ed14c9..0000000 --- a/packages/agMultifunctionSearch/src/index.vue +++ /dev/null @@ -1,293 +0,0 @@ - - - - - \ No newline at end of file diff --git a/packages/agMultionInput/index.js b/packages/agMultionInput/index.js new file mode 100644 index 0000000..5841a80 --- /dev/null +++ b/packages/agMultionInput/index.js @@ -0,0 +1,9 @@ +import agMultionInput from './src' + +// 为组件提供 install 安装方法,供按需引入 +agMultionInput.install = function (Vue) { + Vue.component(agMultionInput.name, agMultionInput) +} + +// 导出组件 +export default agMultionInput diff --git a/packages/agMultionInput/src/index.vue b/packages/agMultionInput/src/index.vue new file mode 100644 index 0000000..38f2678 --- /dev/null +++ b/packages/agMultionInput/src/index.vue @@ -0,0 +1,293 @@ + + + + + \ No newline at end of file diff --git a/packages/agSearch/index.js b/packages/agSearch/index.js new file mode 100644 index 0000000..6c1c4d2 --- /dev/null +++ b/packages/agSearch/index.js @@ -0,0 +1,9 @@ +import agSearch from './src'; + +// 为组件提供 install 安装方法,供按需引入 +agSearch.install = function (Vue) { + Vue.component(agSearch.name, agSearch); +} + +// 导出组件 +export default agSearch; diff --git a/packages/agSearch/src/index.vue b/packages/agSearch/src/index.vue new file mode 100644 index 0000000..60d1282 --- /dev/null +++ b/packages/agSearch/src/index.vue @@ -0,0 +1,229 @@ + + + + diff --git a/packages/index.js b/packages/index.js index 898fc1f..f7b8cfa 100644 --- a/packages/index.js +++ b/packages/index.js @@ -12,11 +12,11 @@ import agRow from './agRow'; import agCol from './agCol'; import agMutionCheckbox from './agMutionCheckbox'; -import agMultifunctionSearch from './agMultifunctionSearch'; +import agSearch from './agSearch'; import agDatePicker from "./agDatePicker"; import agNumberRange from "./agNumberRange"; import agMultionDatePicker from "./agMultionDatePicker"; - +import agMultionInput from "./agMultionInput"; // 注册组件 @@ -36,9 +36,10 @@ import agMultionDatePicker from "./agMultionDatePicker"; agRow, agDatePicker, agMutionCheckbox, - agMultifunctionSearch, + agSearch, agNumberRange, - agMultionDatePicker + agMultionDatePicker, + agMultionInput ] // 定义 install 方法,接收 Vue 作为参数(使用 use 注册插件,那么所有的组件都会被注册) diff --git a/src/App.vue b/src/App.vue index d9f45d5..de952ae 100644 --- a/src/App.vue +++ b/src/App.vue @@ -28,7 +28,7 @@ - - + @@ -52,9 +52,10 @@
只能上传jpg/png文件,且不超过500kb
- + +