build v2.5.2

bachaxianren · May 3, 2020 · e411e31 · e411e31
1 parent b5c5446
commit e411e31
Show file tree

Hide file tree

Showing 18 changed files with 2,020 additions and 1,910 deletions.
diff --git a/examples/data/pay.html b/examples/data/pay.html
@@ -47,6 +47,13 @@
                 {
                   title: '面向全屏幕尺寸的响应式适配能力',
                   check: true,
+                  tip: `<h2 > 后台管理模版 - <small>点击红色字体即可预览</small></h2> <br />
+            1.用户名登录/验证码登录/第三方登陆(QQ, 微信)/人脸识别/多种登录方式。 <br /> <br />
+            2.全新的前端错误日志监控机制 <br /> <br />
+            3.灵活的10 + 多款主题自由配置<br /><br />
+            4.路由权限、菜单权限、登录权限 <br /> <br />
+            5.前端路由动态服务端加载和无限极动态路由加载。 <br /> <br />
+            6.模块的可拆卸化, 达到开箱即用 <br /> <br />`,
                 },
                 {
                   title: '支持IE9+等系列浏览器',

diff --git a/examples/element-ui/crud/index.html b/examples/element-ui/crud/index.html
@@ -84,7 +84,6 @@
           dialogType: 'drawer',
           title: '某某某科技有限公司财务报表2018-2020年第一季度',
           // header: false,
-          height: 'auto',
           highlightCurrentRow: true,
           expand: true,
           border: true,

diff --git a/examples/element-ui/form/group.html b/examples/element-ui/form/group.html
@@ -20,20 +20,7 @@
 <body>
   <div id="app">
     <el-button @click="handle" style="margin-left: 20px">{{title}}</el-button>
-    <component :is="name" :option="option" v-model="obj" @submit="submit">
-      <template slot-scope="scope" slot="name">
-        <avue-input :disabled="scope.disabled" :label="scope.column.label" v-model="obj.name"></avue-input>
-      </template>
-      <template slot-scope="scope" slot="names">
-        <div>
-          <span>{{obj.names}}</span>
-          <avue-input :disabled="scope.disabled" :label="scope.column.label" v-model="obj.names"></avue-input>
-        </div>
-      </template>
-      <template slot="jbxxHeader">
-        自定义头部
-      </template>
-    </component>
+    <avue-form :option="option" v-model="obj" @submit="submit"></avue-form>
   </div>
 </body>
 <script>
@@ -44,9 +31,6 @@
       title() {
         return this.type === 0 ? '编辑' : '保存'
       },
-      name() {
-        return this.type === 0 ? 'avue-detail' : 'avue-form'
-      }
     },
     data() {
       return {
@@ -56,11 +40,107 @@
           name1: '123'
         },
         option: {
-          tabs: true,
-          // tabsType: 'card',
+          detail: false,
           column: [{
             label: '测试字段',
             prop: 'name'
+          }, {
+            label: '子表单',
+            prop: 'dynamic',
+            type: 'dynamic',
+            span: 24,
+            span: 16,
+            children: {
+              rowAdd: (done) => {
+                this.$message.success('新增回调')
+                done({ input: 3 })
+              },
+              rowDel: (row, done) => {
+                this.$message.success('删除回调' + JSON.stringify(row))
+                done();
+              },
+              height: 300,
+              align: 'center',
+              headerAlign: 'center',
+              column: [{
+                width: 200,
+                label: '输入框',
+                prop: "input",
+              }, {
+                width: 200,
+                label: '密码框',
+                prop: "password",
+                type: 'password',
+                rules: [
+                  {
+                    required: true,
+                    message: '请输入密码',
+                    trigger: 'blur'
+                  }
+                ]
+              }, {
+                width: 200,
+                label: '树型',
+                prop: "tree",
+                type: 'tree',
+                dicData: [{
+                  label: '1-1',
+                  value: 0,
+                  children: [{
+                    label: "2-1",
+                    value: 1
+                  }]
+                }]
+              }, {
+                width: 200,
+                label: '选择框',
+                prop: "select",
+                type: 'select',
+                dicData: [{
+                  label: '测试1',
+                  value: 1
+                }, {
+                  label: '测试2',
+                  value: 2
+                }]
+              }, {
+                width: 200,
+                label: '多选',
+                prop: "checkbox",
+                type: 'checkbox',
+                dicData: [{
+                  label: '测试1',
+                  value: 1
+                }, {
+                  label: '测试2',
+                  value: 2
+                }]
+              }, {
+                width: 200,
+                label: '开关',
+                prop: "switch",
+                type: 'switch',
+                dicData: [{
+                  label: '测试1',
+                  value: 1
+                }, {
+                  label: '测试2',
+                  value: 2
+                }]
+              }, {
+                width: 200,
+                label: '数字框',
+                prop: "number",
+                type: 'number'
+              }]
+            },
+            rules: [
+              {
+                required: true,
+                message: '必填项测试',
+                trigger: 'blur'
+              }
+            ]
           }],
           group: [
             {
@@ -71,7 +151,6 @@
                 {
                   label: '姓名',
                   prop: 'name',
-                  formslot: true,
                   rules: [
                     {
                       required: true,
@@ -165,6 +244,17 @@
                   label: '测试长度',
                   prop: 'len',
                   maxlength: 5,
+                }, {
+                  label: 'radio',
+                  prop: 'radio',
+                  type: 'radio',
+                  dicData: [{
+                    label: 1,
+                    value: 1
+                  }, {
+                    label: 2,
+                    value: 2
+                  }]
                 }, {
                   label: '测试自定义',
                   prop: 'names',
@@ -183,6 +273,16 @@
           province: '110000',
           city: '110100',
           area: '110101',
+          radio: 1,
+          dynamic: [{
+            input: 1,
+            select: 1,
+            radio: 1,
+          }, {
+            input: 2,
+            select: 2,
+            radio: 1,
+          }],
           checkbox: ['110000']
         }
       }, 100)
@@ -191,8 +291,10 @@
       handle() {
         if (this.type === 1) {
           this.type = 0;
+          this.option.detail = true
         } else {
           this.type = 1;
+          this.option.detail = false
         }
       },
       submit() {