eoss-mobiles 0.2.70 → 0.2.71

package/lib/picker.js

@@ -2054,7 +2054,7 @@ module.exports = require("sm-crypto");
 // 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/picker/src/main.vue?vue&type=template&id=25f9a248&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/picker/src/main.vue?vue&type=template&id=76b1e106&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -2078,9 +2078,10 @@ var render = function () {
                   hideLabel: _vm.hideLabel,
                   placeholder: _vm.pickerValue
                     ? _vm.pickerValue
-                    : _vm.disabled || _vm.readonly
+                    : (_vm.disabled || _vm.readonly) &&
+                      _vm.placeholder == undefined
                     ? "暂无数据"
-                    : _vm.placeholder
+                    : _vm.placeholder != undefined
                     ? _vm.placeholder
                     : "请选择" + _vm.label,
                   disabled: _vm.disabled || _vm.readonly,
@@ -2151,9 +2152,10 @@ var render = function () {
                           _vm._v(
                             "\n          " +
                               _vm._s(
-                                _vm.disabled || _vm.readonly
+                                (_vm.disabled || _vm.readonly) &&
+                                  _vm.placeholder == undefined
                                   ? " 暂无数据"
-                                  : !_vm.placeholder
+                                  : _vm.placeholder == undefined
                                   ? "请选择" + _vm.label
                                   : _vm.placeholder
                               ) +
@@ -2369,7 +2371,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/picker/src/main.vue?vue&type=template&id=25f9a248&
+// CONCATENATED MODULE: ./packages/picker/src/main.vue?vue&type=template&id=76b1e106&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(2);

package/lib/selector.js

@@ -2046,7 +2046,7 @@ module.exports = require("sm-crypto");
 // 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=76152aac&
+// 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=97f29d94&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -2180,7 +2180,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=76152aac&
+// CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=97f29d94&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/selector-tree.vue?vue&type=template&id=03f31afd&
 var selector_treevue_type_template_id_03f31afd_render = function () {
@@ -4153,8 +4153,8 @@ var selector_tree_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var selector_tree = (selector_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/src/selector-field.vue?vue&type=template&id=b340cbe8&
-var selector_fieldvue_type_template_id_b340cbe8_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/src/selector-field.vue?vue&type=template&id=5be3c766&
+var selector_fieldvue_type_template_id_5be3c766_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4304,10 +4304,8 @@ var selector_fieldvue_type_template_id_b340cbe8_render = function () {
                     _vm._v(
                       "\n          " +
                         _vm._s(
-                          _vm.disabled
-                            ? _vm.$attrs.placeholder
-                              ? _vm.$attrs.placeholder
-                              : " 暂无数据"
+                          _vm.disabled && !_vm.$attrs.placeholder
+                            ? "暂无数据"
                             : !_vm.$attrs.placeholder
                             ? "请选择" + _vm.$attrs.label
                             : _vm.$attrs.placeholder
@@ -4324,11 +4322,11 @@ var selector_fieldvue_type_template_id_b340cbe8_render = function () {
     1
   )
 }
-var selector_fieldvue_type_template_id_b340cbe8_staticRenderFns = []
-selector_fieldvue_type_template_id_b340cbe8_render._withStripped = true
+var selector_fieldvue_type_template_id_5be3c766_staticRenderFns = []
+selector_fieldvue_type_template_id_5be3c766_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector/src/selector-field.vue?vue&type=template&id=b340cbe8&
+// CONCATENATED MODULE: ./packages/selector/src/selector-field.vue?vue&type=template&id=5be3c766&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/selector-field.vue?vue&type=script&lang=js&
 //
@@ -4401,11 +4399,6 @@ selector_fieldvue_type_template_id_b340cbe8_render._withStripped = true
 //
 //
 //
-//
-//
-//
-//
-//
 
 /* harmony default export */ var selector_fieldvue_type_script_lang_js_ = ({
   name: 'selectorField',
@@ -4593,8 +4586,8 @@ selector_fieldvue_type_template_id_b340cbe8_render._withStripped = true
 
 var selector_field_component = Object(componentNormalizer["a" /* default */])(
   src_selector_fieldvue_type_script_lang_js_,
-  selector_fieldvue_type_template_id_b340cbe8_render,
-  selector_fieldvue_type_template_id_b340cbe8_staticRenderFns,
+  selector_fieldvue_type_template_id_5be3c766_render,
+  selector_fieldvue_type_template_id_5be3c766_staticRenderFns,
   false,
   null,
   null,
@@ -4694,6 +4687,11 @@ var selector_field_component = Object(componentNormalizer["a" /* default */])(
     value: {
       handler: function handler(val) {
         this.selectList = val;
+        if (this.selectList.length > 0) {
+          this.inputValue = this.selectList[0][this.$attrs.labelKey || this.$attrs['label-key'] || 'showname'];
+        } else {
+          this.inputValue = '';
+        }
       },
 
       deep: true,

package/package.json

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

package/packages/date/src/main.vue

@@ -13,7 +13,7 @@
       :required="required"
       :hideLabel="hideLabel"
       :placeholder="
-        disabled || readonly ? '暂无数据' : placeholder || `请选择${label}`
+        (disabled || readonly) && placeholder == undefined ? '暂无数据' : placeholder != undefined ? placeholder : `请选择${label}`
       "
       @click="handlePicker"
     >
@@ -24,7 +24,7 @@
           >{{ pickerValue}} </span
         >
         <span style="color:#c8c9cc" v-else>{{
-          disabled || readonly ? '暂无数据' : placeholder || `请选择${label}`
+          (disabled || readonly) && placeholder == undefined ? '暂无数据' : placeholder != undefined ? placeholder : `请选择${label}`
         }}</span>
       </template>
       <template slot="right-icon" v-if="clearable">

package/packages/field/src/main.vue

@@ -21,7 +21,7 @@
       v-bind="$attrs"
       :label-width="labelWidth"
       :placeholder="
-  $attrs.disabled || $attrs.readonly ?'暂无数据' : newPlaceholder ? newPlaceholder : '请输入' + ($attrs.label || '')
+  ($attrs.disabled || $attrs.readonly) && newPlaceholder == undefined ?'暂无数据' : newPlaceholder != undefined ? newPlaceholder : '请输入' + ($attrs.label || '')
       "
       v-on="$listeners"
       :error-message="newErrorMessage"

package/packages/picker/src/main.vue

@@ -13,9 +13,9 @@
       :placeholder="
         pickerValue
           ? pickerValue
-          : disabled || readonly
+          : (disabled || readonly) && placeholder == undefined
           ? '暂无数据'
-          : placeholder
+          : placeholder != undefined
           ? placeholder
           : `请选择${label}`
       "
@@ -52,9 +52,9 @@
           </div>
           <div v-else style="color:#c8c9cc">
             {{
-              disabled || readonly
+              (disabled || readonly) && placeholder == undefined
                 ? ' 暂无数据'
-                : !placeholder
+                : placeholder == undefined
                 ? '请选择' + label
                 : placeholder
             }}

package/packages/selector/src/main.vue

@@ -85,6 +85,13 @@ export default {
     value: {
       handler(val) {
         this.selectList = val;
+        if (this.selectList.length > 0) {
+          this.inputValue = this.selectList[0][
+            this.$attrs.labelKey || this.$attrs['label-key'] || 'showname'
+          ];
+        } else {
+          this.inputValue = '';
+        }
       },
       deep: true,
       immediate: true

package/packages/selector/src/selector-field.vue

@@ -59,12 +59,7 @@
 
           <div v-else style="color:#c8c9cc">
             {{
-              disabled
-                ? $attrs.placeholder
-                  ? $attrs.placeholder
-                  : ' 暂无数据'
-                : !$attrs.placeholder
-                ? '请选择' + $attrs.label
+              disabled && !$attrs.placeholder ?'暂无数据' : !$attrs.placeholder ? '请选择' + $attrs.label
                 : $attrs.placeholder
             }}
           </div>

package/src/index.js

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