eoss-ui 0.4.10 → 0.4.14

package/lib/eoss-ui.common.js

@@ -533,7 +533,7 @@ var esEncode = function esEncode(value) {
  **/
 var esDecode = function esDecode(value) {
   var kleng = publicKey.length;
-  var result;
+  var result = void 0;
   var cat1 = void 0;
   var cat2 = void 0;
   var cat3 = void 0;
@@ -638,11 +638,13 @@ var exportXls = function exportXls(_ref6) {
       _ref6$data = _ref6.data,
       data = _ref6$data === undefined ? [] : _ref6$data,
       name = _ref6.name,
-      numbers = _ref6.numbers;
+      numbers = _ref6.numbers,
+      option = _ref6.option;
 
   var tbody = '';
   var aligns = [];
   var fields = [];
+  var keys = {};
   var others = {};
   var alink = document.createElement('a');
   for (var i = 0; i < thead.length; i++) {
@@ -652,12 +654,15 @@ var exportXls = function exportXls(_ref6) {
     }
     var tr = thead[i];
     var col = 0;
-    for (var _x = 0; _x < tr.length; _x++) {
-      var td = tr[_x];
+    for (var x = 0; x < tr.length; x++) {
+      var td = tr[x];
       if (td.property) {
-        if (col === _x) {
+        if (col === x) {
           fields.push(td.property);
           aligns.push(td.align);
+          if (td.labelKey && td.valueKey) {
+            keys[td.property] = { labelKey: td.labelKey, valueKey: td.valueKey, multiple: !!(td.valueToString || td['value-to-string']) };
+          }
         } else {
           others[String(col)] = [td.property, td.align];
         }
@@ -675,12 +680,72 @@ var exportXls = function exportXls(_ref6) {
     fields.splice(_i2, 0, others[_i2][0]);
     aligns.splice(_i2, 0, others[_i2][1]);
   }
-  for (var _i3 = 0; _i3 < data.length; _i3++) {
+
+  var _loop = function _loop(_i3) {
     tbody += '<tr>';
-    for (var x in fields) {
-      tbody += '<td align="' + aligns[x] + '">' + data[_i3][fields[x]] + '</td>';
+
+    var _loop2 = function _loop2(_x) {
+      var field = '';
+      var valueKey = keys[fields[_x]] && keys[fields[_x]].valueKey ? keys[fields[_x]].valueKey : 'value';
+      var labelKey = keys[fields[_x]] && keys[fields[_x]].labelKey ? keys[fields[_x]].labelKey : 'name';
+      if (option[fields[_x]]) {
+        if (Array.isArray(data[_i3][fields[_x]])) {
+          field = [];
+          data[_i3][fields[_x]].forEach(function (ele) {
+            option[fields[_x]].forEach(function (item) {
+              // eslint-disable-next-line eqeqeq
+              if (item[valueKey] == ele) {
+                field.push(item[labelKey]);
+                return;
+              }
+            });
+          });
+          field = field.join(' ');
+        } else if (typeof data[_i3][fields[_x]] === 'string' && keys[fields[_x]] && keys[fields[_x]].multiple) {
+          field = [];
+          data[_i3][fields[_x]].split(',').forEach(function (ele) {
+            option[fields[_x]].forEach(function (item) {
+              // eslint-disable-next-line eqeqeq
+              if (item[valueKey] == ele) {
+                field.push(item[labelKey]);
+                return;
+              }
+            });
+          });
+          field = field.join(' ');
+        } else {
+          option[fields[_x]].forEach(function (item) {
+            // eslint-disable-next-line eqeqeq
+            if (item[valueKey] == data[_i3][fields[_x]]) {
+              field = item[labelKey];
+              return;
+            }
+          });
+        }
+      } else if (_typeof(data[_i3][fields[_x]]) === 'object' && keys[fields[_x]]) {
+        if (Array.isArray(data[_i3][fields[_x]])) {
+          data[_i3][fields[_x]].forEach(function (item) {
+            field = [];
+            field.push({}.toString.call(item) === '[object Object]' ? item[labelKey] : item);
+          });
+          field = field.join(' ');
+        } else {
+          field = data[_i3][fields[_x]][labelKey];
+        }
+      } else {
+        field = data[_i3][fields[_x]];
+      }
+      tbody += '<td align="' + aligns[_x] + '">' + field + '</td>';
+    };
+
+    for (var _x in fields) {
+      _loop2(_x);
     }
     tbody += '</tr>';
+  };
+
+  for (var _i3 = 0; _i3 < data.length; _i3++) {
+    _loop(_i3);
   }
   if (!name) {
     name = 'table_' + new Date().getTime();
@@ -1429,10 +1494,27 @@ var isLogged = function isLogged(_ref8) {
               break;
             case 3:
               var href = res.results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(url));
-              if (open) {
-                win.open(href);
+              if (to.query.openType) {
+                switch (to.query.openType) {
+                  case 'self':
+                    win.location.href = href;
+                    break;
+                  case 'blank':
+                    win.open(href);
+                    break;
+                  case 'top':
+                    win.top.location.href = href;
+                    break;
+                  case 'parent':
+                    win.parent.location.href = href;
+                    break;
+                }
               } else {
-                win.top.location.href = href;
+                if (open) {
+                  win.open(href);
+                } else {
+                  win.top.location.href = href;
+                }
               }
               break;
           }
@@ -1444,9 +1526,9 @@ var isLogged = function isLogged(_ref8) {
           }
         }
       }).catch(function (e) {});
-    } else if (token || to.path === '/' || to.path === '/login' || to.path === '/404' || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1) {
-      if (redirect && to.name && (to.name === 'login' || to.name === 'main')) {
-        window.location.replace(urlJoinParams({ url: './' + to.name + '.html', param: to.query }));
+    } else if (token || to.path === '/' || to.path === '/404' || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
+      if (redirect && (to.path === '/main' || to.path === '/login')) {
+        window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
       } else {
         next();
       }
@@ -3638,6 +3720,124 @@ checkbox_group_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var checkbox_group = (checkbox_group_src_main);
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/ca-login/src/main.vue?vue&type=template&id=27153275&
+var mainvue_type_template_id_27153275_render = function () {
+  var _vm = this
+  var _h = _vm.$createElement
+  var _c = _vm._self._c || _h
+  return _c(
+    "span",
+    {
+      staticClass: "es-ca-login",
+      on: {
+        click: function ($event) {
+          $event.stopPropagation()
+          return _vm.handleClick($event)
+        },
+      },
+    },
+    [_vm._t("default", [_c("i", { staticClass: "es-icon-ca" })])],
+    2
+  )
+}
+var mainvue_type_template_id_27153275_staticRenderFns = []
+mainvue_type_template_id_27153275_render._withStripped = true
+
+
+// CONCATENATED MODULE: ./packages/ca-login/src/main.vue?vue&type=template&id=27153275&
+
+// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/ca-login/src/main.vue?vue&type=script&lang=js&
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+
+//import util from 'eoss-ui/src/utils/util';
+/* harmony default export */ var ca_login_src_mainvue_type_script_lang_js_ = ({
+  name: 'EsCaLogin',
+  props: {
+    type: String,
+    javaScript: Array,
+    exePath: String,
+    license: {
+      type: String,
+      default: 'MIIMRwYJKoZIhvcNAQcCoIIMODCCDDQCAQExDjAMBggqgRzPVQGDEQUAMIIHjAYJKoZIhvcNAQcBoIIHfQSCB3l7Iklzc3VlciI6IigoKC4qQ0495oiQ6YO95biC5Yqz5Yqo5L+d6Zqc5L+h5oGv5Lit5b+DQ0EuKil8KC4qT1U9Q2xhc3MgMiBFbnRlcnByaXNlIEluZGl2aWR1YWwgU3Vic2NyaWJlciBDQS4qKXwoLipPVT1UZXJtcyBvZiB1c2UgYXQgaHR0cHM6Ly93d3cuaXRydXMuY29tLmNuL2N0bnJwYSBcXChjXFwpMjAwOC4qKXwoLipPVT1DaGluYSBUcnVzdCBOZXR3b3JrLiopfCguKk895Zub5bed55yB5pWw5a2X6K+B5Lmm6K6k6K+B566h55CG5Lit5b+D5pyJ6ZmQ5YWs5Y+4LiopfCguKkM9Q04uKikpezZ9fCgoLipDTj1DREhSU1MgQ0EuKil8KC4qT1U9Q0RIUlNTIENBLiopfCguKk89U2ljaHVhbiBEaWdpdGFsIENlcnRpZmljYXRlIEF1dGhvcml0eSBNYW5hZ2VtZW50IENlbnRlci4qKXwoLipDPUNOLiopKXs0fXwoKC4qQ049U0NFQiBDQS4qKXwoLipPVT1TQ0VCIENBLiopfCguKk895Zub5bed55yB5pWw5a2X6K+B5Lmm6K6k6K+B566h55CG5Lit5b+D5pyJ6ZmQ5YWs5Y+4LiopfCguKkM9Q04uKikpezR9fCgoLipDTj1TQ0VCIENBLiopfCguKk9VPVNNMiBDZXJ0aWZpY2F0ZSBTeXN0ZW0uKil8KC4qTz1TaWNodWFuIERpZ2l0YWwgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IE1hbmFnZW1lbnQgQ2VudGVyLiopfCguKkM9Q04uKikpezR9fCgoLipDTj1TQ0VCIENBLiopfCguKk9VPVNDRUIgQ0EuKil8KC4qTz1TaWNodWFuIERpZ2l0YWwgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IE1hbmFnZW1lbnQgQ2VudGVyLiopfCguKkM9Q04uKikpezR9fCgoLipDTj1TQ0VHIENBLiopfCguKk9VPUNsYXNzIDIgRW50ZXJwcmlzZSBJbmRpdmlkdWFsIFN1YnNjcmliZXIgQ0EuKil8KC4qT1U9VGVybXMgb2YgdXNlIGF0IGh0dHBzOi8vd3d3Lml0cnVzLmNvbS5jbi9jdG5ycGEgXFwoY1xcKTIwMDguKil8KC4qT1U9Q2hpbmEgVHJ1c3QgTmV0d29yay4qKXwoLipPPeWbm+W3neecgeaVsOWtl+ivgeS5puiupOivgeeuoeeQhuS4reW/g+aciemZkOWFrOWPuC4qKXwoLipDPUNOLiopKXs2fXwoKC4qQ049U0NFRyBDQS4qKXwoLipPVT1TTTIgQ2VydGlmaWNhdGUgU3lzdGVtLiopfCguKk89U2ljaHVhbiBEaWdpdGFsIENlcnRpZmljYXRlIEF1dGhvcml0eSBNYW5hZ2VtZW50IENlbnRlci4qKXwoLipDPUNOLiopKXs0fXwoKC4qQ049U0NFRyBDQS4qKXwoLipPVT1TQ0VHIENBLiopfCguKk89U2ljaHVhbiBEaWdpdGFsIENlcnRpZmljYXRlIEF1dGhvcml0eSBNYW5hZ2VtZW50IENlbnRlci4qKXwoLipDPUNOLiopKXs0fXwoKC4qQ049U0NFR0IgQ0EuKil8KE9VPS4qQ2xhc3MgMiBFbnRlcnByaXNlIEluZGl2aWR1YWwgU3Vic2NyaWJlciBDQS4qKXwoLipPVT1UZXJtcyBvZiB1c2UgYXQgaHR0cHM6Ly93d3cuaXRydXMuY29tLmNuL2N0bnJwYSBcXChjXFwpMjAwOC4qKXwoLipPVT1DaGluYSBUcnVzdCBOZXR3b3JrLiopfCguKk895Zub5bed55yB5pWw5a2X6K+B5Lmm6K6k6K+B566h55CG5Lit5b+D5pyJ6ZmQ5YWs5Y+4LiopfCguKkM9Q04uKikpezZ9fCgoLipDTj1TQ0VHQiBDQSBTTTIuKil8KC4qT1U9U00yVEVTVC4qKXwoLipPPVNDQ0EuKil8KC4qQz1DTi4qKSl7NH18KCguKkNOPVNDRUdCIENBLiopfCguKk9VPVNNMiBDZXJ0aWZpY2F0ZSBTeXN0ZW0uKil8KC4qTz1TaWNodWFuIERpZ2l0YWwgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IE1hbmFnZW1lbnQgQ2VudGVyLiopfCguKkM9Q04uKikpezR9fCgoLipDTj1TQ0VHQiBDQS4qKXwoLipPVT1TQ0VHQiBDQS4qKXwoLipPPVNpY2h1YW4gRGlnaXRhbCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgTWFuYWdlbWVudCBDZW50ZXIuKil8KC4qQz1DTi4qKSl7NH0pIiwidmVyc2lvbiI6IjEuMC4wLjEiLCJzb2Z0VmVyc2lvbiI6IjMuMS4wLjAiLCJub3RhZnRlciI6IjIwMzctMDgtMjQiLCJub3RiZWZvcmUiOiIyMDE3LTA4LTIzIiwibm9BbGVydCI6InRydWUifaCCA0QwggNAMIIC5aADAgECAhRfJZzazIK7fvMFswB7i47Jvfm18jAMBggqgRzPVQGDdQUAMFUxJjAkBgNVBAMMHeWkqeivmuWuieS/oea1i+ivlVNNMueUqOaIt0NBMQ4wDAYDVQQLDAVUT1BDQTEOMAwGA1UECgwFVE9QQ0ExCzAJBgNVBAYTAkNOMB4XDTE0MDkyNjA3NDYwOFoXDTE1MDkyNjA3NDYwOFowMTEYMBYGA1UEAwwPU2lnbkVTQTIwMTQwOTI3MRUwEwYDVQQKDAzlpKnor5rlronkv6EwWTATBgcqhkjOPQIBBggqgRzPVQGCLQNCAASWFnhS5iMvZk7nfmotCwXi6MYYJzuh3EBm7EIZeH73ic6FcdAss7f8b1mOcu5d6gMHefQGyPiJuhbZf8ADkoWJo4IBszCCAa8wCQYDVR0TBAIwADALBgNVHQ8EBAMCBsAwgYoGCCsGAQUFBwEBBH4wfDB6BggrBgEFBQcwAoZuaHR0cDovL1lvdXJfU2VydmVyX05hbWU6UG9ydC9Ub3BDQS91c2VyRW5yb2xsL2NhQ2VydD9jZXJ0U2VyaWFsTnVtYmVyPTVBNDdFQ0YxMDU4MDRBNUM2QTVCMjI5MjlCNzVERjBERkJDMEQ3OTYwVwYDVR0uBFAwTjBMoEqgSIZGUG9ydC9Ub3BDQS9wdWJsaWMvaXRydXNjcmw/Q0E9NUE0N0VDRjEwNTgwNEE1QzZBNUIyMjkyOUI3NURGMERGQkMwRDc5NjBvBgNVHR8EaDBmMGSgYqBghl5odHRwOi8vWW91cl9TZXJ2ZXJfTmFtZTpQb3J0L1RvcENBL3B1YmxpYy9pdHJ1c2NybD9DQT01QTQ3RUNGMTA1ODA0QTVDNkE1QjIyOTI5Qjc1REYwREZCQzBENzk2MB8GA1UdIwQYMBaAFD2JxkfLcYWw2TvWSLCJ2ef+79rZMB0GA1UdDgQWBBRLO+1/h4KGh6ASkrEu5gAl2LURADAMBggqgRzPVQGDdQUAA0cAMEQCIL201xfMjR+Y7Gxuq+1y+SxLqSXfJfMfWpM/K4TuV2GCAiDoPocZ+ReODefsGqhvtQ27OpvcYiA/N1ZB55qbXTKEezGCAUUwggFBAgEBMG0wVTEmMCQGA1UEAwwd5aSp6K+a5a6J5L+h5rWL6K+VU00y55So5oi3Q0ExDjAMBgNVBAsMBVRPUENBMQ4wDAYDVQQKDAVUT1BDQTELMAkGA1UEBhMCQ04CFF8lnNrMgrt+8wWzAHuLjsm9+bXyMAwGCCqBHM9VAYMRBQCgaTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0xNTA1MDExNzIwNTJaMC8GCSqGSIb3DQEJBDEiBCDs2pV1a3ksLnX9zKPnhTuhyReuILoHJ71xo6Thv8PQ4zAMBggqgRzPVQGCLQUABEYwRAIgZ5y2C6hiI4RdMtcVEWcVh0qPhp0rBpdTYIGqBfZlvIwCIFQD0G7u4dK0k0UAnTs3WVNrVfRKE7JLcLprZ+787v91'
+    }
+  },
+  computed: {
+    path: function path() {
+      if (this.exePath) {
+        return this.exePath;
+      }
+      if (this.type === 'SICHUAN' || this.type === 'sichuan') {
+        return 'https://cdn.scca.com.cn/Files/证书助手（i信）.rar';
+      }
+    }
+  },
+  watch: {},
+  data: function data() {
+    return {};
+  },
+  created: function created() {
+    // if (this.type === 'SICHUAN' || this.type === 'sichuan') {
+    //   loadJs();
+    // }
+  },
+  mounted: function mounted() {},
+
+  methods: {
+    handleClick: function handleClick() {
+      if (this.type === 'SICHUAN' || this.type === 'sichuan') {
+        var config = {
+          license: this.license,
+          exepath: this.path,
+          disableExeUrl: true
+        };
+      }
+    }
+  }
+});
+// CONCATENATED MODULE: ./packages/ca-login/src/main.vue?vue&type=script&lang=js&
+ /* harmony default export */ var packages_ca_login_src_mainvue_type_script_lang_js_ = (ca_login_src_mainvue_type_script_lang_js_); 
+// CONCATENATED MODULE: ./packages/ca-login/src/main.vue
+
+
+
+
+
+/* normalize component */
+
+var ca_login_src_main_component = normalizeComponent(
+  packages_ca_login_src_mainvue_type_script_lang_js_,
+  mainvue_type_template_id_27153275_render,
+  mainvue_type_template_id_27153275_staticRenderFns,
+  false,
+  null,
+  null,
+  null
+  
+)
+
+/* harmony default export */ var ca_login_src_main = (ca_login_src_main_component.exports);
+// CONCATENATED MODULE: ./packages/ca-login/index.js
+
+
+ca_login_src_main.install = function (Vue) {
+  return Vue.component(ca_login_src_main.name, ca_login_src_main);
+};
+
+/* harmony default export */ var ca_login = (ca_login_src_main);
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/card/src/main.vue?vue&type=template&id=46ef4fcd&
 var mainvue_type_template_id_46ef4fcd_render = function () {
   var _vm = this
@@ -4365,8 +4565,8 @@ clients_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var clients = (clients_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=template&id=97c4c582&
-var mainvue_type_template_id_97c4c582_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=template&id=154b78e2&
+var mainvue_type_template_id_154b78e2_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4698,11 +4898,11 @@ var mainvue_type_template_id_97c4c582_render = function () {
     1
   )
 }
-var mainvue_type_template_id_97c4c582_staticRenderFns = []
-mainvue_type_template_id_97c4c582_render._withStripped = true
+var mainvue_type_template_id_154b78e2_staticRenderFns = []
+mainvue_type_template_id_154b78e2_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=97c4c582&
+// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=154b78e2&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/children.vue?vue&type=template&id=796433ee&
 var childrenvue_type_template_id_796433ee_render = function () {
@@ -4752,8 +4952,8 @@ childrenvue_type_template_id_796433ee_render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/data-table/src/children.vue?vue&type=template&id=796433ee&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/column.vue?vue&type=template&id=177bef1c&
-var columnvue_type_template_id_177bef1c_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/column.vue?vue&type=template&id=1f31fcc6&
+var columnvue_type_template_id_1f31fcc6_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4770,6 +4970,8 @@ var columnvue_type_template_id_177bef1c_render = function () {
         attrs: {
           "filter-icon": _vm.filterIcon,
           label: _vm.item.title || _vm.item.label,
+          "label-key": _vm.item.labelKey,
+          "value-key": _vm.item.valueKey,
           prop: _vm.item.field || _vm.item.prop,
           fixed: _vm.item.fixed,
           sortable: _vm.item.sortable || _vm.item.sort,
@@ -5645,6 +5847,8 @@ var columnvue_type_template_id_177bef1c_render = function () {
           attrs: {
             "filter-icon": _vm.filterIcon,
             label: _vm.item.title || _vm.item.label,
+            "label-key": _vm.item.labelKey,
+            "value-key": _vm.item.valueKey,
             prop: _vm.item.field || _vm.item.prop,
             fixed: _vm.item.fixed,
             sortable: _vm.item.sortable || _vm.item.sort,
@@ -5709,11 +5913,11 @@ var columnvue_type_template_id_177bef1c_render = function () {
         2
       )
 }
-var columnvue_type_template_id_177bef1c_staticRenderFns = []
-columnvue_type_template_id_177bef1c_render._withStripped = true
+var columnvue_type_template_id_1f31fcc6_staticRenderFns = []
+columnvue_type_template_id_1f31fcc6_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=177bef1c&
+// CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=1f31fcc6&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(2);
@@ -6274,6 +6478,10 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 //
 //
 //
+//
+//
+//
+//
 
 
 
@@ -6474,8 +6682,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       var data = col.data ? col.data : col.optionData ? rows[col.optionData] : this.optionDatas[field];
       if (utils_util["a" /* default */].isObject(rows[field])) {
         return rows[field][col.labelKey] || rows[field]['name'] || rows[field]['label'] || rows[field]['shortName'];
-      }
-      if (Array.isArray(rows[field])) {
+      } else if (Array.isArray(rows[field])) {
         var vals = rows[field].map(function (item) {
           if (utils_util["a" /* default */].isObject(item)) {
             return item[col.labelKey] || item['name'] || item['label'] || item['shortName'];
@@ -6487,12 +6694,22 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
           }
         });
         return vals.join(col.symbol ? col.symbol : '-');
+      } else {
+        if (col.valueToString || col['value-to-string']) {
+          var _vals = rows[field].split(',').map(function (item) {
+            if (data && data.length && utils_util["a" /* default */].isObject(data[0])) {
+              return _this2.getLabel(data, item, col);
+            }
+            return item;
+          });
+          return _vals.join(col.symbol ? col.symbol : '-');
+        } else {
+          if (data && data.length && utils_util["a" /* default */].isObject(data[0])) {
+            return this.getLabel(data, rows[field], col);
+          }
+          return rows[field];
+        }
       }
-
-      if (data && data.length && utils_util["a" /* default */].isObject(data[0])) {
-        return this.getLabel(data, rows[field], col);
-      }
-      return rows[field];
     },
     getLabel: function getLabel(obj, val, col) {
       for (var i = 0; i < obj.length; i++) {
@@ -6596,8 +6813,8 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 
 var column_component = normalizeComponent(
   src_columnvue_type_script_lang_js_,
-  columnvue_type_template_id_177bef1c_render,
-  columnvue_type_template_id_177bef1c_staticRenderFns,
+  columnvue_type_template_id_1f31fcc6_render,
+  columnvue_type_template_id_1f31fcc6_staticRenderFns,
   false,
   null,
   null,
@@ -7932,7 +8149,8 @@ var mainvue_type_script_lang_js_components;
           utils_util["a" /* default */].exportXls({
             thead: thead,
             data: this.datas,
-            name: this.fileName
+            name: this.fileName,
+            option: this.optionDatas
           });
         }
         this.$emit('btnClick', res, this.datas, thead, rows);
@@ -8100,8 +8318,8 @@ var mainvue_type_script_lang_js_components;
 
 var data_table_src_main_component = normalizeComponent(
   packages_data_table_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_97c4c582_render,
-  mainvue_type_template_id_97c4c582_staticRenderFns,
+  mainvue_type_template_id_154b78e2_render,
+  mainvue_type_template_id_154b78e2_staticRenderFns,
   false,
   null,
   null,
@@ -10796,8 +11014,8 @@ error_page_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var error_page = (error_page_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/main.vue?vue&type=template&id=7542ec09&
-var mainvue_type_template_id_7542ec09_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/main.vue?vue&type=template&id=79406044&
+var mainvue_type_template_id_79406044_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -19341,11 +19559,11 @@ var mainvue_type_template_id_7542ec09_render = function () {
     2
   )
 }
-var mainvue_type_template_id_7542ec09_staticRenderFns = []
-mainvue_type_template_id_7542ec09_render._withStripped = true
+var mainvue_type_template_id_79406044_staticRenderFns = []
+mainvue_type_template_id_79406044_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=7542ec09&
+// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=79406044&
 
 // CONCATENATED MODULE: ./src/utils/rules.js
 // 手机号
@@ -22700,10 +22918,7 @@ function src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return function
   },
   props: {
     model: {
-      type: [Object, String],
-      default: function _default() {
-        return {};
-      }
+      type: [Object, String]
     },
     steps: Object,
     param: {
@@ -22855,6 +23070,14 @@ function src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return function
     models: {
       get: function get() {
         if (this.model && typeof this.model !== 'string') {
+          if (this.autoId && !this.businessId) {
+            if (this.model[typeof this.autoId === 'string' ? this.autoId : 'id']) {
+              this.$emit('update:businessId', this.model[typeof this.autoId === 'string' ? this.autoId : 'id']);
+            } else {
+              this.$emit('update:businessId', this.uuid);
+              this.$emit('getId', this.uuid);
+            }
+          }
           return this.model;
         }
         return this.values;
@@ -22866,14 +23089,12 @@ function src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return function
     _value: function _value() {
       var data = {};
       if (this.businessId !== undefined) {
-        data = { id: this.businessId };
+        data[typeof this.autoId === 'string' ? this.autoId : 'id'] = this.businessId;
       } else if (typeof this.model !== 'string' && this.autoId) {
         if (typeof this.autoId === 'boolean' && !this.model.id) {
           data = { id: this.uuid };
-          this.$emit('update:businessId', this.uuid);
         } else if (!this.model[this.autoId]) {
           data[this.autoId] = this.uuid;
-          this.$emit('update:businessId', this.uuid);
         }
       }
       return utils_util["a" /* default */].extend({}, data, this.value);
@@ -23764,8 +23985,8 @@ function src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return function
 
 var form_src_main_component = normalizeComponent(
   packages_form_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_7542ec09_render,
-  mainvue_type_template_id_7542ec09_staticRenderFns,
+  mainvue_type_template_id_79406044_render,
+  mainvue_type_template_id_79406044_staticRenderFns,
   false,
   null,
   null,
@@ -65428,7 +65649,8 @@ wxlogin_src_main.install = function (Vue) {
 
 
 
-var components = [packages_button, button_group, checkbox_group, card, cascader, clients, data_table, data_table_form, date_picker, packages_dialog, enterprise, error_page, packages_form, packages_flow, flow_group, flow_list, handle_user, packages_handler, packages_input, input_number, packages_label, login, packages_main, mainComp, menu, nav, packages_notify, pagination, packages_page, player, qr_code, radio_group, packages_select, select_ganged, selector, selector_panel, packages_sizer, steps, packages_switch, packages_tabs, tabs_panel, tips, packages_tree, tree_group, packages_toolbar, table_form, upload, wujie, wxlogin];
+
+var components = [packages_button, button_group, checkbox_group, ca_login, card, cascader, clients, data_table, data_table_form, date_picker, packages_dialog, enterprise, error_page, packages_form, packages_flow, flow_group, flow_list, handle_user, packages_handler, packages_input, input_number, packages_label, login, packages_main, mainComp, menu, nav, packages_notify, pagination, packages_page, player, qr_code, radio_group, packages_select, select_ganged, selector, selector_panel, packages_sizer, steps, packages_switch, packages_tabs, tabs_panel, tips, packages_tree, tree_group, packages_toolbar, table_form, upload, wujie, wxlogin];
 
 var install = function install(Vue) {
   var opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -65443,11 +65665,12 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.4.10',
+  version: '0.4.14',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,
   CheckboxGroup: checkbox_group,
+  CaLogin: ca_login,
   Card: card,
   Cascader: cascader,
   Clients: clients,

package/lib/error-page.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 39);
+/******/ 	return __webpack_require__(__webpack_require__.s = 40);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -192,7 +192,7 @@ function normalizeComponent(
 
 /***/ }),
 
-/***/ 39:
+/***/ 40:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";