From 756f3307f3337811538ebc0d4a78769aa4493114 Mon Sep 17 00:00:00 2001
From: ln1778 <465410291@qq.com>
Date: Thu, 12 Sep 2024 09:53:40 +0800
Subject: [PATCH] 22
---
package.json | 2 +-
packages/agForm/src/index.vue | 77 +-
packages/agUpload/index.js | 8 +-
packages/agUpload/src/index.vue | 1231 ++++++++++++++++---------------
packages/index.js | 6 +-
src/App.vue | 4 +-
6 files changed, 683 insertions(+), 645 deletions(-)
diff --git a/package.json b/package.json
index cb58651..d11e420 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "ag-element-ui",
- "version": "0.1.4",
+ "version": "0.1.6",
"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 45aab69..3e8be3c 100644
--- a/packages/agForm/src/index.vue
+++ b/packages/agForm/src/index.vue
@@ -3,39 +3,42 @@
-
-
-
-
-
+
+
+
+
+
+
+
{{it.label}}
-
+
{{it.label}}
-
-
+
+
-
-
+
-
-
-
+
+
+
-
+
@@ -89,7 +92,7 @@ export default{
span:{
type:Number,
default:24
- }
+ },
},
data(){
return{
@@ -97,7 +100,7 @@ export default{
}
}
- },
+ },
mounted(){
this.formValue=this.$attrs.value;
if(this.$refs.formref){
@@ -109,13 +112,8 @@ export default{
}
},
watch:{
- data(val){
- this.formValue = {};
- val.map((h)=>{
- if(h.value){
- this.formValue[h.enName] = h.value;
- }
- });
+ value(val){
+ this.formValue = val;
}
},
methods:{
@@ -136,4 +134,37 @@ export default{
width:200px;
}
}
+ .el-form--inline{
+ .el-form-item{
+ display:flex;
+ }
+ .el-form-item__content{
+ flex:1;
+ width:100%;
+ }
+ }
+ .contentbox{
+ width:100%;
+ display: flex;
+ align-items: stretch;
+ }
+ ::v-deep{
+ .el-form--inline{
+ .el-form-item{
+ display:flex;
+ }
+ .el-form-item__content{
+ flex:1;
+ width:100%;
+ }
+ }
+ .el-form-item{
+ width:100%;
+ margin-bottom: 12px;
+ }
+ .el-form-item__content{
+ flex:1;
+ width:100%;
+ }
+ }
diff --git a/packages/agUpload/index.js b/packages/agUpload/index.js
index 36d3bd7..4237547 100644
--- a/packages/agUpload/index.js
+++ b/packages/agUpload/index.js
@@ -1,9 +1,9 @@
-import agUpdate from './src'
+import agUpload from './src'
// 为组件提供 install 安装方法,供按需引入
-agUpdate.install = function (Vue) {
- Vue.component(agUpdate.name, agUpdate)
+agUpload.install = function (Vue) {
+ Vue.component(agUpload.name, agUpload)
}
// 导出组件
-export default agUpdate;
+export default agUpload;
diff --git a/packages/agUpload/src/index.vue b/packages/agUpload/src/index.vue
index ab1ede4..7fbb7b0 100644
--- a/packages/agUpload/src/index.vue
+++ b/packages/agUpload/src/index.vue
@@ -1,617 +1,624 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
- {{img.name}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+}
+ ::v-deep {
+ .el-table {
+ width: 100%;
+ }
+ }
+
+
\ No newline at end of file
diff --git a/packages/index.js b/packages/index.js
index dbdd0c7..b14551d 100644
--- a/packages/index.js
+++ b/packages/index.js
@@ -1,7 +1,7 @@
// 导入组件
import agInput from './agInput/index';
import agSelect from './agSelect/index';
- import agUpdate from './agUpload';
+ import agUpload from './agUpload';
import agForm from './agForm';
import agColorPicker from './agColorPicker';
import agQuery from './agQuery';
@@ -23,7 +23,7 @@ import agNumberRange from "./agNumberRange";
const components = [
agInput,
agSelect,
- agUpdate,
+ agUpload,
agForm,
agColorPicker,
agQuery,
@@ -62,7 +62,7 @@ import agNumberRange from "./agNumberRange";
// 以下是具体的组件列表
agInput,
agSelect,
- agUpdate,
+ agUpload,
agForm,
agColorPicker,
agQuery,
diff --git a/src/App.vue b/src/App.vue
index 28951c3..23c1ac3 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -49,9 +49,9 @@
{{row.date}}
-
+
只能上传jpg/png文件,且不超过500kb
-
+