eoss-ui 0.4.19 → 0.4.21

package/lib/login.js

@@ -2773,7 +2773,7 @@ var bankCard = { pattern: new RegExp('^([1-9]{1})(\\d{14}|\\d{18})$'), message:
 // 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/login/src/main.vue?vue&type=template&id=51ac81ed&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=94b9d2bc&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3571,7 +3571,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=51ac81ed&
+// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=94b9d2bc&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/resetPassword.vue?vue&type=template&id=669156c6&
 var resetPasswordvue_type_template_id_669156c6_render = function () {
@@ -4837,6 +4837,10 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
         if (res.subsystemExtend.loginBoxAlign && this.useResults) {
           this.align = res.subsystemExtend.loginBoxAlign;
         }
+        if (res.subsystemExtend.themeColor) {
+          util["a" /* default */].updateTheme(res.subsystemExtend.themeColor);
+          localStorage.setItem('theme', res.subsystemExtend.themeColor);
+        }
       }
       this.passModifyModel = res.passModifyModel;
       this.wechatAppid = res.wechatAppid;

package/lib/upload.js

@@ -2682,8 +2682,8 @@ module.exports = require("qs");
 // 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/upload/src/main.vue?vue&type=template&id=757f82dc&
-var mainvue_type_template_id_757f82dc_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=template&id=386254b4&
+var mainvue_type_template_id_386254b4_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3017,10 +3017,10 @@ var mainvue_type_template_id_757f82dc_render = function () {
   )
 }
 var staticRenderFns = []
-mainvue_type_template_id_757f82dc_render._withStripped = true
+mainvue_type_template_id_386254b4_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=757f82dc&
+// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=386254b4&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -3778,19 +3778,20 @@ var _props;
       var flag = false;
       var size = this._size;
       var text = '单个附件';
+      var se = Math.ceil(file.size / 1024 * 100) / 100;
       if (this._size === 0 && this._totalSize === 0) {
         flag = true;
       } else if (this._size > 0 && this._totalSize === 0) {
-        flag = file.size < this._size;
+        flag = se < this._size;
         size = this._size;
         text = '单个附件';
       } else if (this._size === 0 && this._totalSize > 0) {
-        flag = this.filesTotalSize + file.size < this._totalSize;
+        flag = this.filesTotalSize + se < this._totalSize;
         size = this._totalSize;
         text = '附件总';
       } else {
-        flag = file.size < this._size && this.filesTotalSize + file.size < this._totalSize;
-        if (file.size < this._size) {
+        flag = se < this._size && this.filesTotalSize + se < this._totalSize;
+        if (se < this._size) {
           size = this._size;
           text = '单个附件';
         } else {
@@ -3799,7 +3800,7 @@ var _props;
         }
       }
       if (flag) {
-        this.filesTotalSize += file.size;
+        this.filesTotalSize += se;
       } else {
         this.$message.error('\u4E0A\u4F20' + text + '\u5927\u5C0F\u4E0D\u80FD\u8D85\u8FC7' + size + 'KB!');
       }
@@ -4008,7 +4009,7 @@ var componentNormalizer = __webpack_require__(2);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_757f82dc_render,
+  mainvue_type_template_id_386254b4_render,
   staticRenderFns,
   false,
   null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.4.19",
+  "version": "0.4.21",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

package/packages/form/src/main.vue

@@ -3487,6 +3487,11 @@ export default {
                 this.model[typeof this.autoId === 'string' ? this.autoId : 'id']
               );
             } else {
+              this.$set(
+                this.model,
+                typeof this.autoId === 'string' ? this.autoId : 'id',
+                this.uuid
+              );
               this.$emit('update:businessId', this.uuid);
               this.$emit('getId', this.uuid);
             }
@@ -4077,7 +4082,7 @@ export default {
           id.substring(10, 12) +
           '-' +
           id.substring(12, 14);
-        let sex = parseInt(id.substr(16, 2)) % 2 === 1 ? '男' : '女';
+        let sex = parseInt(id.substr(16, 1)) % 2 === 1 ? '男' : '女';
         let ageDate = new Date();
         let month = ageDate.getMonth() + 1;
         let day = ageDate.getDate();

package/packages/login/src/main.vue

@@ -889,6 +889,10 @@ export default {
         if (res.subsystemExtend.loginBoxAlign && this.useResults) {
           this.align = res.subsystemExtend.loginBoxAlign;
         }
+        if (res.subsystemExtend.themeColor) {
+          util.updateTheme(res.subsystemExtend.themeColor);
+          localStorage.setItem('theme', res.subsystemExtend.themeColor);
+        }
       }
       this.passModifyModel = res.passModifyModel;
       this.wechatAppid = res.wechatAppid;

package/packages/upload/src/main.vue

@@ -838,21 +838,20 @@ export default {
       let flag = false;
       let size = this._size;
       let text = '单个附件';
+      let se = Math.ceil((file.size / 1024) * 100) / 100;
       if (this._size === 0 && this._totalSize === 0) {
         flag = true;
       } else if (this._size > 0 && this._totalSize === 0) {
-        flag = file.size < this._size;
+        flag = se < this._size;
         size = this._size;
         text = '单个附件';
       } else if (this._size === 0 && this._totalSize > 0) {
-        flag = this.filesTotalSize + file.size < this._totalSize;
+        flag = this.filesTotalSize + se < this._totalSize;
         size = this._totalSize;
         text = '附件总';
       } else {
-        flag =
-          file.size < this._size &&
-          this.filesTotalSize + file.size < this._totalSize;
-        if (file.size < this._size) {
+        flag = se < this._size && this.filesTotalSize + se < this._totalSize;
+        if (se < this._size) {
           size = this._size;
           text = '单个附件';
         } else {
@@ -861,7 +860,7 @@ export default {
         }
       }
       if (flag) {
-        this.filesTotalSize += file.size;
+        this.filesTotalSize += se;
       } else {
         this.$message.error(`上传${text}大小不能超过${size}KB!`);
       }

package/src/index.js

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