eoss-ui 0.4.38 → 0.4.39

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=7968c9c6&
+// 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&
 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=7968c9c6&
+// CONCATENATED MODULE: ./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/tree.vue?vue&type=template&id=24ad732a&
 var treevue_type_template_id_24ad732a_render = function () {
@@ -3203,8 +3203,8 @@ var component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var tree = (component.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/selection.vue?vue&type=template&id=763cb60b&
-var selectionvue_type_template_id_763cb60b_render = function () {
+// 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/selection.vue?vue&type=template&id=66e09547&
+var selectionvue_type_template_id_66e09547_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3245,16 +3245,12 @@ var selectionvue_type_template_id_763cb60b_render = function () {
                         key: index,
                         class: { "es-radio-delete": _vm.genre === "delete" },
                         attrs: {
-                          ssss:
-                            typeof item == "string" ? item : item[_vm.valueKey],
                           label:
                             _vm.isObject || typeof item == "string"
                               ? item
-                              : item[_vm.valueKey],
+                              : item[_vm.valKey],
                           disabled:
-                            _vm.isObject || typeof item == "string"
-                              ? false
-                              : item.disabled,
+                            typeof item == "string" ? false : item.disabled,
                           "value-key": _vm.valueKey,
                         },
                       },
@@ -3306,7 +3302,7 @@ var selectionvue_type_template_id_763cb60b_render = function () {
                           label:
                             _vm.isObject || typeof item == "string"
                               ? item
-                              : item[_vm.valueKey],
+                              : item[_vm.valKey],
                           disabled:
                             typeof item == "string" ? false : item.disabled,
                           "value-key": _vm.valueKey,
@@ -3347,11 +3343,11 @@ var selectionvue_type_template_id_763cb60b_render = function () {
     1
   )
 }
-var selectionvue_type_template_id_763cb60b_staticRenderFns = []
-selectionvue_type_template_id_763cb60b_render._withStripped = true
+var selectionvue_type_template_id_66e09547_staticRenderFns = []
+selectionvue_type_template_id_66e09547_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector-panel/src/selection.vue?vue&type=template&id=763cb60b&
+// CONCATENATED MODULE: ./packages/selector-panel/src/selection.vue?vue&type=template&id=66e09547&
 
 // EXTERNAL MODULE: external "sortablejs"
 var external_sortablejs_ = __webpack_require__(24);
@@ -3410,9 +3406,6 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 //
 //
 //
-//
-//
-//
 
 
 
@@ -3468,13 +3461,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 
     selectes: {
       get: function get() {
-        if (this.multiple) {
-          if (!Array.isArray(this.value)) {
-            return [this.value];
-          }
-          return this.value;
-        }
-        if (Array.isArray(this.value)) {
+        if (!this.multiple && this.value && this.value.length) {
           return this.value[0];
         }
         return this.value;
@@ -3524,8 +3511,8 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 
 var selection_component = Object(componentNormalizer["a" /* default */])(
   src_selectionvue_type_script_lang_js_,
-  selectionvue_type_template_id_763cb60b_render,
-  selectionvue_type_template_id_763cb60b_staticRenderFns,
+  selectionvue_type_template_id_66e09547_render,
+  selectionvue_type_template_id_66e09547_staticRenderFns,
   false,
   null,
   null,
@@ -4104,7 +4091,12 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
       });
       this.checkAll = flag;
     },
-    checkeds: function checkeds(val, old) {
+    checkeds: function checkeds(res, old) {
+      var val = res;
+      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=d2169714&
+// 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&
 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=d2169714&
+// CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=7bec503c&
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);
@@ -3560,9 +3560,7 @@ var clickoutside_default = /*#__PURE__*/__webpack_require__.n(clickoutside_);
     selected: {
       deep: true,
       handler: function handler(val) {
-        if (Array.isArray(val)) {
-          this.$emit('change', val);
-        }
+        this.$emit('change', val);
         if (this.multiple) {
           this.resetInputHeight();
         }

package/package.json

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

package/packages/editor/src/minx.js

@@ -3,7 +3,7 @@ export default {
     contents() {
       return [
         [
-          { tips: '正文', trigger: 'click', dropdown: this._tags },
+          { tips: '正文', value: this.tag, trigger: 'click', dropdown: this._tags },
           {
             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']
@@ -55,6 +55,46 @@ export default {
                 path: ['M969.382408 288.738615l-319.401123-270.852152a67.074236 67.074236 0 0 0-96.459139 5.74922l-505.931379 574.922021a68.35184 68.35184 0 0 0-17.886463 47.910169 74.101061 74.101061 0 0 0 24.274486 47.910168l156.50655 132.232065h373.060512L975.131628 383.281347a67.074236 67.074236 0 0 0-5.74922-96.459139z m-440.134747 433.746725H264.144729l-90.071117-78.572676c-5.74922-5.74922-12.137243-12.137243-12.137243-17.886463a36.411728 36.411728 0 0 1 5.749221-24.274485l210.804741-240.828447 265.102932 228.691204z m-439.495945 180.781036h843.218964a60.047411 60.047411 0 1 1 0 120.733624H89.751716a60.047411 60.047411 0 1 1 0-120.733624z m0 0']
               }
             ]
+          },
+          {
+            colors: true,
+            tips: '文字颜色'
+          },
+          {
+            colors: true,
+            tips: '背景颜色',
+            title: '清除背景色',
+            path: ['M510.030769 315.076923l84.676923 196.923077h-177.230769l76.8-196.923077h15.753846zM945.230769 157.538462v708.923076c0 43.323077-35.446154 78.769231-78.769231 78.769231H157.538462c-43.323077 0-78.769231-35.446154-78.769231-78.769231V157.538462c0-43.323077 35.446154-78.769231 78.769231-78.769231h708.923076c43.323077 0 78.769231 35.446154 78.769231 78.769231z m-108.307692 643.938461L600.615385 216.615385c-5.907692-11.815385-15.753846-19.692308-29.538462-19.692308h-139.815385c-11.815385 0-23.630769 7.876923-27.56923 19.692308l-216.615385 584.861538c-3.938462 11.815385 3.938462 25.6 17.723077 25.6h80.738462c11.815385 0 23.630769-9.846154 27.56923-21.661538l63.015385-175.261539h263.876923l68.923077 175.261539c3.938462 11.815385 15.753846 21.661538 27.569231 21.661538h80.738461c13.784615 0 23.630769-13.784615 19.692308-25.6z']
+          }
+        ],
+        [
+          { 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: '无序列表',
+            path: ['M384 64h640v128H384V64z m0 384h640v128H384v-128z m0 384h640v128H384v-128zM0 128a128 128 0 1 1 256 0 128 128 0 0 1-256 0z m0 384a128 128 0 1 1 256 0 128 128 0 0 1-256 0z m0 384a128 128 0 1 1 256 0 128 128 0 0 1-256 0z']
+          },
+          {
+            tips: '有序列表',
+            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: '',
+            title: '',
+            path: ['']
+          },
+          {
+            tips: '',
+            title: '',
+            path: ['']
           }
         ]
       ];

package/packages/editor/src/toolbar.vue

@@ -281,7 +281,6 @@
         content="无序列表"
         placement="bottom"
       >
-        <div class="es-text-center" slot="content">无序列表</div>
         <el-button size="small">
           <svg class="es-icon-svg" viewBox="0 0 1024 1024">
             <path
@@ -298,7 +297,6 @@
         content="有序列表"
         placement="bottom"
       >
-        <div class="es-text-center" slot="content">有序列表</div>
         <el-button size="small">
           <svg class="es-icon-svg" viewBox="0 0 1024 1024">
             <path

package/packages/selector/src/main.vue

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

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

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

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

@@ -12,11 +12,8 @@
           v-for="(item, index) in data"
           :key="index"
           v-bind="getprops($attrs, item)"
-          :ssss="typeof item == 'string' ? item : item[valueKey]"
-          :label="isObject || typeof item == 'string' ? item : item[valueKey]"
-          :disabled="
-            isObject || typeof item == 'string' ? false : item.disabled
-          "
+          :label="isObject || typeof item == 'string' ? item : item[valKey]"
+          :disabled="typeof item == 'string' ? false : item.disabled"
           :class="{ 'es-radio-delete': genre === 'delete' }"
           :value-key="valueKey"
         >
@@ -36,7 +33,7 @@
           v-for="(item, index) in data"
           :key="index"
           v-bind="getprops($attrs, item)"
-          :label="isObject || typeof item == 'string' ? item : item[valueKey]"
+          :label="isObject || typeof item == 'string' ? item : item[valKey]"
           :disabled="typeof item == 'string' ? false : item.disabled"
           :class="{ 'es-checkbox-delete': genre === 'delete' }"
           :value-key="valueKey"
@@ -106,13 +103,7 @@ export default {
     },
     selectes: {
       get() {
-        if (this.multiple) {
-          if (!Array.isArray(this.value)) {
-            return [this.value];
-          }
-          return this.value;
-        }
-        if (Array.isArray(this.value)) {
+        if (!this.multiple && this.value && this.value.length) {
           return this.value[0];
         }
         return this.value;

package/src/index.js

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