cy-element-ui 1.0.39 → 1.0.40

package/lib/upload.js

@@ -227,11 +227,10 @@ module.exports = require("element-ui/lib/mixins/locale");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/upload-list.vue?vue&type=template&id=f52834b0
-var upload_listvue_type_template_id_f52834b0_render = function () {
-  var _vm = this
-  var _h = _vm.$createElement
-  var _c = _vm._self._c || _h
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/upload-list.vue?vue&type=template&id=f52834b0
+var upload_listvue_type_template_id_f52834b0_render = function render() {
+  var _vm = this,
+    _c = _vm._self._c
   return _c(
     "transition-group",
     {
@@ -262,9 +261,8 @@ var upload_listvue_type_template_id_f52834b0_render = function () {
                   "Delete",
                   "Del",
                 ])
-              ) {
+              )
                 return null
-              }
               !_vm.disabled && _vm.$emit("remove", file)
             },
             focus: function ($event) {
@@ -281,100 +279,108 @@ var upload_listvue_type_template_id_f52834b0_render = function () {
         [
           _vm._t(
             "default",
-            [
-              file.status !== "uploading" &&
-              ["picture-card", "picture"].indexOf(_vm.listType) > -1
-                ? _c("img", {
-                    staticClass: "el-upload-list__item-thumbnail",
-                    attrs: { src: file.url, alt: "" },
-                  })
-                : _vm._e(),
-              _c(
-                "a",
-                {
-                  staticClass: "el-upload-list__item-name",
-                  on: {
-                    click: function ($event) {
-                      return _vm.handleClick(file)
-                    },
-                  },
-                },
-                [
-                  _c("i", { staticClass: "el-icon-document" }),
-                  _vm._v(_vm._s(file.name) + "\n\t\t\t"),
-                ]
-              ),
-              _c(
-                "label",
-                { staticClass: "el-upload-list__item-status-label" },
-                [
-                  _c("i", {
-                    class: {
-                      "el-icon-upload-success": true,
-                      "el-icon-circle-check": _vm.listType === "text",
-                      "el-icon-check":
-                        ["picture-card", "picture"].indexOf(_vm.listType) > -1,
-                    },
-                  }),
-                ]
-              ),
-              !_vm.disabled
-                ? _c("i", {
-                    staticClass: "el-icon-close",
+            function () {
+              return [
+                file.status !== "uploading" &&
+                ["picture-card", "picture"].indexOf(_vm.listType) > -1
+                  ? _c("img", {
+                      staticClass: "el-upload-list__item-thumbnail",
+                      attrs: { src: file.url, alt: "" },
+                    })
+                  : _vm._e(),
+                _c(
+                  "a",
+                  {
+                    staticClass: "el-upload-list__item-name",
                     on: {
                       click: function ($event) {
-                        return _vm.$emit("remove", file)
+                        return _vm.handleClick(file)
                       },
                     },
-                  })
-                : _vm._e(),
-              !_vm.disabled
-                ? _c("i", { staticClass: "el-icon-close-tip" }, [
-                    _vm._v(_vm._s(_vm.t("el.upload.deleteTip"))),
-                  ])
-                : _vm._e(),
-              file.status === "uploading"
-                ? _c("el-progress", {
-                    attrs: {
-                      type: _vm.listType === "picture-card" ? "circle" : "line",
-                      "stroke-width": _vm.listType === "picture-card" ? 6 : 2,
-                      percentage: _vm.parsePercentage(file.percentage),
-                    },
-                  })
-                : _vm._e(),
-              _vm.listType === "picture-card"
-                ? _c("span", { staticClass: "el-upload-list__item-actions" }, [
-                    _vm.handlePreview && _vm.listType === "picture-card"
-                      ? _c(
-                          "span",
-                          {
-                            staticClass: "el-upload-list__item-preview",
-                            on: {
-                              click: function ($event) {
-                                return _vm.handlePreview(file)
+                  },
+                  [
+                    _c("i", { staticClass: "el-icon-document" }),
+                    _vm._v(_vm._s(file.name) + "\n\t\t\t"),
+                  ]
+                ),
+                _c(
+                  "label",
+                  { staticClass: "el-upload-list__item-status-label" },
+                  [
+                    _c("i", {
+                      class: {
+                        "el-icon-upload-success": true,
+                        "el-icon-circle-check": _vm.listType === "text",
+                        "el-icon-check":
+                          ["picture-card", "picture"].indexOf(_vm.listType) >
+                          -1,
+                      },
+                    }),
+                  ]
+                ),
+                !_vm.disabled
+                  ? _c("i", {
+                      staticClass: "el-icon-close",
+                      on: {
+                        click: function ($event) {
+                          return _vm.$emit("remove", file)
+                        },
+                      },
+                    })
+                  : _vm._e(),
+                !_vm.disabled
+                  ? _c("i", { staticClass: "el-icon-close-tip" }, [
+                      _vm._v(_vm._s(_vm.t("el.upload.deleteTip"))),
+                    ])
+                  : _vm._e(),
+                file.status === "uploading"
+                  ? _c("el-progress", {
+                      attrs: {
+                        type:
+                          _vm.listType === "picture-card" ? "circle" : "line",
+                        "stroke-width": _vm.listType === "picture-card" ? 6 : 2,
+                        percentage: _vm.parsePercentage(file.percentage),
+                      },
+                    })
+                  : _vm._e(),
+                _vm.listType === "picture-card"
+                  ? _c(
+                      "span",
+                      { staticClass: "el-upload-list__item-actions" },
+                      [
+                        _vm.handlePreview && _vm.listType === "picture-card"
+                          ? _c(
+                              "span",
+                              {
+                                staticClass: "el-upload-list__item-preview",
+                                on: {
+                                  click: function ($event) {
+                                    return _vm.handlePreview(file)
+                                  },
+                                },
                               },
-                            },
-                          },
-                          [_c("i", { staticClass: "el-icon-zoom-in" })]
-                        )
-                      : _vm._e(),
-                    !_vm.disabled
-                      ? _c(
-                          "span",
-                          {
-                            staticClass: "el-upload-list__item-delete",
-                            on: {
-                              click: function ($event) {
-                                return _vm.$emit("remove", file)
+                              [_c("i", { staticClass: "el-icon-zoom-in" })]
+                            )
+                          : _vm._e(),
+                        !_vm.disabled
+                          ? _c(
+                              "span",
+                              {
+                                staticClass: "el-upload-list__item-delete",
+                                on: {
+                                  click: function ($event) {
+                                    return _vm.$emit("remove", file)
+                                  },
+                                },
                               },
-                            },
-                          },
-                          [_c("i", { staticClass: "el-icon-delete" })]
-                        )
-                      : _vm._e(),
-                  ])
-                : _vm._e(),
-            ],
+                              [_c("i", { staticClass: "el-icon-delete" })]
+                            )
+                          : _vm._e(),
+                      ]
+                    )
+                  : _vm._e(),
+              ]
+            },
             { file: file }
           ),
         ],
@@ -399,70 +405,6 @@ var progress_ = __webpack_require__(44);
 var progress_default = /*#__PURE__*/__webpack_require__.n(progress_);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/upload-list.vue?vue&type=script&lang=js
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
 
 
 
@@ -619,11 +561,10 @@ function upload(option) {
 	xhr.send(formData);
 	return xhr;
 }
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/upload-dragger.vue?vue&type=template&id=7a1289f9
-var upload_draggervue_type_template_id_7a1289f9_render = function () {
-  var _vm = this
-  var _h = _vm.$createElement
-  var _c = _vm._self._c || _h
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/upload-dragger.vue?vue&type=template&id=7a1289f9
+var upload_draggervue_type_template_id_7a1289f9_render = function render() {
+  var _vm = this,
+    _c = _vm._self._c
   return _c(
     "div",
     {
@@ -634,11 +575,11 @@ var upload_draggervue_type_template_id_7a1289f9_render = function () {
       on: {
         drop: function ($event) {
           $event.preventDefault()
-          return _vm.onDrop($event)
+          return _vm.onDrop.apply(null, arguments)
         },
         dragover: function ($event) {
           $event.preventDefault()
-          return _vm.onDragover($event)
+          return _vm.onDragover.apply(null, arguments)
         },
         dragleave: function ($event) {
           $event.preventDefault()
@@ -657,19 +598,6 @@ upload_draggervue_type_template_id_7a1289f9_render._withStripped = true
 // CONCATENATED MODULE: ./packages/upload/src/upload-dragger.vue?vue&type=template&id=7a1289f9
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/upload-dragger.vue?vue&type=script&lang=js
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
 
 /* harmony default export */ var upload_draggervue_type_script_lang_js = ({
 	name: 'ElUploadDrag',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cy-element-ui",
-	"version": "1.0.39",
+	"version": "1.0.40",
 	"description": "基于ElementUI开发的组件",
 	"main": "lib/element-ui.common.js",
 	"files": [
@@ -48,9 +48,9 @@
 	],
 	"repository": {
 		"type": "git",
-		"url": "git@github.com:ElemeFE/element.git"
+		"url": "git+https://github.com/youxiang_1224/cy-element-ui.git"
 	},
-	"homepage": "http://element.eleme.io",
+	"homepage": "https://github.com/youxiang_1224/cy-element-ui#readme",
 	"keywords": [
 		"element",
 		"vue2",
@@ -100,7 +100,7 @@
 		"cross-env": "^3.1.3",
 		"css-loader": "^2.1.0",
 		"es6-promise": "^4.0.5",
-		"eslint": "4.19.1",
+		"eslint": "5.16.0",
 		"eslint-config-elemefe": "0.1.1",
 		"eslint-loader": "^2.0.0",
 		"eslint-plugin-html": "^4.0.1",
@@ -111,7 +111,7 @@
 		"gulp": "^4.0.0",
 		"gulp-autoprefixer": "^6.0.0",
 		"gulp-cssmin": "^0.2.0",
-		"gulp-sass": "^4.0.2",
+		"gulp-sass": "^5.1.0",
 		"highlight.js": "^9.3.0",
 		"html-webpack-plugin": "^3.2.0",
 		"js-base64": "^3.7.7",
@@ -125,7 +125,7 @@
 		"karma-sinon-chai": "^2.0.2",
 		"karma-sourcemap-loader": "^0.3.7",
 		"karma-spec-reporter": "^0.0.32",
-		"karma-webpack": "^3.0.5",
+		"karma-webpack": "^4.0.2",
 		"launch-editor-middleware": "^2.3.0",
 		"markdown-it": "^8.4.1",
 		"markdown-it-anchor": "^5.0.2",
@@ -133,12 +133,12 @@
 		"markdown-it-container": "^2.0.0",
 		"mini-css-extract-plugin": "^0.4.1",
 		"mocha": "^6.0.2",
-		"node-sass": "^4.11.0",
+		"sass": "^1.32.0",
 		"optimize-css-assets-webpack-plugin": "^5.0.1",
 		"postcss": "^7.0.14",
 		"progress-bar-webpack-plugin": "^1.11.0",
 		"rimraf": "^2.5.4",
-		"sass-loader": "^7.1.0",
+		"sass-loader": "^8.0.0",
 		"select-version-cli": "^0.0.2",
 		"shelljs": "^0.10.0",
 		"sinon": "^7.2.7",

package/packages/theme-chalk/gulpfile.js

@@ -0,0 +1,27 @@
+'use strict';
+
+const { series, src, dest } = require('gulp');
+const sass = require('gulp-sass')(require('sass'));
+const autoprefixer = require('gulp-autoprefixer');
+const cssmin = require('gulp-cssmin');
+
+function compile() {
+	return src('./src/*.scss')
+		.pipe(sass.sync({
+			silenceDeprecations: ['import', 'legacy-js-api', 'slash-div', 'global-builtin', 'function-units', 'color-functions']
+		}))
+		.pipe(autoprefixer({
+			overrideBrowserslist: ['ie > 9', 'last 2 versions'],
+			cascade: false
+		}))
+		.pipe(cssmin())
+		.pipe(dest('./lib'));
+}
+
+function copyfont() {
+	return src('./src/fonts/**')
+		.pipe(cssmin())
+		.pipe(dest('./lib/fonts'));
+}
+
+exports.build = series(compile, copyfont);

package/packages/theme-cy/gulpfile.js

@@ -0,0 +1,27 @@
+'use strict';
+
+const { series, src, dest } = require('gulp');
+const sass = require('gulp-sass')(require('sass'));
+const autoprefixer = require('gulp-autoprefixer');
+const cssmin = require('gulp-cssmin');
+
+function compile() {
+	return src('./src/*.scss')
+		.pipe(sass.sync({
+			silenceDeprecations: ['import', 'legacy-js-api', 'slash-div', 'global-builtin', 'function-units', 'color-functions']
+		}))
+		.pipe(autoprefixer({
+			overrideBrowserslist: ['ie > 9', 'last 2 versions'],
+			cascade: false
+		}))
+		.pipe(cssmin())
+		.pipe(dest('./lib'));
+}
+
+function copyfont() {
+	return src('./src/fonts/**')
+		.pipe(cssmin())
+		.pipe(dest('./lib/fonts'));
+}
+
+exports.build = series(compile, copyfont);

package/src/index.js

@@ -219,7 +219,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-	version: '1.0.38',
+	version: '1.0.40',
 	locale: locale.use,
 	i18n: locale.i18n,
 	install,