eoss-mobiles 0.2.19 → 0.2.20

package/lib/picker.js

@@ -2027,7 +2027,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=ddf89e2e&
+// 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&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -2299,7 +2299,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/picker/src/main.vue?vue&type=template&id=ddf89e2e&
+// CONCATENATED MODULE: ./packages/picker/src/main.vue?vue&type=template&id=f54ad734&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(2);
@@ -2432,6 +2432,8 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
 //
 //
 //
+//
+//
 
 
 
@@ -2780,20 +2782,22 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
       Object(http["a" /* default */])(params).then(function (res) {
         var status = res.status,
             data = res.data,
-            message = res.message;
+            message = res.message,
+            rCode = res.rCode,
+            results = res.results;
 
         _this4.listLoading = false;
-        if (status == 'success') {
-          var info = _this4.resultsName ? data[_this4.resultsName] : data;
+        if (status == 'success' || rCode === 0 || status === true) {
+          var info = _this4.resultsName ? data ? data[_this4.resultsName] : results[_this4.resultsName] : data ? data : results;
           info.map(function (x) {
             if (_this4.isCheck) {
-              x.name = x[_this4.labelKey != 'name' && _this4.labelKey || 'shortName'] && x[_this4.labelKey != 'name' && _this4.labelKey || 'shortName'].replace(/<[^>]+>/g, '');
+              x.name = x[sysAppCode ? 'shortName' : _this4.labelKey] && x[sysAppCode ? 'shortName' : _this4.labelKey].replace(/<[^>]+>/g, '');
             } else {
-              x.name = x[_this4.labelKey != 'name' && _this4.labelKey || 'shortName'];
+              x.name = x[sysAppCode ? 'shortName' : _this4.labelKey];
             }
-            x.value = x[_this4.valueKey != 'value' && _this4.valueKey || 'cciValue'];
+            x.value = x[sysAppCode ? 'cciValue' : _this4.valueKey];
           });
-          if (data.totalCount) {
+          if (data && data.totalCount) {
             _this4.total = data.totalCount;
             if (data.totalCount === _this4.newColumns.length) {
               _this4.listFinished = true;
@@ -2809,7 +2813,6 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
             _this4.listFinished = true;
             _this4.newColumns = info;
           }
-          if (_this4.isTable) _this4.$emit('tableColumns', _this4.newColumns);
           if (_this4.beforResponse) {
             _this4.newColumns = _this4.beforResponse(_this4.newColumns);
             _this4.getValue();

package/lib/radio.js

@@ -2026,7 +2026,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/radio/src/main.vue?vue&type=template&id=99c78332&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/radio/src/main.vue?vue&type=template&id=2145df10&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -2068,7 +2068,9 @@ var render = function () {
               false
             ),
             [
-              _vm._v("\n      " + _vm._s(item[_vm.labelKey]) + "\n      "),
+              _c("span", {
+                domProps: { innerHTML: _vm._s(item[_vm.labelKey]) },
+              }),
               _vm._t("default", null, {
                 slot: "icon",
                 checked: item[_vm.valueKey] == _vm.newRadio,
@@ -2087,7 +2089,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/radio/src/main.vue?vue&type=template&id=99c78332&
+// CONCATENATED MODULE: ./packages/radio/src/main.vue?vue&type=template&id=2145df10&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(2);
@@ -2191,7 +2193,11 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       type: Boolean,
       default: false
     },
-    baseUrl: String
+    baseUrl: String,
+    allowHtml: {
+      type: Boolean,
+      default: false
+    }
   },
   computed: {
     newRadio: {
@@ -2206,6 +2212,11 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
   watch: {
     data: {
       handler: function handler(val) {
+        var _this = this;
+
+        val.map(function (item) {
+          item[_this.labelKey] = _this.allowHtml ? item[_this.labelKey] : item[_this.labelKey].replace(/<[^>]+>/g, '');
+        });
         this.newData = val;
       },
 
@@ -2230,7 +2241,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
     //   this.$emit('change', val);
     // },
     getSysCode: function getSysCode() {
-      var _this = this;
+      var _this2 = this;
 
       var url = this.url,
           method = this.method,
@@ -2247,20 +2258,21 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       Object(http["a" /* default */])(params).then(function (res) {
         var status = res.status,
             data = res.data,
-            message = res.message;
-
-        if (status == 'success') {
-          data.map(function (item) {
-            item.name = item.shortName;
-            item.value = item.cciValue;
+            message = res.message,
+            rCode = res.rCode,
+            results = res.results;
+
+        if (status == 'success' || rCode === 0 || status === true) {
+          [].concat(data || results).map(function (item) {
+            item.name = _this2.allowHtml ? item[sysAppCode ? 'shortName' : _this2.labelKey] : item[sysAppCode ? 'shortName' : _this2.labelKey].replace(/<[^>]+>/g, '');
+            item.value = item[sysAppCode ? 'cciValue' : _this2.value];
           });
-          _this.newData = data;
-          if (_this.isTable) _this.$emit('tableColumns', _this.newData);
+          _this2.newData = data || results;
         } else {
-          _this.$toast(message);
+          _this2.$toast(message);
         }
       }).catch(function (err) {
-        _this.$toast(err.message);
+        _this2.$toast(err.message);
       });
     }
   }