eoss-mobiles 0.2.30 → 0.2.31

package/lib/picker.js

@@ -2039,7 +2039,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=f54ad734&
+// 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=6f8d4ed8&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -2311,7 +2311,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/picker/src/main.vue?vue&type=template&id=f54ad734&
+// CONCATENATED MODULE: ./packages/picker/src/main.vue?vue&type=template&id=6f8d4ed8&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(2);
@@ -2525,6 +2525,10 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
       type: String,
       default: 'name'
     },
+    objectType: {
+      type: Boolean,
+      default: true
+    },
     sysAppCode: {
       type: String,
       default: ''
@@ -2573,7 +2577,20 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
         return this.getValue();
       },
       set: function set(val) {
-        this.$emit('input', val);
+        var _this = this;
+
+        if (!this.objectType && val.length === undefined) {
+          this.$emit('input', val[this.sysAppCode ? 'cciValue' : this.valueKey]);
+        } else if (!this.objectType && val.length != undefined) {
+          val.map(function (x) {
+            if ((typeof x === 'undefined' ? 'undefined' : _typeof(x)) === 'object') {
+              x = x[_this.sysAppCode ? 'cciValue' : _this.valueKey];
+            }
+          });
+          this.$emit('input', val);
+        } else {
+          this.$emit('input', val);
+        }
       }
     }
   },
@@ -2621,7 +2638,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
     }
   },
   mounted: function mounted() {
-    var _this = this;
+    var _this2 = this;
 
     if ((this.sysAppCode || this.url) && this.newColumns.length == 0 && !this.isCheck) {
       this.getSysCode();
@@ -2636,7 +2653,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
     } else if (this.isCheck) {
       var _data = this.value;
       _data.map(function (item) {
-        _this.checkList.push(item[_this.valueKey] || item.value || item);
+        _this2.checkList.push(item[_this2.valueKey] || item.value || item);
       });
     }
   },
