eoss-mobiles 0.2.65 → 0.2.67

package/lib/table-column.js

@@ -2055,7 +2055,7 @@ module.exports = require("element-ui");
 // 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/table-column/src/main.vue?vue&type=template&id=b73961cc&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/table-column/src/main.vue?vue&type=template&id=0338abb2&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -2891,7 +2891,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/table-column/src/main.vue?vue&type=template&id=b73961cc&
+// CONCATENATED MODULE: ./packages/table-column/src/main.vue?vue&type=template&id=0338abb2&
 
 // EXTERNAL MODULE: external "element-ui"
 var external_element_ui_ = __webpack_require__(9);
@@ -3762,8 +3762,8 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
         if (Array.isArray(row[field || prop]) && row[field || prop].length == 0) {
           str = '';
         } else {
-          // str = row[field || prop];
-          str = row[field || prop] ? '是' : '否';
+          // str = row[field || prop] ? '是' : '否';
+          str = row[field || prop] ? row[field || prop] : '';
         }
       }
       return str;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-mobiles",
-  "version": "0.2.65",
+  "version": "0.2.67",
   "description": "eoss内部移动端业务组件",
   "main": "lib/eoss-mobile.common.js",
   "files": [

package/packages/checkbox/src/main.vue

@@ -15,10 +15,14 @@
         v-bind="exclAttribute({ data: item, attrs: 'checkedColor' })"
         v-on="$listeners"
         :disabled="item.disabled"
-        :checked-color="checkedColor || item.checkedColor"
+        :label-disabled="item.labelDisabled || labelDisabled"
+        :label-position="item.labelPosition || labelPosition"
+        :shape="item.shape || shape"
+        :checked-color="item.checkedColor || checkedColor"
+        :icon-size="item.iconSize || iconSize"
         :name="item[valueKey]"
-        >
-        <span v-html="item[labelKey]"></span> 
+      >
+        <span v-html="item[labelKey]"></span>
         <slot
           slot="icon"
           :checked="newValue.indexOf(item[valueKey]) != -1"
@@ -31,7 +35,11 @@
       v-bind="$attrs"
       v-model="newValue"
       v-on="$listeners"
+      :label-disabled="labelDisabled"
+      :label-position="labelPosition"
+      :shape="shape"
       :checked-color="checkedColor"
+      :icon-size="iconSize"
       :disabled="disabled"
       :name="$attrs[valueKey]"
       >{{ $attrs.name }}
@@ -42,7 +50,7 @@
 <script>
 import { findSysCode } from '../../../src/config/api';
 import request from '../../../src/utils/http.js';
-import util from '../../../src/utils/util'
+import util from '../../../src/utils/util';
 export default {
   name: 'EmCheckboxGroup',
   inheritAttrs: false,
@@ -52,7 +60,7 @@ export default {
     };
   },
   props: {
-    checkedColor:String,
+    checkedColor: String,
     disabled: {
       type: Boolean,
       default: false
@@ -61,6 +69,22 @@ export default {
       type: [Array, Boolean],
       default: () => []
     },
+    labelDisabled: {
+      type: Boolean,
+      default: false
+    },
+    shape: {
+      type: String,
+      default: 'round'
+    },
+    iconSize: {
+      type: [String, Number],
+      default: '20px'
+    },
+    labelPosition: {
+      type: String,
+      default: 'right'
+    },
     data: {
       type: Array,
       default: () => []
@@ -100,8 +124,7 @@ export default {
     allowHtml: {
       type: Boolean,
       default: false
-    },
-    
+    }
   },
   computed: {
     newValue: {
@@ -134,7 +157,7 @@ export default {
     }
   },
   methods: {
-     exclAttribute({ data, attrs }) {
+    exclAttribute({ data, attrs }) {
       return util.exclAttribute({ data, attrs });
     },
     handleChange() {

package/packages/table-column/src/main.vue

@@ -825,8 +825,8 @@ export default {
         ) {
           str = '';
         } else {
-          // str = row[field || prop];
-          str = row[field || prop] ? '是' : '否';
+          // str = row[field || prop] ? '是' : '否';
+          str = row[field || prop] ? row[field || prop]  : '';
         }
       }
       return str;

package/src/index.js

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