eoss-ui 0.7.94 → 0.7.96

package/lib/qr-code.js

@@ -4800,19 +4800,19 @@ var QRCode = __webpack_require__(34);
               //设置logo大小
               var logoPosition = (_this3.mwidth - 46) / 2; //logo相对于canvas居中定位
               //设置获取的logo将其变为圆角以及添加白色背景
-              /* ctx.fillStyle = "#fff";
-              ctx.beginPath();
-              let h = 46; //圆角高 10为基数(logo四周白色背景为10/2)
-              let w = 46; //圆角宽
-              let x = logoPosition - 5;
-              let y = logoPosition - 5;
-              let r = 5; //圆角半径
-              ctx.moveTo(x + r, y);
-              ctx.arcTo(x + w, y, x + w, y + h, r);
-              ctx.arcTo(x + w, y + h, x, y + h, r);
-              ctx.arcTo(x, y + h, x, y, r);
-              ctx.arcTo(x, y, x + w, y, r);
-              ctx.closePath();
+              /* ctx.fillStyle = "#fff";
+              ctx.beginPath();
+              let h = 46; //圆角高 10为基数(logo四周白色背景为10/2)
+              let w = 46; //圆角宽
+              let x = logoPosition - 5;
+              let y = logoPosition - 5;
+              let r = 5; //圆角半径
+              ctx.moveTo(x + r, y);
+              ctx.arcTo(x + w, y, x + w, y + h, r);
+              ctx.arcTo(x + w, y + h, x, y + h, r);
+              ctx.arcTo(x, y + h, x, y, r);
+              ctx.arcTo(x, y, x + w, y, r);
+              ctx.closePath();
               ctx.fill(); */
               logo.onload = function () {
                 ctx.drawImage(logo, logoPosition, logoPosition, 46, 46);

package/lib/radio-group.js

@@ -4654,7 +4654,7 @@ module.exports = require("axios");
 // 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/radio-group/src/main.vue?vue&type=template&id=0fe3af8b&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/radio-group/src/main.vue?vue&type=template&id=08e9e499&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4664,121 +4664,108 @@ var render = function () {
         "div",
         { staticClass: "es-radio-group" },
         [
-          _vm.readonly
-            ? _c(
-                "div",
+          _c(
+            "el-radio-group",
+            _vm._g(
+              _vm._b(
                 {
-                  staticClass: "es-input__inner",
-                  class: { "es-plain": this.plain },
+                  directives: [
+                    {
+                      name: "show",
+                      rawName: "v-show",
+                      value: _vm.display,
+                      expression: "display",
+                    },
+                  ],
+                  attrs: { "value-key": _vm.valueKey, readonly: _vm.readonly },
+                  model: {
+                    value: _vm.model,
+                    callback: function ($$v) {
+                      _vm.model = $$v
+                    },
+                    expression: "model",
+                  },
                 },
-                [_vm._v("\n    " + _vm._s(_vm.labelVal) + "\n  ")]
-              )
-            : _c(
                 "el-radio-group",
-                _vm._g(
-                  _vm._b(
-                    {
-                      directives: [
+                _vm.$attrs,
+                false
+              ),
+              _vm.$listeners
+            ),
+            [
+              _vm.genre === "button"
+                ? _vm._l(_vm.results, function (item, index) {
+                    return _c(
+                      "el-radio-button",
+                      _vm._b(
                         {
-                          name: "show",
-                          rawName: "v-show",
-                          value: _vm.display,
-                          expression: "display",
+                          key: index,
+                          attrs: {
+                            label:
+                              _vm.isObject || typeof item == "string"
+                                ? item
+                                : item[_vm.valKey],
+                            disabled:
+                              typeof item == "string" ? false : item.disabled,
+                          },
                         },
-                      ],
-                      attrs: { "value-key": _vm.valueKey },
-                      model: {
-                        value: _vm.model,
-                        callback: function ($$v) {
-                          _vm.model = $$v
+                        "el-radio-button",
+                        _vm.getprops(_vm.$attrs, item),
+                        false
+                      ),
+                      [
+                        _vm._v(
+                          "\n        " +
+                            _vm._s(
+                              typeof item == "string"
+                                ? item
+                                : item[_vm.label]
+                                ? item[_vm.label]
+                                : item.label || item[_vm.valKey]
+                            ) +
+                            "\n      "
+                        ),
+                      ]
+                    )
+                  })
+                : _vm._l(_vm.results, function (item, index) {
+                    return _c(
+                      "el-radio",
+                      _vm._b(
+                        {
+                          key: index,
+                          attrs: {
+                            label:
+                              _vm.isObject || typeof item == "string"
+                                ? item
+                                : item[_vm.valKey],
+                            disabled:
+                              typeof item == "string" ? false : item.disabled,
+                            border: _vm.genre === "border",
+                          },
                         },
-                        expression: "model",
-                      },
-                    },
-                    "el-radio-group",
-                    _vm.$attrs,
-                    false
-                  ),
-                  _vm.$listeners
-                ),
-                [
-                  _vm.genre === "button"
-                    ? _vm._l(_vm.results, function (item, index) {
-                        return _c(
-                          "el-radio-button",
-                          _vm._b(
-                            {
-                              key: index,
-                              attrs: {
-                                label:
-                                  _vm.isObject || typeof item == "string"
-                                    ? item
-                                    : item[_vm.valKey],
-                                disabled:
-                                  typeof item == "string"
-                                    ? false
-                                    : item.disabled,
-                              },
-                            },
-                            "el-radio-button",
-                            _vm.getprops(_vm.$attrs, item),
-                            false
-                          ),
-                          [
-                            _vm._v(
-                              "\n        " +
-                                _vm._s(
-                                  typeof item == "string"
-                                    ? item
-                                    : item[_vm.label]
-                                    ? item[_vm.label]
-                                    : item.label || item[_vm.valKey]
-                                ) +
-                                "\n      "
-                            ),
-                          ]
-                        )
-                      })
-                    : _vm._l(_vm.results, function (item, index) {
-                        return _c(
-                          "el-radio",
-                          _vm._b(
-                            {
-                              key: index,
-                              attrs: {
-                                label:
-                                  _vm.isObject || typeof item == "string"
-                                    ? item
-                                    : item[_vm.valKey],
-                                disabled:
-                                  typeof item == "string"
-                                    ? false
-                                    : item.disabled,
-                                border: _vm.genre === "border",
-                              },
-                            },
-                            "el-radio",
-                            _vm.getprops(_vm.$attrs, item),
-                            false
-                          ),
-                          [
-                            _vm._v(
-                              "\n        " +
-                                _vm._s(
-                                  typeof item == "string"
-                                    ? item
-                                    : item[_vm.label]
-                                    ? item[_vm.label]
-                                    : item.label || item[_vm.valKey]
-                                ) +
-                                "\n      "
-                            ),
-                          ]
-                        )
-                      }),
-                ],
-                2
-              ),
+                        "el-radio",
+                        _vm.getprops(_vm.$attrs, item),
+                        false
+                      ),
+                      [
+                        _vm._v(
+                          "\n        " +
+                            _vm._s(
+                              typeof item == "string"
+                                ? item
+                                : item[_vm.label]
+                                ? item[_vm.label]
+                                : item.label || item[_vm.valKey]
+                            ) +
+                            "\n      "
+                        ),
+                      ]
+                    )
+                  }),
+            ],
+            2
+          ),
         ],
         1
       )
@@ -4788,7 +4775,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/radio-group/src/main.vue?vue&type=template&id=0fe3af8b&
+// CONCATENATED MODULE: ./packages/radio-group/src/main.vue?vue&type=template&id=08e9e499&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);

package/lib/select.js

@@ -5145,7 +5145,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
           }
         }
       }
-      return '';
+      return value;
     },
     reload: function reload() {
       this.getData.apply(this, arguments);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.7.94",
+  "version": "0.7.96",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [
@@ -100,7 +100,7 @@
     "cp-cli": "^1.0.2",
     "cross-env": "^3.1.3",
     "css-loader": "^2.1.0",
-    "eoss-element": "^0.3.65",
+    "eoss-element": "^0.3.70",
     "es6-promise": "^4.0.5",
     "eslint": "4.18.2",
     "eslint-config-elemefe": "0.1.1",

package/packages/button/index.js

@@ -1,5 +1,5 @@
-import EsButton from './src/main';
-
-EsButton.install = Vue => Vue.component(EsButton.name, EsButton);
-
-export default EsButton;
+import EsButton from './src/main';
+
+EsButton.install = Vue => Vue.component(EsButton.name, EsButton);
+
+export default EsButton;