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] 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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{it.label}}
+
+
+ {{it.label}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{submittitle||'查询'}}
+
+
+ 重置
+
+
+
+
+
+
+
+
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
-
+
+