build v2.7.6

examples/element-ui/form/date.html

@@ -51,6 +51,7 @@
                 trigger: 'blur'
               }
             ],
+            detail: true,
             label: "日期范围",
             prop: "daterange",
             type: "daterange",

gulpfile.js

@@ -1,37 +1,39 @@
-const gulp = require('gulp');
-var sass = require('gulp-sass');
-var autoprefixer = require('gulp-autoprefixer');
-var cssmin = require('gulp-cssmin');
-const webpack = require('webpack');
-const webpackConf = require('./build/build.js');
+const gulp = require("gulp");
+var sass = require("gulp-sass");
+var autoprefixer = require("gulp-autoprefixer");
+var cssmin = require("gulp-cssmin");
+const webpack = require("webpack");
+const webpackConf = require("./build/build.js");
+
 // 构建webpack配置
-gulp.task('webpack', function () {
-  webpack(webpackConf, function (err, stats) {
+gulp.task("webpack", async function() {
+  await webpack(webpackConf, function(err, stats) {
     if (err) {
       console.log(err);
     }
   });
 });
 
 // 处理样式的配置
-gulp.task('compile', function () {
+gulp.task("compile", function() {
   return gulp
-    .src('./styles/index.scss')
+    .src("./styles/index.scss")
     .pipe(sass.sync())
     .pipe(
       autoprefixer({
-        browsers: ['ie > 9', 'last 2 versions'],
+        browsers: ["ie > 9", "last 2 versions"],
         cascade: false
       })
     )
     .pipe(cssmin())
-    .pipe(gulp.dest('./lib/'));
+    .pipe(gulp.dest("./lib/"));
 });
+
 // 打包文件
-gulp.task('build', ['webpack', 'compile']);
+gulp.task("build", gulp.series(["webpack", "compile"]));
 
 // 监听文件变化
-gulp.task('watch', ['webpack', 'compile'], function () {
-  gulp.watch(['./src/**', './packages/**'], ['webpack']);
-  gulp.watch(['./styles/**'], ['compile']);
+gulp.task("watch", async function() {
+  gulp.watch(["./src/**", "./packages/**"], gulp.series(["webpack"]));
+  gulp.watch(["./styles/**"], gulp.series(["compile"]));
 });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smallwei/avue",
-  "version": "2.7.5",
+  "version": "2.7.6",
   "description": "A Magic Configurable Web Framework",
   "main": "lib/avue.min.js",
   "unpkg": "lib/avue.min.js",
@@ -49,11 +49,11 @@
     "eslint-loader": "^1.9.0",
     "eslint-plugin-html": "^4.0.1",
     "eslint-plugin-json": "^1.2.0",
-    "gulp": "^3.9.1",
+    "gulp": "^4.0.0",
     "gulp-autoprefixer": "^4.0.0",
     "gulp-cssmin": "^0.1.7",
     "gulp-postcss": "^6.1.1",
-    "gulp-sass": "^3.1.0",
+    "gulp-sass": "^4.1.0",
     "karma": "^1.3.0",
     "karma-chrome-launcher": "^2.2.0",
     "karma-coverage": "^1.1.1",

packages/core/common/event.js

@@ -1,4 +1,3 @@
-import dayjs from 'dayjs';
 import { initVal } from 'core/dataformat';
 function bindEvent (safe, name, event) {
   typeof safe[name] === 'function' && safe[name]({ value: safe.value, column: safe.column })

packages/echart/datav/index.vue

@@ -4,9 +4,8 @@
     <component :is="option.is"
                :ref="id"
                v-if="reload"
-               :config="config"
                :style="styleChartName"
-               v-bind="option.bind"></component>
+               v-bind="config"></component>
   </div>
 </template>
 

packages/echart/map/index.vue

@@ -71,12 +71,6 @@ export default create({
       },
       immediate: true
     },
-    zoomData: {
-      handler () {
-        this.updateData();
-      },
-      immediate: true
-    },
     scale: {
       handler (val) {
         this.baseScale = val;

packages/element-ui/crud/column.vue

@@ -1,10 +1,11 @@
 <template>
-  <span>
+  <div>
+    <slot name="header"></slot>
     <template v-for="(column,index) in list">
       <dynamic-column v-if="column.children && column.children.length"
                       :columnOption="column"
                       :key="column.label">
-        <template v-for="(item,index) in crud.propOption"
+        <template v-for="item in crud.propOption"
                   slot-scope="scope"
                   :slot="item.prop">
           <slot :row="scope.row"
@@ -80,8 +81,8 @@
         </el-table-column>
       </template>
     </template>
-
-  </span>
+    <slot name="footer"></slot>
+  </div>
 
 </template>
 

packages/element-ui/crud/dynamic-column.vue

@@ -6,12 +6,12 @@
                    :render-header="columnOption.renderHeader"
                    :align="columnOption.align || crud.tableOption.align"
                    :header-align="columnOption.headerAlign || crud.tableOption.headerAlign"
-                   :prop="columnOption.key">
+                   :prop="columnOption.prop">
     <template v-for="column in columnOption.children">
       <dynamic-column v-if="column.children && column.children.length"
                       :key="column.label"
                       :columnOption="column">
-        <template v-for="(item,index) in crud.propOption"
+        <template v-for="item in crud.propOption"
                   slot-scope="scope"
                   :slot="item.prop">
           <slot :row="scope.row"

packages/element-ui/crud/header-search.vue

@@ -119,7 +119,7 @@ export default cteate({
     },
     columnLen () {
       let count = 0;
-      this.crud.option.column.forEach(ele => {
+      this.crud.propOption.forEach(ele => {
         if (ele.search) count++
       })
       return count