eoss-ui 0.4.39 → 0.4.40

package/lib/selector-panel.js

@@ -2664,7 +2664,7 @@ module.exports = require("qs");
 // 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/selector-panel/src/main.vue?vue&type=template&id=4801ad47&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector-panel/src/main.vue?vue&type=template&id=3b8fb8f5&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -2905,7 +2905,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector-panel/src/main.vue?vue&type=template&id=4801ad47&
+// CONCATENATED MODULE: ./packages/selector-panel/src/main.vue?vue&type=template&id=3b8fb8f5&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector-panel/src/tree.vue?vue&type=template&id=24ad732a&
 var treevue_type_template_id_24ad732a_render = function () {
@@ -4093,10 +4093,10 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
     },
     checkeds: function checkeds(res, old) {
       var val = res;
-      if (!Array.isArray(val)) {
-        this.checkeds = [res];
-        return;
-      }
+      // if (!Array.isArray(val)) {
+      //   this.checkeds = [res];
+      //   return;
+      // }
       if (old.length > 0) {
         if (val.length < old.length) {
           this.checkAll = false;

package/lib/selector.js

@@ -2678,7 +2678,7 @@ module.exports = require("eoss-element");
 // 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/selector/src/main.vue?vue&type=template&id=7bec503c&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/main.vue?vue&type=template&id=88396248&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3152,7 +3152,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=7bec503c&
+// CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=88396248&
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);
@@ -3560,7 +3560,7 @@ var clickoutside_default = /*#__PURE__*/__webpack_require__.n(clickoutside_);
     selected: {
       deep: true,
       handler: function handler(val) {
-        this.$emit('change', val);
+        this.$emit('change', Array.isArray(val) ? val : [val]);
         if (this.multiple) {
           this.resetInputHeight();
         }

package/lib/upload.js

@@ -2657,8 +2657,8 @@ module.exports = require("qs");
 // 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/main.vue?vue&type=template&id=7fa5744f&
-var mainvue_type_template_id_7fa5744f_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=template&id=e88da89e&
+var mainvue_type_template_id_e88da89e_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -2793,44 +2793,54 @@ var mainvue_type_template_id_7fa5744f_render = function () {
                         }),
                   ]
                 : [
-                    _vm.selectType === "icon-plus"
-                      ? _c("i", {
-                          staticClass: "el-icon-plus es-uploader-icon",
-                        })
-                      : _c(
-                          "el-button",
-                          {
-                            staticClass: "es-upload-button",
-                            class: _vm.icon,
-                            attrs: { type: _vm.selectType, size: _vm.btnSize },
-                          },
-                          [
-                            _vm._v(
-                              _vm._s(
-                                _vm.text
-                                  ? _vm.text
-                                  : _vm.autoUpload
-                                  ? "点击上传"
-                                  : "选择文件"
+                    !_vm.isDisabled
+                      ? [
+                          _vm.selectType === "icon-plus"
+                            ? _c("i", {
+                                staticClass: "el-icon-plus es-uploader-icon",
+                              })
+                            : _c(
+                                "el-button",
+                                {
+                                  staticClass: "es-upload-button",
+                                  class: _vm.icon,
+                                  attrs: {
+                                    type: _vm.selectType,
+                                    size: _vm.btnSize,
+                                  },
+                                },
+                                [
+                                  _vm._v(
+                                    _vm._s(
+                                      _vm.text
+                                        ? _vm.text
+                                        : _vm.autoUpload
+                                        ? "点击上传"
+                                        : "选择文件"
+                                    )
+                                  ),
+                                ]
+                              ),
+                          !_vm.autoUpload
+                            ? _c(
+                                "el-button",
+                                {
+                                  staticClass: "es-upload-button",
+                                  attrs: {
+                                    type: _vm.uploadType,
+                                    size: _vm.btnSize,
+                                  },
+                                  on: {
+                                    click: function ($event) {
+                                      $event.stopPropagation()
+                                      return _vm.handleUpload($event)
+                                    },
+                                  },
+                                },
+                                [_vm._v("\n            上传文件\n          ")]
                               )
-                            ),
-                          ]
-                        ),
-                    !_vm.autoUpload
-                      ? _c(
-                          "el-button",
-                          {
-                            staticClass: "es-upload-button",
-                            attrs: { type: _vm.uploadType, size: _vm.btnSize },
-                            on: {
-                              click: function ($event) {
-                                $event.stopPropagation()
-                                return _vm.handleUpload($event)
-                              },
-                            },
-                          },
-                          [_vm._v("\n          上传文件\n        ")]
-                        )
+                            : _vm._e(),
+                        ]
                       : _vm._e(),
                     _vm.showFileList && _vm.isDownloads
                       ? _c(
@@ -2992,10 +3002,10 @@ var mainvue_type_template_id_7fa5744f_render = function () {
   )
 }
 var staticRenderFns = []
-mainvue_type_template_id_7fa5744f_render._withStripped = true
+mainvue_type_template_id_e88da89e_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=7fa5744f&
+// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=e88da89e&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -3186,6 +3196,10 @@ var _props;
 //
 //
 //
+//
+//
+//
+//
 
 
 
@@ -3950,7 +3964,7 @@ var _props;
           this.$message.success(response.msg);
         }
       }
-      var se = this.filesTotalSize + Math.ceil(file.size / 1024 * 100) / 100;
+      var se = this.filesTotalSize + (this.resultFile ? Math.ceil(file.size / 1024 * 100) / 100 : 0);
       this.filesTotalSize = se;
       this.onSuccess && this.onSuccess(response, file, fileList);
       this.$emit('success', response, file, fileList);
@@ -4009,7 +4023,7 @@ var componentNormalizer = __webpack_require__(2);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_7fa5744f_render,
+  mainvue_type_template_id_e88da89e_render,
   staticRenderFns,
   false,
   null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.4.39",
+  "version": "0.4.40",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

package/packages/editor/src/minx.js

@@ -3,7 +3,7 @@ export default {
     contents() {
       return [
         [
-          { tips: '正文', value: this.tag, trigger: 'click', dropdown: this._tags },
+          { tips: '正文', value: this.tag, trigger: 'click', dropdown: this._tags, type: 'tag' },
           {
             tips: '引用',
             path: ['M894.6 907.1H605.4c-32.6 0-59-26.4-59-59V608.2l-4-14.9c0-315.9 125.5-485.1 376.5-507.5v59.8C752.7 180.4 711.3 315.8 711.3 442.4v41.2l31.5 12.3h151.8c32.6 0 59 26.4 59 59v293.2c0 32.5-26.4 59-59 59z m-472 0H133.4c-32.6 0-59-26.4-59-59V608.2l-4-14.9c0-315.9 125.5-485.1 376.5-507.5v59.8C280.7 180.4 239.3 315.8 239.3 442.4v41.2l31.5 12.3h151.8c32.6 0 59 26.4 59 59v293.2c0 32.5-26.4 59-59 59z']
@@ -28,6 +28,7 @@ export default {
           },
           {
             path: ['M204.8 505.6m-76.8 0a76.8 76.8 0 1 0 153.6 0 76.8 76.8 0 1 0-153.6 0Z', 'M505.6 505.6m-76.8 0a76.8 76.8 0 1 0 153.6 0 76.8 76.8 0 1 0-153.6 0Z', 'M806.4 505.6m-76.8 0a76.8 76.8 0 1 0 153.6 0 76.8 76.8 0 1 0-153.6 0Z'],
+            type: 'tag',
             dropdown: [
               {
                 tips: '删除线',
@@ -68,9 +69,9 @@ export default {
           }
         ],
         [
-          { tips: '字号', value: this.fontSize, trigger: 'click', dropdown: this._fontSizes },
-          { tips: '字体', value: this.fontFamily, trigger: 'click', dropdown: this._fontFamilys },
-          { tips: '字体', value: this.lineHeight, trigger: 'click', dropdown: this._lineHeights }
+          { tips: '字号', value: this.fontSize, trigger: 'click', dropdown: this._fontSizes, type: 'fontSize' },
+          { tips: '字体', value: this.fontFamily, trigger: 'click', dropdown: this._fontFamilys, type: 'fontFamily' },
+          { tips: '字体', value: this.lineHeight, trigger: 'click', dropdown: this._lineHeights, type: 'lineHeight' }
         ],
         [
           {
@@ -82,19 +83,120 @@ export default {
             path: ['M384 832h640v128H384z m0-384h640v128H384z m0-384h640v128H384zM192 0v256H128V64H64V0zM128 526.016v50.016h128v64H64v-146.016l128-60V384H64v-64h192v146.016zM256 704v320H64v-64h128v-64H64v-64h128v-64H64v-64z']
           },
           {
-            tips: '',
-            title: '',
-            path: ['']
+            tips: '待办',
+            path: ['M278.755556 403.911111l-79.644445 79.644445L455.111111 739.555556l568.888889-568.888889-79.644444-79.644445L455.111111 580.266667l-176.355555-176.355556zM910.222222 910.222222H113.777778V113.777778h568.888889V0H113.777778C51.2 0 0 51.2 0 113.777778v796.444444c0 62.577778 51.2 113.777778 113.777778 113.777778h796.444444c62.577778 0 113.777778-51.2 113.777778-113.777778V455.111111h-113.777778v455.111111z']
           },
           {
-            tips: '',
-            title: '',
-            path: ['']
+            path: ['M768 793.6v102.4H51.2v-102.4h716.8z m204.8-230.4v102.4H51.2v-102.4h921.6z m-204.8-230.4v102.4H51.2v-102.4h716.8zM972.8 102.4v102.4H51.2V102.4h921.6z'],
+            type: 'textAlign',
+            dropdown: [
+              {
+                title: '左对齐',
+                path: ['M768 793.6v102.4H51.2v-102.4h716.8z m204.8-230.4v102.4H51.2v-102.4h921.6z m-204.8-230.4v102.4H51.2v-102.4h716.8zM972.8 102.4v102.4H51.2V102.4h921.6z']
+              },
+              {
+                title: '右对齐',
+                path: ['M972.8 793.6v102.4H256v-102.4h716.8z m0-230.4v102.4H51.2v-102.4h921.6z m0-230.4v102.4H256v-102.4h716.8zM972.8 102.4v102.4H51.2V102.4h921.6z']
+              },
+              {
+                title: '居中对齐',
+                path: ['M870.4 793.6v102.4H153.6v-102.4h716.8z m102.4-230.4v102.4H51.2v-102.4h921.6z m-102.4-230.4v102.4H153.6v-102.4h716.8zM972.8 102.4v102.4H51.2V102.4h921.6z']
+              },
+              {
+                title: '两端对齐',
+                path: ['M0 64h1024v128H0z m0 192h1024v128H0z m0 192h1024v128H0z m0 192h1024v128H0z m0 192h1024v128H0z']
+              }
+            ]
+          },
+          {
+            path: ['M0 64h1024v128H0z m384 192h640v128H384z m0 192h640v128H384z m0 192h640v128H384zM0 832h1024v128H0z m0-128V320l256 192z'],
+            type: 'textIndent',
+            dropdown: [
+              {
+                title: '增加缩进',
+                path: ['M0 64h1024v128H0z m384 192h640v128H384z m0 192h640v128H384z m0 192h640v128H384zM0 832h1024v128H0z m0-128V320l256 192z']
+              },
+              {
+                title: '减少缩进',
+                disabled: this.outdent,
+                path: ['M0 64h1024v128H0z m384 192h640v128H384z m0 192h640v128H384z m0 192h640v128H384zM0 832h1024v128H0z m256-512v384l-256-192z']
+              }
+            ]
+          }
+        ],
+        [
+          {
+            emojis: true,
+            tips: '表情',
+            path: ['M512 1024C230.4 1024 0 793.6 0 512S230.4 0 512 0s512 230.4 512 512-230.4 512-512 512z m0-102.4c226.742857 0 409.6-182.857143 409.6-409.6S738.742857 102.4 512 102.4 102.4 285.257143 102.4 512s182.857143 409.6 409.6 409.6z m-204.8-358.4h409.6c0 113.371429-91.428571 204.8-204.8 204.8s-204.8-91.428571-204.8-204.8z m0-102.4c-43.885714 0-76.8-32.914286-76.8-76.8s32.914286-76.8 76.8-76.8 76.8 32.914286 76.8 76.8-32.914286 76.8-76.8 76.8z m409.6 0c-43.885714 0-76.8-32.914286-76.8-76.8s32.914286-76.8 76.8-76.8c43.885714 0 76.8 32.914286 76.8 76.8s-32.914286 76.8-76.8 76.8z']
+          },
+          {
+            link: true,
+            tips: '插入链接',
+            path: ['M440.224 635.776a51.84 51.84 0 0 1-36.768-15.232c-95.136-95.136-95.136-249.92 0-345.056l192-192C641.536 37.408 702.816 12.032 768 12.032s126.432 25.376 172.544 71.456c95.136 95.136 95.136 249.92 0 345.056l-87.776 87.776a51.968 51.968 0 1 1-73.536-73.536l87.776-87.776a140.16 140.16 0 0 0 0-197.984c-26.432-26.432-61.6-40.992-99.008-40.992s-72.544 14.56-99.008 40.992l-192 192a140.16 140.16 0 0 0 0 197.984 51.968 51.968 0 0 1-36.768 88.768z', 'M256 1012a242.4 242.4 0 0 1-172.544-71.456c-95.136-95.136-95.136-249.92 0-345.056l87.776-87.776a51.968 51.968 0 1 1 73.536 73.536l-87.776 87.776a140.16 140.16 0 0 0 0 197.984c26.432 26.432 61.6 40.992 99.008 40.992s72.544-14.56 99.008-40.992l192-192a140.16 140.16 0 0 0 0-197.984 51.968 51.968 0 1 1 73.536-73.536c95.136 95.136 95.136 249.92 0 345.056l-192 192A242.4 242.4 0 0 1 256 1012z']
           },
           {
-            tips: '',
-            title: '',
-            path: ['']
+            path: ['M959.877 128l0.123 0.123v767.775l-0.123 0.122H64.102l-0.122-0.122V128.123l0.122-0.123h895.775zM960 64H64C28.795 64 0 92.795 0 128v768c0 35.205 28.795 64 64 64h896c35.205 0 64-28.795 64-64V128c0-35.205-28.795-64-64-64zM832 288.01c0 53.023-42.988 96.01-96.01 96.01s-96.01-42.987-96.01-96.01S682.967 192 735.99 192 832 234.988 832 288.01zM896 832H128V704l224.01-384 256 320h64l224.01-192z'],
+            type: 'image',
+            dropdown: [
+              {
+                title: '网络图片',
+                path: ['M959.877 128l0.123 0.123v767.775l-0.123 0.122H64.102l-0.122-0.122V128.123l0.122-0.123h895.775zM960 64H64C28.795 64 0 92.795 0 128v768c0 35.205 28.795 64 64 64h896c35.205 0 64-28.795 64-64V128c0-35.205-28.795-64-64-64zM832 288.01c0 53.023-42.988 96.01-96.01 96.01s-96.01-42.987-96.01-96.01S682.967 192 735.99 192 832 234.988 832 288.01zM896 832H128V704l224.01-384 256 320h64l224.01-192z']
+              },
+              {
+                title: '上传图片',
+                path: ['M828.708571 585.045333a48.761905 48.761905 0 0 0-48.737523 48.761905v18.529524l-72.143238-72.167619a135.972571 135.972571 0 0 0-191.585524 0l-34.133334 34.133333-120.880762-120.953905a138.898286 138.898286 0 0 0-191.585523 0l-72.167619 72.167619V292.400762a48.786286 48.786286 0 0 1 48.761904-48.761905h341.23581a48.737524 48.737524 0 0 0 34.474667-83.285333 48.737524 48.737524 0 0 0-34.474667-14.287238H146.236952A146.212571 146.212571 0 0 0 0 292.400762v585.289143A146.358857 146.358857 0 0 0 146.236952 1024h584.996572a146.212571 146.212571 0 0 0 146.236952-146.310095V633.807238a48.786286 48.786286 0 0 0-48.761905-48.761905zM146.261333 926.45181a48.737524 48.737524 0 0 1-48.761904-48.761905v-174.128762l141.409523-141.458286a38.497524 38.497524 0 0 1 53.126096 0l154.526476 154.624 209.627428 209.724953H146.236952z m633.734096-48.761905c-0.073143 9.337905-3.145143 18.383238-8.777143 25.843809l-219.843048-220.94019 34.133333-34.133334a37.546667 37.546667 0 0 1 53.613715 0l140.873143 141.897143V877.714286zM1009.615238 160.231619L863.329524 13.897143a48.737524 48.737524 0 0 0-16.091429-10.24c-11.849143-4.87619-25.161143-4.87619-37.059047 0a48.761905 48.761905 0 0 0-16.067048 10.24l-146.236952 146.334476a49.005714 49.005714 0 0 0 69.217523 69.241905l62.902858-63.390476v272.627809a48.761905 48.761905 0 1 0 97.475047 0V166.083048l62.902857 63.390476a48.737524 48.737524 0 0 0 69.217524 0 48.761905 48.761905 0 0 0 0-69.241905z']
+              }
+            ]
+          },
+          {
+            path: ['M981.184 160.096C837.568 139.456 678.848 128 512 128S186.432 139.456 42.816 160.096C15.296 267.808 0 386.848 0 512s15.264 244.16 42.816 351.904C186.464 884.544 345.152 896 512 896s325.568-11.456 469.184-32.096C1008.704 756.192 1024 637.152 1024 512s-15.264-244.16-42.816-351.904zM384 704V320l320 192-320 192z'],
+            type: 'video',
+            dropdown: [
+              {
+                title: '插入视频',
+                path: ['M981.184 160.096C837.568 139.456 678.848 128 512 128S186.432 139.456 42.816 160.096C15.296 267.808 0 386.848 0 512s15.264 244.16 42.816 351.904C186.464 884.544 345.152 896 512 896s325.568-11.456 469.184-32.096C1008.704 756.192 1024 637.152 1024 512s-15.264-244.16-42.816-351.904zM384 704V320l320 192-320 192z']
+              },
+              {
+                title: '上传视频',
+                path: ['M805.902261 521.819882a251.441452 251.441452 0 0 0-251.011972 246.600033 251.051015 251.051015 0 1 0 502.023944 8.823877 253.237463 253.237463 0 0 0-251.011972-255.42391z m59.463561 240.001647v129.898403h-116.701631v-129.898403h-44.041298l101.279368-103.504859 101.279368 103.504859z', 'M788.254507 0.000781H99.094092A98.663439 98.663439 0 0 0 0.001171 99.093701v590.067495a98.663439 98.663439 0 0 0 99.092921 99.092921h411.7549a266.434235 266.434235 0 0 1-2.186448-41.815807 275.843767 275.843767 0 0 1 275.180024-270.729042 270.650955 270.650955 0 0 1 103.504859 19.834201V99.093701A101.51363 101.51363 0 0 0 788.254507 0.000781zM295.054441 640.747004V147.507894l394.146189 246.600033z']
+              }
+            ]
+          },
+          {
+            table: true,
+            tips: '插入表格',
+            path: ['M0 64v896h1024V64H0z m384 576v-192h256v192h-256z m256 64v192h-256v-192h256z m0-512v192h-256V192h256zM320 192v192H64V192h256z m-256 256h256v192H64v-192z m640 0h256v192h-256v-192z m0-64V192h256v192h-256zM64 704h256v192H64v-192z m640 192v-192h256v192h-256z']
+          },
+          {
+            tips: '代码块',
+            path: ['M832 736l96 96 320-320L928 192l-96 96 224 224zM448 288l-96-96L32 512l320 320 96-96-224-224zM701.312 150.528l69.472 18.944-192 704.032-69.472-18.944 192-704.032z']
+          },
+          {
+            tips: '分割线',
+            path: [
+              'M0 51.2m51.2 0l989.866667 0q51.2 0 51.2 51.2l0 0q0 51.2-51.2 51.2l-989.866667 0q-51.2 0-51.2-51.2l0 0q0-51.2 51.2-51.2Z',
+              'M0 460.8m51.2 0l170.666667 0q51.2 0 51.2 51.2l0 0q0 51.2-51.2 51.2l-170.666667 0q-51.2 0-51.2-51.2l0 0q0-51.2 51.2-51.2Z',
+              'M819.2 460.8m51.2 0l170.666667 0q51.2 0 51.2 51.2l0 0q0 51.2-51.2 51.2l-170.666667 0q-51.2 0-51.2-51.2l0 0q0-51.2 51.2-51.2Z',
+              'M409.6 460.8m51.2 0l170.666667 0q51.2 0 51.2 51.2l0 0q0 51.2-51.2 51.2l-170.666667 0q-51.2 0-51.2-51.2l0 0q0-51.2 51.2-51.2Z',
+              'M0 870.4m51.2 0l989.866667 0q51.2 0 51.2 51.2l0 0q0 51.2-51.2 51.2l-989.866667 0q-51.2 0-51.2-51.2l0 0q0-51.2 51.2-51.2Z'
+            ]
+          }
+        ],
+        [
+          {
+            tips: '撤销',
+            path: ['M512 64A510.272 510.272 0 0 0 149.984 213.984L0.032 64v384h384L240.512 304.48A382.784 382.784 0 0 1 512.032 192c212.064 0 384 171.936 384 384 0 114.688-50.304 217.632-130.016 288l84.672 96a510.72 510.72 0 0 0 173.344-384c0-282.784-229.216-512-512-512z']
+          },
+          {
+            tips: '重做',
+            path: ['M0.00032 576a510.72 510.72 0 0 0 173.344 384l84.672-96A383.136 383.136 0 0 1 128.00032 576C128.00032 363.936 299.93632 192 512.00032 192c106.048 0 202.048 42.976 271.52 112.48L640.00032 448h384V64l-149.984 149.984A510.272 510.272 0 0 0 512.00032 64C229.21632 64 0.00032 293.216 0.00032 576z']
+          }
+        ],
+        [
+          {
+            tips: '全屏',
+            path: ['M133.705143 335.433143V133.851429h201.581714a29.622857 29.622857 0 0 0 29.622857-29.549715V68.754286a29.622857 29.622857 0 0 0-29.622857-29.622857H61.732571A22.893714 22.893714 0 0 0 38.765714 62.025143V335.725714c0 16.310857 13.238857 29.622857 29.622857 29.622857h35.547429a29.842286 29.842286 0 0 0 29.696-29.842285zM690.980571 133.851429h201.581715v201.654857c0 16.310857 13.238857 29.549714 29.622857 29.549714h35.547428a29.622857 29.622857 0 0 0 29.549715-29.549714V61.952a22.893714 22.893714 0 0 0-22.820572-22.893714h-273.554285a29.622857 29.622857 0 0 0-29.549715 29.622857v35.547428c0 16.310857 13.238857 29.696 29.622857 29.696zM335.286857 892.781714H133.705143V691.2a29.622857 29.622857 0 0 0-29.622857-29.622857H68.534857a29.622857 29.622857 0 0 0-29.549714 29.622857v273.554286c0 12.653714 10.24 22.893714 22.820571 22.893714h273.554286a29.622857 29.622857 0 0 0 29.696-29.622857v-35.547429a29.769143 29.769143 0 0 0-29.769143-29.696z m557.348572-201.581714v201.581714H690.907429a29.622857 29.622857 0 0 0-29.622858 29.622857v35.547429c0 16.310857 13.238857 29.622857 29.622858 29.622857h273.554285c12.580571 0 22.893714-10.313143 22.893715-22.893714V691.2a29.622857 29.622857 0 0 0-29.622858-29.622857h-35.547428a29.622857 29.622857 0 0 0-29.696 29.622857z']
           }
         ]
       ];

package/packages/editor/src/toolbar.vue

@@ -1,5 +1,44 @@
 <template>
   <div class="es-editor-toolbar">
+    <div v-for="(items, indexs) in contents" :key="indexs">
+      <div
+        class="es-editor-toolbar-item"
+        v-for="(item, index) in items"
+        :key="index"
+      >
+        <el-dropdown
+          v-if="item.dropdown && item.dropdown.length"
+          placement="bottom"
+          :trigger="item.trigger"
+          @command="
+            (res) => {
+              handleCommand('tag', res);
+            }
+          "
+        >
+          <el-tooltip
+            v-if="item.tips"
+            effect="dark"
+            :content="item.tips"
+            :placement="item.placement ? item.placement : 'bottom'"
+          >
+            <el-button size="small">
+              {{ tag }}<i class="el-icon-caret-bottom el-icon--right"></i>
+            </el-button>
+          </el-tooltip>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item
+              class="es-editor-dropdown-item"
+              v-for="item in _tags"
+              :class="{ active: item == tag }"
+              :key="item"
+              :command="item"
+              >{{ item }}</el-dropdown-item
+            >
+          </el-dropdown-menu>
+        </el-dropdown>
+      </div>
+    </div>
     <div class="es-editor-toolbar-item">
       <el-dropdown
         placement="bottom"
@@ -227,6 +266,11 @@
           placement="bottom"
         >
           <el-button size="small">
+            <svg class="es-icon-svg" viewBox="0 0 1024 1024">
+              <path
+                d="M384 832h640v128H384z m0-384h640v128H384z m0-384h640v128H384zM192 0v256H128V64H64V0zM128 526.016v50.016h128v64H64v-146.016l128-60V384H64v-64h192v146.016zM256 704v320H64v-64h128v-64H64v-64h128v-64H64v-64z"
+              ></path>
+            </svg>
             {{ fontFamily }}<i class="el-icon-caret-bottom el-icon--right"></i>
           </el-button>
         </el-tooltip>
@@ -310,9 +354,11 @@
 </template>
 <script>
 import Colors from './color.vue';
+import mixin from './minx';
 export default {
   name: 'Toolbars',
   components: { Colors },
+  mixins: [mixin],
   inject: {
     elForm: {
       default: ''
@@ -420,7 +466,8 @@ export default {
       tag: '正文',
       fontSize: '默认字号',
       fontFamily: '默认字体',
-      lineHeight: '默认行高'
+      lineHeight: '默认行高',
+      outdent: true
     };
   },
   mounted() {},

package/packages/selector/src/main.vue

@@ -391,7 +391,7 @@ export default {
     selected: {
       deep: true,
       handler(val) {
-        this.$emit('change', val);
+        this.$emit('change', Array.isArray(val) ? val : [val]);
         if (this.multiple) {
           this.resetInputHeight();
         }

package/packages/selector-panel/src/main.vue

@@ -572,10 +572,10 @@ export default {
     },
     checkeds(res, old) {
       let val = res;
-      if (!Array.isArray(val)) {
-        this.checkeds = [res];
-        return;
-      }
+      // if (!Array.isArray(val)) {
+      //   this.checkeds = [res];
+      //   return;
+      // }
       if (old.length > 0) {
         if (val.length < old.length) {
           this.checkAll = false;

package/packages/upload/src/main.vue

@@ -81,27 +81,31 @@
           ></i>
         </template>
         <template v-else>
-          <i
-            class="el-icon-plus es-uploader-icon"
-            v-if="selectType === 'icon-plus'"
-          ></i>
-          <el-button
-            v-else
-            class="es-upload-button"
-            :class="icon"
-            :type="selectType"
-            :size="btnSize"
-            >{{ text ? text : autoUpload ? '点击上传' : '选择文件' }}</el-button
-          >
-          <el-button
-            class="es-upload-button"
-            v-if="!autoUpload"
-            :type="uploadType"
-            :size="btnSize"
-            @click.stop="handleUpload"
-          >
-            上传文件
-          </el-button>
+          <template v-if="!isDisabled">
+            <i
+              class="el-icon-plus es-uploader-icon"
+              v-if="selectType === 'icon-plus'"
+            ></i>
+            <el-button
+              v-else
+              class="es-upload-button"
+              :class="icon"
+              :type="selectType"
+              :size="btnSize"
+              >{{
+                text ? text : autoUpload ? '点击上传' : '选择文件'
+              }}</el-button
+            >
+            <el-button
+              class="es-upload-button"
+              v-if="!autoUpload"
+              :type="uploadType"
+              :size="btnSize"
+              @click.stop="handleUpload"
+            >
+              上传文件
+            </el-button>
+          </template>
           <el-button
             v-if="showFileList && isDownloads"
             slot="handle"
@@ -1062,7 +1066,9 @@ export default {
           this.$message.success(response.msg);
         }
       }
-      let se = this.filesTotalSize + Math.ceil((file.size / 1024) * 100) / 100;
+      let se =
+        this.filesTotalSize +
+        (this.resultFile ? Math.ceil((file.size / 1024) * 100) / 100 : 0);
       this.filesTotalSize = se;
       this.onSuccess && this.onSuccess(response, file, fileList);
       this.$emit('success', response, file, fileList);

package/src/index.js

@@ -117,7 +117,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.4.39',
+  version: '0.4.40',
   install,
   Button,
   ButtonGroup,