build v2.6.9

wisdows · Jul 2, 2020 · de0f985 · de0f985
1 parent 29ec2db
commit de0f985
Show file tree

Hide file tree

Showing 43 changed files with 2,613 additions and 1,546 deletions.
diff --git a/examples/element-ui/crud/array.html b/examples/element-ui/crud/array.html
@@ -32,7 +32,9 @@
         user: {},
         data: [{
           select: 'Shanghai',
-          array: '1,2,3',
+          icon: "el-icon-platform-eleme",
+          color: 'rgba(69, 43, 43, 1)',
+          array: '1, 2, 3',
           href: 'https://www.baidu.com',
           img: 'http://demo.cssmoban.com/cssthemes5/twts_236_rage/assets/images/background/header.jpg,http://demo.cssmoban.com/cssthemes5/twts_236_rage/assets/images/background/header.jpg'
         }],
@@ -47,6 +49,14 @@
           }, {
             label: '文本框',
             prop: 'text',
+          }, {
+            label: '图标',
+            prop: 'icon',
+            type: 'icon'
+          }, {
+            label: '颜色',
+            prop: 'color',
+            type: 'color'
           }, {
             label: '超链接',
             prop: 'href',
@@ -59,7 +69,6 @@
           }, {
             label: '数组',
             prop: 'array',
-            dataType: 'number',
             type: 'array'
           }, {
             label: '分组',

diff --git a/examples/element-ui/crud/dic.html b/examples/element-ui/crud/dic.html
@@ -24,14 +24,16 @@
 
 <body>
   <div id="app">
-    <avue-crud ref="crud" :data="data" :option="option"></avue-crud>
+    {{form}}
+    <avue-crud v-model="form" ref="crud" :data="data" :option="option"></avue-crud>
   </div>
 </body>
 <script>
   new Vue({
     el: '#app',
     data() {
       return {
+        form: {},
         data: [
           {
             name: '张三',

diff --git a/examples/element-ui/crud/header.html b/examples/element-ui/crud/header.html
@@ -58,7 +58,7 @@
           {
             label: '自定义图标',
             prop: 'icon',
-            type: "icon-select",
+            type: "icon",
             iconList: [{
               label: '基本图表',
               list: ['el-icon-time', 'el-icon-bell', 'el-icon-star-on']

diff --git a/examples/element-ui/crud/tree.html b/examples/element-ui/crud/tree.html
@@ -67,7 +67,7 @@
           {
             label: '自定义图标',
             prop: 'icon',
-            type: "icon-select",
+            type: "icon",
             iconList: [{
               label: '基本图表',
               list: ['el-icon-time', 'el-icon-bell', 'el-icon-star-on']

diff --git a/examples/element-ui/form/checkbox.html b/examples/element-ui/form/checkbox.html
@@ -19,6 +19,7 @@
 
 <body>
   <div id="app">
+    {{obj}}
     <avue-form :option="option" v-model="obj"></avue-form>
   </div>
 </body>

diff --git a/examples/element-ui/form/icon.html b/examples/element-ui/form/icon.html
@@ -0,0 +1,85 @@
+<!DOCTYPE html>
+
+<html class="no-js">
+
+<head>
+  <meta charset="utf-8" />
+  <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+  <title></title>
+  <meta name="description" content="" />
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <script
+    src="https://webapi.amap.com/maps?v=1.4.11&key=7ab53b28352e55dc5754699add0ad862&plugin=AMap.PlaceSearch"></script>
+  <script src="https://webapi.amap.com/ui/1.0/main.js?v=1.0.11"></script>
+  <script src="https://cdn.staticfile.org/axios/0.19.0-beta.1/axios.js"></script>
+  <script src="https://cdn.staticfile.org/vue/2.5.17/vue.js"></script>
+  <link rel="stylesheet" href="https://cdn.staticfile.org/element-ui/2.13.0/theme-chalk/index.css" />
+  <script src="https://cdn.staticfile.org/element-ui/2.13.0/index.js"></script>
+  <link rel="stylesheet" href="../../../lib/index.css" />
+  <script src="../../../lib/avue.js"></script>
+</head>
+
+<body>
+  <div id="app">
+    {{obj}}
+    <avue-form :option="option" v-model="obj"></avue-form>
+  </div>
+</body>
+<script>
+  new Vue({
+    el: '#app',
+    data() {
+      return {
+        obj: {
+          icon: ''
+        },
+        option: {
+          column: [
+            {
+              label: '图标',
+              prop: 'icon',
+              type: 'icon',
+              iconList: [{
+                label: '基本图标',
+                list: [{
+                  label: '名称1',
+                  value: 'el-icon-info'
+                }, {
+                  label: '名称2',
+                  value: 'el-icon-error'
+                }, {
+                  label: '名称3',
+                  value: 'el-icon-success'
+                }, {
+                  label: '名称4',
+                  value: 'el-icon-warning'
+                }, {
+                  label: '名称5',
+                  value: 'el-icon-question'
+                }]
+              }, {
+                label: '方向图标',
+                list: ['el-icon-info', 'el-icon-back', 'el-icon-arrow-left', 'el-icon-arrow-down', 'el-icon-arrow-right', 'el-icon-arrow-up']
+              }, {
+                label: '符号图标',
+                list: ['el-icon-plus', 'el-icon-minus', 'el-icon-close', 'el-icon-check']
+              }, {
+                label: '阿里云图标',
+                list: ['icon-zhongyingwen', 'icon-rizhi1', 'icon-bug', 'icon-qq1', 'icon-weixin1']
+              }],
+              rules: [
+                {
+                  required: true,
+                  message: '请选择地图',
+                  trigger: 'change'
+                }
+              ]
+            },
+          ]
+        }
+      }
+    }
+  })
+</script>
+
+</html>
diff --git a/examples/element-ui/form/index.html b/examples/element-ui/form/index.html
@@ -237,7 +237,7 @@
           {
             label: '图标选择器',
             prop: 'icon',
-            type: 'icon-select',
+            type: 'icon',
             iconList: [{
               label: '基本图标',
               list: ['el-icon-info', 'el-icon-error', 'el-icon-error', 'el-icon-success', 'el-icon-warning', 'el-icon-question']

diff --git a/examples/element-ui/form/map.html b/examples/element-ui/form/map.html
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+
+<html class="no-js">
+
+<head>
+  <meta charset="utf-8" />
+  <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+  <title></title>
+  <meta name="description" content="" />
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <script
+    src="https://webapi.amap.com/maps?v=1.4.11&key=7ab53b28352e55dc5754699add0ad862&plugin=AMap.PlaceSearch"></script>
+  <script src="https://webapi.amap.com/ui/1.0/main.js?v=1.0.11"></script>
+  <script src="https://cdn.staticfile.org/axios/0.19.0-beta.1/axios.js"></script>
+  <script src="https://cdn.staticfile.org/vue/2.5.17/vue.js"></script>
+  <link rel="stylesheet" href="https://cdn.staticfile.org/element-ui/2.13.0/theme-chalk/index.css" />
+  <script src="https://cdn.staticfile.org/element-ui/2.13.0/index.js"></script>
+  <link rel="stylesheet" href="../../../lib/index.css" />
+  <script src="../../../lib/avue.js"></script>
+</head>
+
+<body>
+  <div id="app">
+    {{obj}}
+    <avue-form :option="option" v-model="obj"></avue-form>
+  </div>
+</body>
+<script>
+  new Vue({
+    el: '#app',
+    data() {
+      return {
+        obj: {
+          map: '113.12209610000252,41.03928506034977, 内蒙古自治区乌兰察布市集宁区前进路街道新体大街航天小区'
+        },
+        option: {
+          column: [
+            {
+              label: '地图',
+              prop: 'map',
+              type: 'map',
+              rules: [
+                {
+                  required: true,
+                  message: '请选择地图',
+                  trigger: 'change'
+                }
+              ]
+            }]
+        }
+      }
+    }
+  })
+</script>
+
+</html>
diff --git a/examples/element-ui/form/select-remote.html b/examples/element-ui/form/select-remote.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+
+<html class="no-js">
+
+<head>
+  <meta charset="utf-8" />
+  <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+  <title></title>
+  <meta name="description" content="" />
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <script src="https://cdn.staticfile.org/axios/0.19.0-beta.1/axios.js"></script>
+  <script src="https://cdn.staticfile.org/vue/2.5.17/vue.js"></script>
+  <link rel="stylesheet" href="https://cdn.staticfile.org/element-ui/2.13.0/theme-chalk/index.css" />
+  <script src="https://cdn.staticfile.org/element-ui/2.13.0/index.js"></script>
+
+  <link rel="stylesheet" href="../../../lib/index.css" />
+  <script src="../../../lib/avue.js"></script>
+</head>
+
+<body>
+  <div id="app">
+    {{form}}
+    <avue-form :option="option" v-model="form"></avue-form>
+  </div>
+</body>
+<script>
+  let baseUrl = 'https://cli.avuejs.com/api/area'
+  new Vue({
+    el: '#app',
+    data() {
+      return {
+        form: {
+          province: ['110000', '130000', '120000', '140000'],
+        },
+        option: {
+          column: [
+            {
+              label: '省份',
+              prop: 'province',
+              type: 'select',
+              remote: true,
+              multiple: true,
+              props: {
+                label: 'name',
+                value: 'code'
+              },
+              dicUrl: `${baseUrl}/getProvince?id={{key}}`,
+              rules: [
+                {
+                  required: true,
+                  message: '请选择省份',
+                  trigger: 'blur'
+                }
+              ]
+            }
+          ]
+        }
+      }
+    }
+  })
+</script>
+
+</html>
diff --git a/examples/element-ui/form/table.html b/examples/element-ui/form/table.html
@@ -59,13 +59,11 @@
                 console.log(data);
                 if (value) {
                   callback({
-                    total: 2,
-                    data: [{
-                      id: '0',
-                      name: '张三',
-                      sex: '男'
-                    }]
+                    id: '0',
+                    name: '张三',
+                    sex: '男'
                   })
+                  return
                 }
                 callback({
                   total: 40,
@@ -88,7 +86,7 @@
                 {
                   required: true,
                   message: '请选择省份',
-                  trigger: 'blur'
+                  trigger: 'change'
                 }
               ]
             }]
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,6 +19,7 @@ @@
     <body>
       <div id="app">
+        {{obj}}
         <avue-form :option="option" v-model="obj"></avue-form>
       </div>
     </body>
@@ Expand Down @@