@@ -2677,13 +2694,13 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
       this.$refs.checkboxes[index].toggle();
     },
     onConfirm: function onConfirm(value, isConfirm) {
-      var _this2 = this;
+      var _this3 = this;
 
       if (isConfirm) {
         if (this.isCheck) {
           var data = [];
           this.newColumns.filter(function (x) {
-            _this2.checkList.find(function (y) {
+            _this3.checkList.find(function (y) {
               if (x.value === y) {
                 data.push(x);
               }
@@ -2697,7 +2714,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
         if (this.isCheck) {
           this.checkList = [];
           this.pickerValue.map(function (x) {
-            _this2.checkList.push(x.value);
+            _this3.checkList.push(x.value);
           });
         }
       }
@@ -2705,15 +2722,15 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
       this.showPicker = false;
     },
     getValue: function getValue() {
-      var _this3 = this;
+      var _this4 = this;
 
       var value = '';
       if (this.isCheck) {
         var val = [];
         if (this.newColumns && this.newColumns.length > 0) {
           this.newColumns.filter(function (x) {
-            _this3.value.find(function (y) {
-              if (x[_this3.valueKey] == y || x[_this3.valueKey] == y.value) {
+            _this4.value.find(function (y) {
+              if (x[_this4.valueKey] == y || x[_this4.valueKey] == y.value) {
                 val.push(x);
               }
             });
@@ -2731,7 +2748,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
             this.newColumns.map(function (x, i) {
               if (typeof x === 'string' && value.indexOf(x) != -1) {
                 index = i;
-              } else if (x[_this3.newValueKey] == value || x[_this3.newValueKey].indexOf(value) != -1) {
+              } else if (x[_this4.newValueKey] == value || x[_this4.newValueKey].indexOf(value) != -1) {
                 index = i;
               }
             });
@@ -2739,8 +2756,8 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
           } else {
             var list = [];
             this.value.map(function (item) {
-              if (item[_this3.labelKey] || item[_this3.newValueKey]) {
-                list.push(item[_this3.labelKey] || item[_this3.newValueKey]);
+              if (item[_this4.labelKey] || item[_this4.newValueKey]) {
+                list.push(item[_this4.labelKey] || item[_this4.newValueKey]);
               } else if (typeof item === 'string') {
                 list.push(item);
               }
@@ -2750,7 +2767,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
             this.newColumns.map(function (x, i) {
               if (typeof x === 'string' && value.indexOf(x) != -1) {
                 _index = i;
-              } else if (x[_this3.newValueKey] === value) {
+              } else if (x[_this4.newValueKey] === value) {
                 _index = i;
               }
             });
@@ -2763,9 +2780,9 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
             if (typeof x === 'string' && value.indexOf(x) != -1) {
               _index2 = i;
               value = x;
-            } else if (x[_this3.newValueKey] === value) {
+            } else if (x[_this4.newValueKey] === value) {
               _index2 = i;
-              value = x[_this3.labelKey] || x[_this3.newValueKey];
+              value = x[_this4.labelKey] || x[_this4.newValueKey];
             }
           });
           this.newDefaultIndex = _index2;
@@ -2775,7 +2792,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
       return value;
     },
     getSysCode: function getSysCode() {
-      var _this4 = this;
+      var _this5 = this;
 
       var url = this.url,
           method = this.method,
@@ -2798,45 +2815,45 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
             rCode = res.rCode,
             results = res.results;
 
-        _this4.listLoading = false;
+        _this5.listLoading = false;
         if (status == 'success' || rCode === 0 || status === true) {
-          var info = _this4.resultsName ? data ? data[_this4.resultsName] : results[_this4.resultsName] : data ? data : results;
+          var info = _this5.resultsName ? data ? data[_this5.resultsName] : results[_this5.resultsName] : data ? data : results;
           info.map(function (x) {
-            if (_this4.isCheck) {
-              x.name = x[sysAppCode ? 'shortName' : _this4.labelKey] && x[sysAppCode ? 'shortName' : _this4.labelKey].replace(/<[^>]+>/g, '');
+            if (_this5.isCheck) {
+              x.name = x[sysAppCode ? 'shortName' : _this5.labelKey] && x[sysAppCode ? 'shortName' : _this5.labelKey].replace(/<[^>]+>/g, '');
             } else {
-              x.name = x[sysAppCode ? 'shortName' : _this4.labelKey];
+              x.name = x[sysAppCode ? 'shortName' : _this5.labelKey];
             }
-            x.value = x[sysAppCode ? 'cciValue' : _this4.valueKey];
+            x.value = x[sysAppCode ? 'cciValue' : _this5.valueKey];
           });
           if (data && data.totalCount) {
-            _this4.total = data.totalCount;
-            if (data.totalCount === _this4.newColumns.length) {
-              _this4.listFinished = true;
+            _this5.total = data.totalCount;
+            if (data.totalCount === _this5.newColumns.length) {
+              _this5.listFinished = true;
             } else {
-              if (_this4.newColumns.length != 0) {
-                _this4.newColumns.push.apply(_this4.newColumns, info);
+              if (_this5.newColumns.length != 0) {
+                _this5.newColumns.push.apply(_this5.newColumns, info);
               } else {
-                _this4.newColumns = info;
+                _this5.newColumns = info;
               }
-              _this4.pageIndex = res.data.nextPageNo;
+              _this5.pageIndex = res.data.nextPageNo;
             }
           } else {
-            _this4.listFinished = true;
-            _this4.newColumns = info;
+            _this5.listFinished = true;
+            _this5.newColumns = info;
           }
-          if (_this4.beforResponse) {
-            _this4.newColumns = _this4.beforResponse(_this4.newColumns);
-            _this4.getValue();
+          if (_this5.beforResponse) {
+            _this5.newColumns = _this5.beforResponse(_this5.newColumns);
+            _this5.getValue();
           } else {
-            _this4.getValue();
+            _this5.getValue();
           }
         } else {
-          _this4.$toast(message);
+          _this5.$toast(message);
         }
-        _this4.newLoading = false;
+        _this5.newLoading = false;
       }).catch(function (err) {
-        _this4.$toast(err.message);
+        _this5.$toast(err.message);
       });
     },
     handlePicker: function handlePicker() {

package/package.json

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

package/packages/picker/src/main.vue

@@ -198,6 +198,10 @@ export default {
       type: String,
       default: 'name'
     },
+    objectType: {
+      type: Boolean,
+      default: true
+    },
     sysAppCode: {
       type: String,
       default: ''
@@ -244,7 +248,21 @@ export default {
         return this.getValue();
       },
       set(val) {
-        this.$emit('input', val);
+        if (!this.objectType && val.length === undefined) {
+          this.$emit(
+            'input',
+            val[this.sysAppCode ? 'cciValue' : this.valueKey]
+          );
+        } else if (!this.objectType && val.length != undefined) {
+          val.map(x => {
+            if (typeof x === 'object') {
+              x = x[this.sysAppCode ? 'cciValue' : this.valueKey];
+            }
+          });
+          this.$emit('input', val);
+        } else {
+          this.$emit('input', val);
+        }
       }
     }
   },
@@ -459,7 +477,7 @@ export default {
         .then(res => {
           const { status, data, message, rCode, results } = res;
           this.listLoading = false;
-          if (status == 'success' || rCode === 0|| status === true) {
+          if (status == 'success' || rCode === 0 || status === true) {
             let info = this.resultsName
               ? data
                 ? data[this.resultsName]

package/src/index.js

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