From a24f5347bfd2331f8a4819b215f79555776534cd Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 25 四月 2024 09:16:57 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/enums.vue | 73 +++++++++++++++++++++++++++++++++++-
1 files changed, 70 insertions(+), 3 deletions(-)
diff --git a/src/components/view/enums.vue b/src/components/view/enums.vue
index 82eddd5..77e1f1a 100644
--- a/src/components/view/enums.vue
+++ b/src/components/view/enums.vue
@@ -100,8 +100,75 @@
type: 'text',
method: 'doDiy'
}],
- tagField: {},
- selectField: {},
+ tagField: {
+ type:{
+ select:[
+ {
+ value:'',
+ label:'榛樿',
+ type:''
+ },
+ {
+ value:'success',
+ label:'success',
+ type:'success'
+ },
+ {
+ value:'info',
+ label:'info',
+ type:'info'
+ },
+ {
+ value:'warning',
+ label:'warning',
+ type:'warning'
+ },
+ {
+ value:'danger',
+ label:'danger',
+ type:'danger'
+ },
+ ]
+ }
+ },
+ selectField: {
+ type:{
+ select:[
+ {
+ value:'',
+ label:'榛樿'
+ },
+ {
+ value:'success',
+ label:'success'
+ },
+ {
+ value:'info',
+ label:'info'
+ },
+ {
+ value:'warning',
+ label:'warning'
+ },
+ {
+ value:'danger',
+ label:'danger'
+ },
+ ]
+ }
+ },
+ spanConfig:{
+ rows:[
+ {
+ name:'category',
+ index:1
+ },
+ // {
+ // name:'createUserName',
+ // index:5
+ // }
+ ],
+ },
requiredAdd:['category','label','value'],
requiredUp:['category','label','value']
},
@@ -153,4 +220,4 @@
}
}
}
-</script>
\ No newline at end of file
+</script>
--
Gitblit v1.9.3