eoss-mobiles 0.2.14 → 0.2.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -101,19 +101,19 @@ module.exports = require("element-ui");
101
101
  /* 2 */
102
102
  /***/ (function(module, exports) {
103
103
 
104
- module.exports = require("qs");
104
+ module.exports = require("@eoss-design/color");
105
105
 
106
106
  /***/ }),
107
107
  /* 3 */
108
108
  /***/ (function(module, exports) {
109
109
 
110
- module.exports = require("@eoss-design/color");
110
+ module.exports = require("axios");
111
111
 
112
112
  /***/ }),
113
113
  /* 4 */
114
114
  /***/ (function(module, exports) {
115
115
 
116
- module.exports = require("axios");
116
+ module.exports = require("qs");
117
117
 
118
118
  /***/ }),
119
119
  /* 5 */
@@ -728,8 +728,8 @@ mainvue_type_template_id_73ff2f1c_render._withStripped = true
728
728
 
729
729
  // CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=73ff2f1c&
730
730
 
731
- // 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-tree.vue?vue&type=template&id=5d47b9aa&
732
- var selector_treevue_type_template_id_5d47b9aa_render = function () {
731
+ // 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-tree.vue?vue&type=template&id=328ffb6a&
732
+ var selector_treevue_type_template_id_328ffb6a_render = function () {
733
733
  var _vm = this
734
734
  var _h = _vm.$createElement
735
735
  var _c = _vm._self._c || _h
@@ -893,14 +893,14 @@ var selector_treevue_type_template_id_5d47b9aa_render = function () {
893
893
  1
894
894
  )
895
895
  }
896
- var selector_treevue_type_template_id_5d47b9aa_staticRenderFns = []
897
- selector_treevue_type_template_id_5d47b9aa_render._withStripped = true
896
+ var selector_treevue_type_template_id_328ffb6a_staticRenderFns = []
897
+ selector_treevue_type_template_id_328ffb6a_render._withStripped = true
898
898
 
899
899
 
900
- // CONCATENATED MODULE: ./packages/selector/src/selector-tree.vue?vue&type=template&id=5d47b9aa&
900
+ // CONCATENATED MODULE: ./packages/selector/src/selector-tree.vue?vue&type=template&id=328ffb6a&
901
901
 
902
- // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/tree.vue?vue&type=template&id=bacc904e&
903
- var treevue_type_template_id_bacc904e_render = function () {
902
+ // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/tree.vue?vue&type=template&id=491fd81b&
903
+ var treevue_type_template_id_491fd81b_render = function () {
904
904
  var _vm = this
905
905
  var _h = _vm.$createElement
906
906
  var _c = _vm._self._c || _h
@@ -1176,11 +1176,11 @@ var treevue_type_template_id_bacc904e_render = function () {
1176
1176
  0
1177
1177
  )
1178
1178
  }
1179
- var treevue_type_template_id_bacc904e_staticRenderFns = []
1180
- treevue_type_template_id_bacc904e_render._withStripped = true
1179
+ var treevue_type_template_id_491fd81b_staticRenderFns = []
1180
+ treevue_type_template_id_491fd81b_render._withStripped = true
1181
1181
 
1182
1182
 
1183
- // CONCATENATED MODULE: ./packages/selector/src/tree.vue?vue&type=template&id=bacc904e&
1183
+ // CONCATENATED MODULE: ./packages/selector/src/tree.vue?vue&type=template&id=491fd81b&
1184
1184
 
1185
1185
  // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/tree.vue?vue&type=script&lang=js&
1186
1186
  //
@@ -1385,7 +1385,7 @@ treevue_type_template_id_bacc904e_render._withStripped = true
1385
1385
  },
1386
1386
  labelKey: {
1387
1387
  type: String,
1388
- default: 'showname'
1388
+ default: 'showshortname'
1389
1389
  },
1390
1390
  oldIsSearch: Boolean,
1391
1391
  isSearch: Boolean
@@ -1453,8 +1453,8 @@ treevue_type_template_id_bacc904e_render._withStripped = true
1453
1453
 
1454
1454
  var tree_component = normalizeComponent(
1455
1455
  src_treevue_type_script_lang_js_,
1456
- treevue_type_template_id_bacc904e_render,
1457
- treevue_type_template_id_bacc904e_staticRenderFns,
1456
+ treevue_type_template_id_491fd81b_render,
1457
+ treevue_type_template_id_491fd81b_staticRenderFns,
1458
1458
  false,
1459
1459
  null,
1460
1460
  null,
@@ -1464,7 +1464,7 @@ var tree_component = normalizeComponent(
1464
1464
 
1465
1465
  /* harmony default export */ var tree = (tree_component.exports);
1466
1466
  // EXTERNAL MODULE: external "@eoss-design/color"
1467
- var color_ = __webpack_require__(3);
1467
+ var color_ = __webpack_require__(2);
1468
1468
 
1469
1469
  // CONCATENATED MODULE: ./src/utils/util.js
1470
1470
  var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
@@ -1472,9 +1472,43 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
1472
1472
  /* eslint-disable indent */
1473
1473
  // import { authCenter } from '../config/api';
1474
1474
 
1475
-
1475
+ // import CryptoJS from 'crypto-js'
1476
1476
  var sm2 = __webpack_require__(6).sm2;
1477
-
1477
+ // /**
1478
+ // * esEncrypt
1479
+ // * @desc:sm2加密
1480
+ // * @author huangbo
1481
+ // * @date 2022年5月7日
1482
+ // * @param {string} [data] - 被加密的字符串
1483
+ // * @param {string} [key] - 公钥
1484
+ // **/
1485
+ // const encryptDes = (message, key) => {
1486
+ // const keyHex = CryptoJS.enc.Utf8.parse(key);
1487
+ // const encrypted = CryptoJS.DES.encrypt(message, keyHex, {
1488
+ // mode: CryptoJS.mode.ECB,
1489
+ // padding: CryptoJS.pad.Pkcs7
1490
+ // });
1491
+ // return encrypted.toString();
1492
+ // }
1493
+ // /**
1494
+ // * esEncrypt
1495
+ // * @desc:sm2加密
1496
+ // * @author huangbo
1497
+ // * @date 2022年5月7日
1498
+ // * @param {string} [data] - 被加密的字符串
1499
+ // * @param {string} [key] - 公钥
1500
+ // **/
1501
+ // const decryptDes = (ciphertext, key) => {
1502
+ // const keyHex = CryptoJS.enc.Utf8.parse(key);
1503
+ // // direct decrypt ciphertext
1504
+ // const decrypted = CryptoJS.DES.decrypt({
1505
+ // ciphertext: CryptoJS.enc.Base64.parse(ciphertext)
1506
+ // }, keyHex, {
1507
+ // mode: CryptoJS.mode.ECB,
1508
+ // padding: CryptoJS.pad.Pkcs7
1509
+ // });
1510
+ // return decrypted.toString(CryptoJS.enc.Utf8);
1511
+ // }
1478
1512
  /**
1479
1513
  * esEncrypt
1480
1514
  * @desc:sm2加密
@@ -2896,14 +2930,14 @@ var api_twoOfficesDispatch = activiti + '/task/taskHandle/twoOfficesDispatch.dht
2896
2930
  // 是否允许启动子流程(必经节点)
2897
2931
  var isCanStartSubFlow = activiti + '/task/taskHandle/isCanStartSubFlow.dhtml';
2898
2932
  // EXTERNAL MODULE: external "axios"
2899
- var external_axios_ = __webpack_require__(4);
2933
+ var external_axios_ = __webpack_require__(3);
2900
2934
  var external_axios_default = /*#__PURE__*/__webpack_require__.n(external_axios_);
2901
2935
 
2902
2936
  // EXTERNAL MODULE: external "eoss-mobile-vant"
2903
2937
  var external_eoss_mobile_vant_ = __webpack_require__(0);
2904
2938
 
2905
2939
  // EXTERNAL MODULE: external "qs"
2906
- var external_qs_ = __webpack_require__(2);
2940
+ var external_qs_ = __webpack_require__(4);
2907
2941
  var external_qs_default = /*#__PURE__*/__webpack_require__.n(external_qs_);
2908
2942
 
2909
2943
  // CONCATENATED MODULE: ./src/utils/axios.js
@@ -2912,168 +2946,157 @@ var external_qs_default = /*#__PURE__*/__webpack_require__.n(external_qs_);
2912
2946
 
2913
2947
 
2914
2948
  var apiUrl = util.getStorage('host');
2915
- var http = external_axios_default.a.create({
2916
- baseURL: apiUrl,
2917
- timeout: 60000,
2918
- headers: {
2919
- // clientKey: 'csjk'
2920
- },
2921
- withCredentials: false
2922
- });
2923
- http.interceptors.request.use(function (config) {
2924
- var data = {};
2925
- if (config.method === 'post') {
2926
- // 特殊处理在线考试接口1
2927
- if (config.url.search('HGtest') !== -1) {
2928
- config.headers['Content-Type'] = 'application/json;';
2929
- // config.data = qs.stringify(data);
2930
- Object.assign(data, config.data);
2931
- } else if (config.url.search('/outsidedirector/business/update') !== -1) {
2932
- delete config.data.userId;
2933
- } else if (config.url.indexOf('decisionSuperviseMeet') !== -1) {
2934
- config.headers['Content-Type'] = 'application/x-www-form-urlencoded';
2935
- Object.assign(data, config.data);
2936
- config.data = external_qs_default.a.stringify(data);
2949
+
2950
+ var axios_ajax = function ajax(url) {
2951
+ var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
2952
+ var headers = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
2953
+ var format = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
2954
+ var type = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 'get';
2955
+
2956
+ var http = external_axios_default.a.create({
2957
+ baseURL: apiUrl,
2958
+ timeout: 60000,
2959
+ headers: {
2960
+ // clientKey: 'csjk'
2961
+ },
2962
+ withCredentials: false
2963
+ });
2964
+ http.interceptors.request.use(function (config) {
2965
+ if (type === 'post' && format) {
2966
+ config.data = external_qs_default.a.stringify(params);
2967
+ if (!config.headers['content-type'] && !headers['Content-Type']) {
2968
+ config.headers['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
2969
+ }
2937
2970
  } else {
2938
- config.headers['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
2939
- if (Object.prototype.toString.call(config.data).slice(8, -1).toLowerCase() !== 'formdata') {
2940
- Object.assign(data, config.data);
2941
- config.data = external_qs_default.a.stringify(data);
2971
+ if (!config.headers['content-type'] && !headers['Content-Type']) {
2972
+ config.headers['content-type'] = 'application/json;charset=UTF-8';
2942
2973
  }
2974
+ config.data = params;
2943
2975
  }
2944
- } else {
2945
- Object.assign(config.params, data);
2946
- config.headers['Content-Type'] = 'application/json;';
2947
- }
2948
- if (util.getStorage('token')) {
2949
- config.headers.Authorization = util.getStorage('token');
2950
- }
2951
- if (util.getStorage('deviceId')) {
2952
- config.headers.deviceId = util.getStorage('deviceId');
2953
- }
2954
2976
 
2955
- var a = '/config/';
2977
+ if (util.getStorage('token')) {
2978
+ config.headers.Authorization = util.getStorage('token');
2979
+ }
2980
+ if (util.getStorage('deviceId')) {
2981
+ config.headers.deviceId = util.getStorage('deviceId');
2982
+ }
2956
2983
 
2957
- if (config.url.search(a) !== -1 && config.url.search('appInfo') === -1) {
2958
- config.headers.clientKey = util.getStorage('clientKey') || 'csjk2';
2959
- }
2960
- if (config.url.search('api/financePhone/') !== -1) {
2961
- config.baseURL = 'https://release.cdgzjg.cn/';
2962
- }
2963
- if (config.url.search('affairs/getHandleInfosnew.json') !== -1) {
2964
- config.headers = {
2965
- token: sessionStorage.getItem('token'),
2966
- oueside_token: sessionStorage.getItem('token'),
2967
- deviceId: '432a320f99793e39',
2968
- Authorization: sessionStorage.getItem('token')
2969
- };
2970
- }
2971
- if (config.url.search('/getmyAccount.json') !== -1) {
2972
- delete config.params.userId;
2973
- }
2974
- if (config.url.search('/sso2/authCenter') !== -1) {
2975
- delete config.headers.clientKey;
2976
- delete config.headers.deviceId;
2977
- }
2978
- if (config.url.search('/appInfo') !== -1) {
2979
- config.headers.deviceId = util.getStorage('deviceId');
2980
- delete config.headers.clientKey;
2981
- }
2982
- if (config.url.search('getPresetCustomInfo') !== -1 || config.url.search('registerNew') !== -1) {
2983
- // config.baseURL = "/api";
2984
- config.headers.token = util.getStorage('token');
2985
- }
2986
- if (config.url.search('mecp/overtime') !== -1 || config.url.search('mecp/leave') !== -1 || config.url.search('contractext') !== -1 || config.url.search('getSysParam') !== -1) {
2987
- delete config.headers.deviceId;
2988
- }
2989
- // if(config.url.search('getVehicleMaintenanceInfoForAPP') !== -1 ) {
2990
- // delete config.headers.deviceId
2991
- // delete config.headers.Authorization
2992
- // delete config.headers.clientKey
2993
- // }
2994
- if (config.url.search('/bpm') !== -1) {
2995
- // config.baseURL = "/api";
2996
- // config.headers.Authorization = $.getStorage('token');
2997
- // config.headers.Deviceunique = $.getStorage('deviceunique');
2998
- // config.headers.Ssid = $.getStorage('ssid');
2999
- // delete config.headers.deviceId;
3000
- // delete config.headers.clientKey;
3001
- }
3002
- return config;
3003
- }, function (error) {
3004
- return Promise.error(error);
3005
- });
3006
- // 响应拦截器
2984
+ var a = '/config/';
3007
2985
 
3008
- http.interceptors.response.use(function (response) {
3009
- if (response.status === 200) {
3010
- if (response.data.rCode === 64 || response.data.rCode === 27) {
3011
- util.H5TokenInvalid();
3012
- } else {
3013
- return Promise.resolve(response.data);
2986
+ if (config.url.search(a) !== -1 && config.url.search('appInfo') === -1) {
2987
+ config.headers.clientKey = util.getStorage('clientKey') || 'csjk2';
3014
2988
  }
3015
- } else {
3016
- return Promise.reject(response.data);
3017
- }
3018
- }, function (error) {
3019
- if (error && error.response) {
3020
- if (error.response.status) {
3021
- switch (error.response.status) {
3022
- case 400:
3023
- error.message = '错误请求';
3024
- break;
3025
- case 401:
3026
- error.message = '未授权,请重新登录';
3027
- break;
3028
- case 403:
3029
- error.message = '登录过期,请重新登录';
3030
- util.removeStorage('userId');
3031
- break;
3032
- case 404:
3033
- error.message = '网络请求不存在';
3034
- break;
3035
- case 405:
3036
- error.message = '请求方法错误';
3037
- break;
3038
- case 408:
3039
- error.message = '请求超时';
3040
- break;
3041
- case 500:
3042
- error.message = '服务器端出错';
3043
- break;
3044
- case 501:
3045
- error.message = '网络未实现';
3046
- break;
3047
- case 502:
3048
- error.message = '网络错误';
3049
- break;
3050
- case 503:
3051
- error.message = '服务不可用';
3052
- break;
3053
- case 504:
3054
- error.message = '网络超时';
3055
- break;
3056
- case 505:
3057
- error.message = 'http版本不支持该请求';
3058
- break;
3059
- default:
3060
- error.message = '\u8FDE\u63A5\u9519\u8BEF' + error.response.status;
2989
+ if (config.url.search('api/financePhone/') !== -1) {
2990
+ config.baseURL = 'https://release.cdgzjg.cn/';
2991
+ }
2992
+ if (config.url.search('affairs/getHandleInfosnew.json') !== -1) {
2993
+ config.headers = {
2994
+ token: sessionStorage.getItem('token'),
2995
+ oueside_token: sessionStorage.getItem('token'),
2996
+ deviceId: '432a320f99793e39',
2997
+ Authorization: sessionStorage.getItem('token')
2998
+ };
2999
+ }
3000
+ if (config.url.search('/getmyAccount.json') !== -1) {
3001
+ delete config.params.userId;
3002
+ }
3003
+ if (config.url.search('/sso2/authCenter') !== -1) {
3004
+ delete config.headers.clientKey;
3005
+ delete config.headers.deviceId;
3006
+ }
3007
+ if (config.url.search('/appInfo') !== -1) {
3008
+ config.headers.deviceId = util.getStorage('deviceId');
3009
+ delete config.headers.clientKey;
3010
+ }
3011
+ if (config.url.search('getPresetCustomInfo') !== -1 || config.url.search('registerNew') !== -1) {
3012
+ config.headers.token = util.getStorage('token');
3013
+ }
3014
+ if (config.url.search('mecp/overtime') !== -1 || config.url.search('mecp/leave') !== -1 || config.url.search('contractext') !== -1 || config.url.search('getSysParam') !== -1) {
3015
+ delete config.headers.deviceId;
3016
+ }
3017
+ return config;
3018
+ }, function (error) {
3019
+ return Promise.error(error);
3020
+ });
3021
+ http.interceptors.response.use(function (response) {
3022
+ if (response.status === 200) {
3023
+ if (response.data.rCode === 64 || response.data.rCode === 27) {
3024
+ util.H5TokenInvalid();
3025
+ } else {
3026
+ return Promise.resolve(response.data);
3061
3027
  }
3062
3028
  } else {
3063
- error.message = '接口出现问题,无法请求';
3029
+ return Promise.reject(response.data);
3064
3030
  }
3065
- }
3066
- Object(external_eoss_mobile_vant_["Toast"])({
3067
- message: error.message,
3068
- duration: 1500,
3069
- forbidClick: true
3031
+ }, function (error) {
3032
+ if (error && error.response) {
3033
+ if (error.response.status) {
3034
+ switch (error.response.status) {
3035
+ case 400:
3036
+ error.message = '错误请求';
3037
+ break;
3038
+ case 401:
3039
+ error.message = '未授权,请重新登录';
3040
+ break;
3041
+ case 403:
3042
+ error.message = '登录过期,请重新登录';
3043
+ util.removeStorage('userId');
3044
+ break;
3045
+ case 404:
3046
+ error.message = '网络请求不存在';
3047
+ break;
3048
+ case 405:
3049
+ error.message = '请求方法错误';
3050
+ break;
3051
+ case 408:
3052
+ error.message = '请求超时';
3053
+ break;
3054
+ case 500:
3055
+ error.message = '服务器端出错';
3056
+ break;
3057
+ case 501:
3058
+ error.message = '网络未实现';
3059
+ break;
3060
+ case 502:
3061
+ error.message = '网络错误';
3062
+ break;
3063
+ case 503:
3064
+ error.message = '服务不可用';
3065
+ break;
3066
+ case 504:
3067
+ error.message = '网络超时';
3068
+ break;
3069
+ case 505:
3070
+ error.message = 'http版本不支持该请求';
3071
+ break;
3072
+ default:
3073
+ error.message = '\u8FDE\u63A5\u9519\u8BEF' + error.response.status;
3074
+ }
3075
+ } else {
3076
+ error.message = '接口出现问题,无法请求';
3077
+ }
3078
+ }
3079
+ Object(external_eoss_mobile_vant_["Toast"])({
3080
+ message: error.message,
3081
+ duration: 1500,
3082
+ forbidClick: true
3083
+ });
3084
+ return Promise.reject(error);
3070
3085
  });
3071
- return Promise.reject(error);
3072
- });
3086
+ if (type === 'get' || type === 'GET') {
3087
+ return http.get(url, params, headers, format);
3088
+ } else {
3089
+ return http.post(url, params, headers, format);
3090
+ }
3091
+ };
3092
+
3093
+ // 响应拦截器
3073
3094
 
3074
3095
  var base = {
3075
3096
  get: function get(url) {
3076
3097
  var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
3098
+ var headers = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
3099
+ var format = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
3077
3100
 
3078
3101
  if (params.params && url.search('registerNew') === -1) {
3079
3102
  params.params.userId = params.params.userId ? params.params.userId : util.getStorage('userId');
@@ -3090,19 +3113,17 @@ var base = {
3090
3113
  params.userId = 'u1b9f3ce4731649e0b665af015d74c19b';
3091
3114
  }
3092
3115
  }
3093
- return http.get(url, {
3116
+ return axios_ajax(url, {
3094
3117
  params: params
3095
- });
3118
+ }, headers, format);
3096
3119
  },
3097
- post: function post(url) {
3098
- var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
3099
-
3120
+ post: function post(url, params, headers, format) {
3100
3121
  if (params.params) {
3101
3122
  params.params.userId = params.params.userId || util.getStorage('userId');
3102
3123
  } else {
3103
3124
  params.userId = params.userId || util.getStorage('userId');
3104
3125
  }
3105
- return http.post(url, params);
3126
+ return axios_ajax(url, params, headers, format, 'post');
3106
3127
  }
3107
3128
  };
3108
3129
  /* harmony default export */ var axios = (base);
@@ -3112,19 +3133,19 @@ var http_request = function request(options) {
3112
3133
  var fn = void 0;
3113
3134
  switch (options.type) {
3114
3135
  case 'post':
3115
- fn = axios.post(options.url, options.params);
3136
+ fn = axios.post(options.url, options.params, options.headers, options.format);
3116
3137
  break;
3117
3138
  case 'POST':
3118
- fn = axios.post(options.url, options.params);
3139
+ fn = axios.post(options.url, options.params, options.headers, options.format);
3119
3140
  break;
3120
3141
  case 'get':
3121
- fn = axios.get(options.url, options.params);
3142
+ fn = axios.get(options.url, options.params, options.headers = {});
3122
3143
  break;
3123
3144
  case 'GET':
3124
- fn = axios.get(options.url, options.params);
3145
+ fn = axios.get(options.url, options.params, options.headers = {});
3125
3146
  break;
3126
3147
  default:
3127
- fn = axios.get(options.url, options.params);
3148
+ fn = axios.get(options.url, options.params, options.headers = {});
3128
3149
  }
3129
3150
  return fn;
3130
3151
  };
@@ -3387,7 +3408,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
3387
3408
  },
3388
3409
  labelKey: {
3389
3410
  type: String,
3390
- default: 'showname'
3411
+ default: 'showshortname'
3391
3412
  },
3392
3413
  paddingTop: {
3393
3414
  type: [String, Number],
@@ -4084,8 +4105,8 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
4084
4105
 
4085
4106
  var selector_tree_component = normalizeComponent(
4086
4107
  src_selector_treevue_type_script_lang_js_,
4087
- selector_treevue_type_template_id_5d47b9aa_render,
4088
- selector_treevue_type_template_id_5d47b9aa_staticRenderFns,
4108
+ selector_treevue_type_template_id_328ffb6a_render,
4109
+ selector_treevue_type_template_id_328ffb6a_staticRenderFns,
4089
4110
  false,
4090
4111
  null,
4091
4112
  null,
@@ -6856,8 +6877,8 @@ empty_src_main.install = function (Vue) {
6856
6877
  };
6857
6878
 
6858
6879
  /* harmony default export */ var empty = (empty_src_main);
6859
- // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/date/src/main.vue?vue&type=template&id=16a5d515&
6860
- var mainvue_type_template_id_16a5d515_render = function () {
6880
+ // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/date/src/main.vue?vue&type=template&id=68ecda84&
6881
+ var mainvue_type_template_id_68ecda84_render = function () {
6861
6882
  var _vm = this
6862
6883
  var _h = _vm.$createElement
6863
6884
  var _c = _vm._self._c || _h
@@ -6996,11 +7017,11 @@ var mainvue_type_template_id_16a5d515_render = function () {
6996
7017
  1
6997
7018
  )
6998
7019
  }
6999
- var mainvue_type_template_id_16a5d515_staticRenderFns = []
7000
- mainvue_type_template_id_16a5d515_render._withStripped = true
7020
+ var mainvue_type_template_id_68ecda84_staticRenderFns = []
7021
+ mainvue_type_template_id_68ecda84_render._withStripped = true
7001
7022
 
7002
7023
 
7003
- // CONCATENATED MODULE: ./packages/date/src/main.vue?vue&type=template&id=16a5d515&
7024
+ // CONCATENATED MODULE: ./packages/date/src/main.vue?vue&type=template&id=68ecda84&
7004
7025
 
7005
7026
  // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/date/src/date-time.vue?vue&type=template&id=df431e74&
7006
7027
  var date_timevue_type_template_id_df431e74_render = function () {
@@ -7737,7 +7758,7 @@ var date_picker_component = normalizeComponent(
7737
7758
  } else if (type === 'datehour' && newValue != 'Invalid Date') {
7738
7759
  value = y + (this.joinStr || '年') + m + (this.joinStr || '月') + d + (this.joinStr ? ' ' : '日 ') + h + (this.joinStr ? ' ' : '时');
7739
7760
  } else if (type === 'year' && newValue != 'Invalid Date') {
7740
- value = y + (this.joinStr || '年');
7761
+ value = y + (this.joinStr ? '' : '年');
7741
7762
  }
7742
7763
  return value;
7743
7764
  },
@@ -7761,8 +7782,8 @@ var date_picker_component = normalizeComponent(
7761
7782
 
7762
7783
  var date_src_main_component = normalizeComponent(
7763
7784
  packages_date_src_mainvue_type_script_lang_js_,
7764
- mainvue_type_template_id_16a5d515_render,
7765
- mainvue_type_template_id_16a5d515_staticRenderFns,
7785
+ mainvue_type_template_id_68ecda84_render,
7786
+ mainvue_type_template_id_68ecda84_staticRenderFns,
7766
7787
  false,
7767
7788
  null,
7768
7789
  null,
@@ -20055,7 +20076,7 @@ if (typeof window !== 'undefined' && window.Vue) {
20055
20076
  }
20056
20077
 
20057
20078
  /* harmony default export */ var src = __webpack_exports__["default"] = ({
20058
- version: '0.2.14',
20079
+ version: '0.2.15',
20059
20080
  install: install,
20060
20081
  Button: packages_button,
20061
20082
  ButtonGroup: button_group,