eoss-ui 0.4.10 → 0.4.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.4.10",
+  "version": "0.4.14",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [
@@ -91,7 +91,7 @@
     "cp-cli": "^1.0.2",
     "cross-env": "^3.1.3",
     "css-loader": "^2.1.0",
-    "eoss-element": "^0.2.39",
+    "eoss-element": "^0.2.40",
     "es6-promise": "^4.0.5",
     "eslint": "4.18.2",
     "eslint-config-elemefe": "0.1.1",

package/packages/ca-login/index.js

@@ -0,0 +1,5 @@
+import EsCaLogin from './src/main';
+
+EsCaLogin.install = Vue => Vue.component(EsCaLogin.name, EsCaLogin);
+
+export default EsCaLogin;

package/packages/ca-login/src/main.vue

@@ -0,0 +1,62 @@
+<template>
+  <span class="es-ca-login" @click.stop="handleClick">
+    <slot>
+      <i class="es-icon-ca"></i>
+    </slot>
+    <!-- <es-dialog
+      title="CA登录"
+      width="80%"
+      height="80%"
+      custom-class="es-clients-dialog"
+      :visible.sync="showDownLoadApp"
+      ><es-clients v-bind="download"></es-clients>
+    </es-dialog> -->
+  </span>
+</template>
+<script>
+//import util from 'eoss-ui/src/utils/util';
+export default {
+  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() {
+      if (this.exePath) {
+        return this.exePath;
+      }
+      if (this.type === 'SICHUAN' || this.type === 'sichuan') {
+        return 'https://cdn.scca.com.cn/Files/证书助手（i信）.rar';
+      }
+    }
+  },
+  watch: {},
+  data() {
+    return {};
+  },
+  created() {
+    // if (this.type === 'SICHUAN' || this.type === 'sichuan') {
+    //   loadJs();
+    // }
+  },
+  mounted() {},
+  methods: {
+    handleClick() {
+      if (this.type === 'SICHUAN' || this.type === 'sichuan') {
+        let config = {
+          license: this.license,
+          exepath: this.path,
+          disableExeUrl: true
+        };
+      }
+    }
+  }
+};
+</script>

package/packages/data-table/src/column.vue

@@ -4,6 +4,8 @@
     v-show="!item.hide"
     :filter-icon="filterIcon"
     :label="item.title || item.label"
+    :label-key="item.labelKey"
+    :value-key="item.valueKey"
     :prop="item.field || item.prop"
     :fixed="item.fixed"
     :sortable="item.sortable || item.sort"
@@ -489,6 +491,8 @@
     :key="index"
     :filter-icon="filterIcon"
     :label="item.title || item.label"
+    :label-key="item.labelKey"
+    :value-key="item.valueKey"
     :prop="item.field || item.prop"
     :fixed="item.fixed"
     :sortable="item.sortable || item.sort"
@@ -726,8 +730,7 @@ export default {
           rows[field]['label'] ||
           rows[field]['shortName']
         );
-      }
-      if (Array.isArray(rows[field])) {
+      } else if (Array.isArray(rows[field])) {
         const vals = rows[field].map(item => {
           if (util.isObject(item)) {
             return (
@@ -744,12 +747,22 @@ export default {
           }
         });
         return vals.join(col.symbol ? col.symbol : '-');
+      } else {
+        if (col.valueToString || col['value-to-string']) {
+          const vals = rows[field].split(',').map(item => {
+            if (data && data.length && util.isObject(data[0])) {
+              return this.getLabel(data, item, col);
+            }
+            return item;
+          });
+          return vals.join(col.symbol ? col.symbol : '-');
+        } else {
+          if (data && data.length && util.isObject(data[0])) {
+            return this.getLabel(data, rows[field], col);
+          }
+          return rows[field];
+        }
       }
-
-      if (data && data.length && util.isObject(data[0])) {
-        return this.getLabel(data, rows[field], col);
-      }
-      return rows[field];
     },
     getLabel(obj, val, col) {
       for (let i = 0; i < obj.length; i++) {

package/packages/data-table/src/main.vue

@@ -1064,7 +1064,8 @@ export default {
           util.exportXls({
             thead: thead,
             data: this.datas,
-            name: this.fileName
+            name: this.fileName,
+            option: this.optionDatas
           });
         }
         this.$emit('btnClick', res, this.datas, thead, rows);

package/packages/form/src/main.vue

@@ -3322,10 +3322,7 @@ export default {
   },
   props: {
     model: {
-      type: [Object, String],
-      default: () => {
-        return {};
-      }
+      type: [Object, String]
     },
     steps: Object,
     param: {
@@ -3476,6 +3473,19 @@ export default {
     models: {
       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;
@@ -3487,14 +3497,14 @@ export default {
     _value() {
       let 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 util.extend({}, data, this.value);

package/packages/theme-chalk/lib/ca-login.css

@@ -0,0 +1 @@
+@charset "UTF-8";.es-ca-login{cursor:pointer}