eoss-mobiles 0.2.58 → 0.2.60

package/lib/selector.js

@@ -4000,8 +4000,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=e58694a8&
-var selector_fieldvue_type_template_id_e58694a8_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=75a060f2&
+var selector_fieldvue_type_template_id_75a060f2_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4164,11 +4164,11 @@ var selector_fieldvue_type_template_id_e58694a8_render = function () {
     1
   )
 }
-var selector_fieldvue_type_template_id_e58694a8_staticRenderFns = []
-selector_fieldvue_type_template_id_e58694a8_render._withStripped = true
+var selector_fieldvue_type_template_id_75a060f2_staticRenderFns = []
+selector_fieldvue_type_template_id_75a060f2_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector/src/selector-field.vue?vue&type=template&id=e58694a8&
+// CONCATENATED MODULE: ./packages/selector/src/selector-field.vue?vue&type=template&id=75a060f2&
 
 // 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&
 //
@@ -4239,6 +4239,12 @@ selector_fieldvue_type_template_id_e58694a8_render._withStripped = true
 //
 //
 //
+//
+//
+//
+//
+//
+//
 
 /* harmony default export */ var selector_fieldvue_type_script_lang_js_ = ({
   name: 'selectorField',
@@ -4259,6 +4265,7 @@ selector_fieldvue_type_template_id_e58694a8_render._withStripped = true
       type: Boolean,
       default: false
     },
+    readonly: { type: Boolean, default: false },
     selectDisabled: {
       type: Boolean,
       default: false
@@ -4421,8 +4428,8 @@ selector_fieldvue_type_template_id_e58694a8_render._withStripped = true
 
 var selector_field_component = Object(componentNormalizer["a" /* default */])(
   src_selector_fieldvue_type_script_lang_js_,
-  selector_fieldvue_type_template_id_e58694a8_render,
-  selector_fieldvue_type_template_id_e58694a8_staticRenderFns,
+  selector_fieldvue_type_template_id_75a060f2_render,
+  selector_fieldvue_type_template_id_75a060f2_staticRenderFns,
   false,
   null,
   null,

package/package.json

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

package/packages/field/src/main.vue

@@ -14,13 +14,14 @@
         'is-left-icon': leftIcon,
         
       }"
+      :disabled="$attrs.disabled || $attrs.readonly "
       v-model="modelValue"
       :border='border'
       autocomplete="new-password"
       v-bind="$attrs"
       :label-width="labelWidth"
       :placeholder="
-        newPlaceholder ? newPlaceholder : '请输入' + ($attrs.label || '')
+  $attrs.disabled || $attrs.readonly ?'暂无数据' : newPlaceholder ? newPlaceholder : '请输入' + ($attrs.label || '')
       "
       v-on="$listeners"
       :error-message="newErrorMessage"
@@ -181,7 +182,7 @@ export default {
           this.newType = 'text';
         }
       }
-      this.$emit('click-right-icon', event);
+      // this.$emit('click-right-icon', event);
     },
     handleBlur(rules) {
       const _that = this;

package/packages/form/src/main.vue

@@ -19,6 +19,7 @@
         "
         class="em-table-input"
         v-bind="{ ...$attrs, ...item }"
+        v-on="{...item.events}"
         :label-position="item.labelPosition || labelPosition"
         :disabled="item.disabled || disabled"
         :readonly="item.readonly || readonly"
@@ -27,9 +28,30 @@
         :label="item.label.text || item.label"
         @input="handleChange(item.name, model[item.name])"
       />
+      <!-- <em-input
+        v-if="
+          (item.type === 'text' ||
+            item.type === 'textarea' ||
+            item.type == 'number' ||
+            item.type == 'digit' ||
+            item.type == 'password' ||
+            item.type == 'tel') && item.events
+        "
+        class="em-table-input"
+        v-bind="{ ...$attrs, ...item }"
+        
+        :label-position="item.labelPosition || labelPosition"
+        :disabled="item.disabled || disabled"
+        :readonly="item.readonly || readonly"
+        ref="input"
+        v-model="model[item.name]"
+        :label="item.label.text || item.label"
+        @input="handleChange(item.name, model[item.name])"
+      /> -->
       <em-picker
         v-if="item.type === 'select'"
         v-bind="{ ...$attrs, ...item }"
+        v-on="{...item.events}"
         ref="select"
         :label-position="item.labelPosition || labelPosition"
         :disabled="item.disabled || disabled"
@@ -56,6 +78,7 @@
         "
         ref="date"
         v-bind="{ ...$attrs, ...item }"
+        v-on="{...item.events}"
         v-model="model[item.name]"
         :label-position="item.labelPosition || labelPosition"
         :disabled="item.disabled || disabled"
@@ -76,6 +99,7 @@
         <template slot="input">
           <em-radio-group
             v-bind="{ ...$attrs, ...item }"
+        v-on="{...item.events}"
             v-model="model[item.name]"
             :disabled="item.disabled || disabled || item.readonly || readonly"
             :data="item.data"
@@ -96,6 +120,7 @@
         <template slot="input">
           <em-checkbox-group
             v-bind="{ ...$attrs, ...item }"
+        v-on="{...item.events}"
             v-model="model[item.name]"
             :disabled="item.disabled || disabled || item.readonly || readonly"
             @change="
@@ -116,6 +141,7 @@
           <em-switch
             v-bind="{ ...$attrs, ...item }"
             v-model="model[item.name]"
+        v-on="{...item.events}"
             :disabled="item.disabled || disabled || item.readonly || readonly"
             @change="
               value => {
@@ -130,6 +156,7 @@
         ref="selector"
         v-bind="{ ...$attrs, ...item }"
         v-model="model[item.name]"
+        v-on="{...item.events}"
         :label="item.label"
         :label-position="item.labelPosition || labelPosition"
         :disabled="item.disabled || disabled || item.readonly || readonly"
@@ -155,6 +182,7 @@
             !readonly &&
             item.form
         "
+        v-on="{...item.events}"
         @btn-click="handleBtnClick"
       />
       <!-- @btn-click="handleBtnClick($event,item)"
@@ -252,6 +280,9 @@ export default {
     // this.setBtnType()
   },
   methods: {
+    clickRightIcon(e){
+      console.log('点急急急急急急')
+    },
     handleFailed(values) {
       this.$refs.emFormTable.map(item => {
         item.validate();

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

@@ -1,7 +1,7 @@
 <template>
   <div class="selector-field">
     <em-input
-    :class="{'hide-label':hideLabel}"
+      :class="{ 'hide-label': hideLabel }"
       v-bind="$attrs"
       readonly
       clickable
@@ -40,11 +40,15 @@
           <div class="select-list" v-if="newSelectList.length > 0">
             <div v-for="(r, i) in newSelectList" :key="i" class="item">
               {{
-               r[labelKey] && r[labelKey].length > 10
+                r[labelKey] && r[labelKey].length > 10
                   ? r[labelKey].slice(0, 10) + '...'
                   : r[labelKey]
               }}
-              <div v-show="!disabled" class="delte" @click.stop="delteList(i, r)">
+              <div
+                v-show="!disabled"
+                class="delte"
+                @click.stop="delteList(i, r)"
+              >
                 <img
                   src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACoAAAAqCAYAAADFw8lbAAAAAXNSR0IArs4c6QAABXxJREFUWEfVWUtIHVcY/v7YjVGSaBpFTAQ3JooLpSg+qxSapF30kY2bVshakNgo1rcmPioxtQSyDqTdZJMmXbSaQtH6RClmEWJ0I8SEEK1PfGxqTvkOM8PM3JnrnauF+sMFvXPmzDff+c/3/+e7giMSckRw4kBAlVJ5AEoAvA/gOIDTxt98/78BrADYMf4eFZHpaImJCqhSqhBAPYDPAz74MYBeEZkIeF8wRpVS+QD6AJQGfZBr/AiAWhGZinSeiBhVSnFZmwwWYyKdfJ9xe2QXQJeIMD3Cxr5AlVJxAP4AQDZDYnd3FwsLC3j58iXevHmjP4yUlBT9SUtLQ3p6OmJjY/2AkNWPRGQ7HNKwQJVS8QCGAHxgn0Qphbdv3+LJkyeYnp7GixcvsLa25vmchIQEXLhwAXl5ebh48SKSk5MhEvLYvwCUi8iWH1hfoEopUkAmC+w3r6+vY3BwEA8ePMDr16+xt8cV3D9iYmKQmpqKiooKXLp0CadOnXLfNGkwu+s1mydQA+TvAIrtNy0uLqKvrw/j4+Mgq9EE2SwqKkJtbS3OnTvnnmIMwMciEgLWD2insXmsiV69eoX29nY8ffo0Gnwh9+Tk5Oj5zp49677GzdXs/jIEqCHi4wDeMwevrq6io6MDY2N84cOL4uJitLW1ITEx0T7pPwCK3MXBC+ifdp3c3NzEjRs3MDw8HPVy+24QEZSVlaG1tRUnTpywDxsRkQ/tXziAGhWHbOpgHnLT3L59+9BBms9gzl6/fl1vMpcakFWrgrmBPrKXRWpiVVWV1kh3xMXFaTaooZQnv83Fh1OeqKVcle3tULmk1t69e1frri0ei8gX1gvZ2GOD4Shp9+/f1xN4SRA18ebNm2D+dnd3Y2SEVTE0SktL0djYqPOwpaVFa687KF0kpLKy0n0p38xVi1GlVA2A782RW1tbqKur04LuFVlZWVqqkpKSsLS0hJ6eHoyOjlrMksmSkhI0NDRYYyhJz58/95yPBeHWrVuIj2eNseIbEennf3agDkl69uwZqqurwc3kFSYQsnXmzBksLy+jq6tLg2UQZFNTk3WNrNtfxD0nN9OdO3eQnZ1tv2RJlR0okV8zRw0MDKC5OUTOQjCbS0uwZJZgGQRJtvkC4VLDPmFnZycuX75s/+oHEeFKOxj9EcBX5qh79+7p/IwkCNZcYuYsgzlppoRf/rrnZp5evXrV/vVPIvK1G+ivAD4xR5GFhw8fRoJTj3GLdzRF4sqVK3rj2eI3Efn0yAI9Mkt/ZDaTQ55mZ2e1PPk1xIctT2ywKU+ZmZn7ypND8Hd2dlBfX4+JCe8D4/nz59Hf3x9I8GtqajA3N+e5QQsLC9Hb24vjx3k8s8JT8AOVUOodW78gJZQtHfXZHYFKKG9WSv0MwGoEwjUlLHX5+fn6ODI/Px+2KcnIyNDHkKmpKbA0u8OnKXkkIl+aY49mm2ew6miceZhj1+OXqxFXBJ+BzE12Ya7DXvjG2QDKXHUcRXioY5c/MzNzUFyO+3Nzc3V37zrkRXYUMcB2A2iwz8pc5K4ks9GeQK18EwGZpKowd13RIyKOOuooofbBhoVD44HsWrGysqLBDg0N4d27d1Gxe+zYMZSXl2uQp0/T/HMEm18aESEWTzgDglbOsNsl2djY0BJzEAOC0nby5Ek3SLolZX7WTiSWDo0Ih1tit3QmJye1iPMFvIKAWBwKCgrCWTp0SWg8BLd0zIf6uSbmdR7WeMCjQeFlktFg4MGOh0Gf8HVH7OP3dfOMzUUfignODXaYtmMPgG4vC8f9UhEBtbH7/zZy3W9nGBXfAvgs4Nb/BcB3/7k17gGYDPPHBupMuB8b+KMDf2yI2Ao/0NIHZO9QhwfK0UN9csDJ/gXzxuhJ8IbhCwAAAABJRU5ErkJggg=="
                 />
@@ -55,7 +59,9 @@
           <div v-else style="color:#c8c9cc">
             {{
               disabled
-                ?$attrs.placeholder?$attrs.placeholder : ' 暂无数据'
+                ? $attrs.placeholder
+                  ? $attrs.placeholder
+                  : ' 暂无数据'
                 : !$attrs.placeholder
                 ? '请选择' + $attrs.label
                 : $attrs.placeholder
@@ -77,33 +83,34 @@ export default {
     };
   },
   props: {
-    hideLabel:{
-      type:Boolean,
-      default:false
+    hideLabel: {
+      type: Boolean,
+      default: false
     },
     disabled: {
       type: Boolean,
       default: false
     },
+    readonly: { type: Boolean, default: false },
     selectDisabled: {
       type: Boolean,
       default: false
     },
     data: {
-      type: [Array,String],
+      type: [Array, String],
       default: () => []
     },
     nextUserList: {
       type: Array,
       default: () => []
     },
-    labelKey:{
+    labelKey: {
       type: String,
-      default:'showname'
+      default: 'showname'
     },
-    valueKey:{
+    valueKey: {
       type: String,
-      default:'showid'
+      default: 'showid'
     },
     multiple: { type: Boolean, default: true }
   },
@@ -111,10 +118,12 @@ export default {
   watch: {
     nextUserList: {
       handler(val) {
-        const _that = this
+        const _that = this;
         val.map(item => {
-          !item[_that.valueKey] && (item[_that.valueKey] = item.userId || item.userid);
-          !item[_that.labelKey] && (item[_that.labelKey] = item.username || item.userName);
+          !item[_that.valueKey] &&
+            (item[_that.valueKey] = item.userId || item.userid);
+          !item[_that.labelKey] &&
+            (item[_that.labelKey] = item.username || item.userName);
           item.name = item.username || item[_that.labelKey];
           item.value = item.userId || item[_that.valueKey];
         });
@@ -125,7 +134,7 @@ export default {
     },
     data: {
       handler(val) {
-         if(typeof val == 'string') return
+        if (typeof val == 'string') return;
         this.getDefault();
       },
       deep: true,
@@ -136,11 +145,13 @@ export default {
     handleClick() {},
     getDefault() {
       let selectArr = [];
-      const _that = this
+      const _that = this;
       if (this.multiple) {
         this.data.map(item => {
-          !item[_that.valueKey] && (item[_that.valueKey] = item.userId || item.userid);
-          !item[_that.labelKey] && (item[_that.labelKey] = item.username || item.userName);
+          !item[_that.valueKey] &&
+            (item[_that.valueKey] = item.userId || item.userid);
+          !item[_that.labelKey] &&
+            (item[_that.labelKey] = item.username || item.userName);
         });
         selectArr = this.newNextUserList.filter(
           x => x.checked && this.multiple
@@ -153,8 +164,10 @@ export default {
       } else {
         this.selectValue = '';
         this.data.map(item => {
-          !item[_that.valueKey] && (item[_that.valueKey] = item.userId || item.userid);
-          !item[_that.labelKey] && (item[_that.labelKey] = item.username || item.userName);
+          !item[_that.valueKey] &&
+            (item[_that.valueKey] = item.userId || item.userid);
+          !item[_that.labelKey] &&
+            (item[_that.labelKey] = item.username || item.userName);
           this.selectValue = item[_that.valueKey] || item.userId;
         });
 
@@ -189,8 +202,8 @@ export default {
         if (data.length > 0) this.newSelectList = data;
       }
 
-      this.$parent.$emit('change', {list:_this.newSelectList});
-      this.$emit('change',  {list:_this.newSelectList});
+      this.$parent.$emit('change', { list: _this.newSelectList });
+      this.$emit('change', { list: _this.newSelectList });
     },
     /**
      * clickTree
@@ -213,7 +226,7 @@ export default {
      */
     delteList(val, res) {
       if (this.disabled) return;
-      const _that = this
+      const _that = this;
       this.newSelectList.splice(val, 1);
       this.$set(res, 'checked', false);
       this.newNextUserList.map(x => {
@@ -222,7 +235,7 @@ export default {
         }
       });
       !this.multiple && (this.selectValue = '');
-      let info = {list:this.newSelectList}
+      let info = { list: this.newSelectList };
       this.$parent.$emit('change', info);
       this.$emit('change', info);
     }

package/src/index.js

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