eoss-ui 0.6.98 → 0.6.99

package/lib/main.js

@@ -7280,8 +7280,8 @@ var apps_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var simplicity_apps = (apps_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/user.vue?vue&type=template&id=79e71c00&scoped=true&
-var uservue_type_template_id_79e71c00_scoped_true_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/user.vue?vue&type=template&id=647fd01c&scoped=true&
+var uservue_type_template_id_647fd01c_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -7409,7 +7409,7 @@ var uservue_type_template_id_79e71c00_scoped_true_render = function () {
         [
           _vm.visible
             ? _c("user-info", {
-                attrs: { contents: _vm.contents, value: _vm.userInfo },
+                attrs: { contents: _vm.contents, value: _vm.userInfos },
                 on: { success: _vm.handleSuccess },
               })
             : _vm._e(),
@@ -7420,14 +7420,14 @@ var uservue_type_template_id_79e71c00_scoped_true_render = function () {
     1
   )
 }
-var uservue_type_template_id_79e71c00_scoped_true_staticRenderFns = []
-uservue_type_template_id_79e71c00_scoped_true_render._withStripped = true
+var uservue_type_template_id_647fd01c_scoped_true_staticRenderFns = []
+uservue_type_template_id_647fd01c_scoped_true_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/simplicity/user.vue?vue&type=template&id=79e71c00&scoped=true&
+// CONCATENATED MODULE: ./packages/main/src/simplicity/user.vue?vue&type=template&id=647fd01c&scoped=true&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/userinfo.vue?vue&type=template&id=fb004f62&
-var userinfovue_type_template_id_fb004f62_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/userinfo.vue?vue&type=template&id=fd4f50b2&
+var userinfovue_type_template_id_fd4f50b2_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -7450,11 +7450,11 @@ var userinfovue_type_template_id_fb004f62_render = function () {
     2
   )
 }
-var userinfovue_type_template_id_fb004f62_staticRenderFns = []
-userinfovue_type_template_id_fb004f62_render._withStripped = true
+var userinfovue_type_template_id_fd4f50b2_staticRenderFns = []
+userinfovue_type_template_id_fd4f50b2_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/simplicity/userinfo.vue?vue&type=template&id=fb004f62&
+// CONCATENATED MODULE: ./packages/main/src/simplicity/userinfo.vue?vue&type=template&id=fd4f50b2&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/userinfo.vue?vue&type=script&lang=js&
 var userinfovue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
@@ -7542,25 +7542,42 @@ var _props;
   computed: {
     formRules: function formRules() {
       return userinfovue_type_script_lang_js_extends({
-        idCard: {
+        idCard: [{
+          required: this.model.idCard !== null && this.model.idCard !== undefined && this.model.idCard !== '',
+          message: '请输入身份证号',
+          trigger: 'blur'
+        }, {
           pattern: new RegExp('(^\\d{15}$)|(^\\d{18}$)|(^\\d{17}(\\d|X|x)$)'),
-          message: '身份证号不合法'
-        },
-        phone: {
+          message: '身份证号不合法',
+          trigger: 'blur'
+        }],
+        phone: [{
+          required: this.model.phone !== null && this.model.phone !== undefined && this.model.phone !== '',
+          message: '请输入手机号',
+          trigger: 'blur'
+        }, {
           pattern: new RegExp('^[1][3, 4, 5, 6, 7, 8, 9][0-9]{9}$'),
           message: '手机号不合法',
           trigger: 'blur'
-        },
-        email: {
+        }],
+        email: [{
+          required: this.model.email !== null && this.model.email !== undefined && this.model.email !== '',
+          message: '请输入邮箱地址',
+          trigger: 'blur'
+        }, {
           type: 'email',
           message: '请输入正确的邮箱地址',
           trigger: 'blur'
-        },
-        officeTel: {
+        }],
+        officeTel: [{
+          required: this.model.officeTel !== null && this.model.officeTel !== undefined && this.model.officeTel !== '',
+          message: '请输入座机号',
+          trigger: 'blur'
+        }, {
           pattern: new RegExp('^(?:\\(?0([1-9]\\d{1,2})\\)?[- ]?)?([2-9]\\d{6,7})$'),
           message: '座机号不合法',
           trigger: 'blur'
-        },
+        }],
 
         oldpassword: this.model.password || this.model.repassword ? {
           required: true,
@@ -7765,8 +7782,8 @@ var _props;
 
 var userinfo_component = Object(componentNormalizer["a" /* default */])(
   simplicity_userinfovue_type_script_lang_js_,
-  userinfovue_type_template_id_fb004f62_render,
-  userinfovue_type_template_id_fb004f62_staticRenderFns,
+  userinfovue_type_template_id_fd4f50b2_render,
+  userinfovue_type_template_id_fd4f50b2_staticRenderFns,
   false,
   null,
   null,
@@ -7871,6 +7888,7 @@ var userinfo_component = Object(componentNormalizer["a" /* default */])(
   },
   data: function data() {
     return {
+      userInfos: {},
       userScanBindImgUrl: null,
       qrcode: null,
       checked: [],
@@ -7914,7 +7932,7 @@ var userinfo_component = Object(componentNormalizer["a" /* default */])(
       }).then(function (res) {
         if (res.rCode === 0) {
           var results = JSON.parse(JSON.stringify(res.results));
-          _this2.userInfo = results.simpleUserInfo;
+          _this2.userInfos = results.simpleUserInfo;
           if (results.userScanBindImgUrl) {
             _this2.userScanBindImgUrl = results.userScanBindImgUrl;
             _this2.qrcode = _this2.userScanBindImgUrl;
@@ -8040,11 +8058,11 @@ var userinfo_component = Object(componentNormalizer["a" /* default */])(
 
 var user_component = Object(componentNormalizer["a" /* default */])(
   simplicity_uservue_type_script_lang_js_,
-  uservue_type_template_id_79e71c00_scoped_true_render,
-  uservue_type_template_id_79e71c00_scoped_true_staticRenderFns,
+  uservue_type_template_id_647fd01c_scoped_true_render,
+  uservue_type_template_id_647fd01c_scoped_true_staticRenderFns,
   false,
   null,
-  "79e71c00",
+  "647fd01c",
   null
   
 )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.6.98",
+  "version": "0.6.99",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [
@@ -71,7 +71,7 @@
     "throttle-debounce": "^5.0.2",
     "ua-parser-js": "^2.0.3",
     "video.js": "^8.0.4",
-    "wujie-vue2": "^1.0.28"
+    "wujie-vue2": "^1.0.29"
   },
   "peerDependencies": {
     "vue": "^2.5.22"

package/packages/main/src/simplicity/user.vue

@@ -68,7 +68,7 @@
       <user-info
         v-if="visible"
         :contents="contents"
-        :value="userInfo"
+        :value="userInfos"
         @success="handleSuccess"
       >
       </user-info>
@@ -97,6 +97,7 @@ export default {
   },
   data() {
     return {
+      userInfos: {},
       userScanBindImgUrl: null,
       qrcode: null,
       checked: [],
@@ -136,7 +137,7 @@ export default {
         .then((res) => {
           if (res.rCode === 0) {
             const results = JSON.parse(JSON.stringify(res.results));
-            this.userInfo = results.simpleUserInfo;
+            this.userInfos = results.simpleUserInfo;
             if (results.userScanBindImgUrl) {
               this.userScanBindImgUrl = results.userScanBindImgUrl;
               this.qrcode = this.userScanBindImgUrl;

package/packages/main/src/simplicity/userinfo.vue

@@ -89,27 +89,68 @@ export default {
   computed: {
     formRules() {
       return {
-        idCard: {
-          pattern: new RegExp('(^\\d{15}$)|(^\\d{18}$)|(^\\d{17}(\\d|X|x)$)'),
-          message: '身份证号不合法'
-        },
-        phone: {
-          pattern: new RegExp('^[1][3, 4, 5, 6, 7, 8, 9][0-9]{9}$'),
-          message: '手机号不合法',
-          trigger: 'blur'
-        },
-        email: {
-          type: 'email',
-          message: '请输入正确的邮箱地址',
-          trigger: 'blur'
-        },
-        officeTel: {
-          pattern: new RegExp(
-            '^(?:\\(?0([1-9]\\d{1,2})\\)?[- ]?)?([2-9]\\d{6,7})$'
-          ),
-          message: '座机号不合法',
-          trigger: 'blur'
-        },
+        idCard: [
+          {
+            required:
+              this.model.idCard !== null &&
+              this.model.idCard !== undefined &&
+              this.model.idCard !== '',
+            message: '请输入身份证号',
+            trigger: 'blur'
+          },
+          {
+            pattern: new RegExp('(^\\d{15}$)|(^\\d{18}$)|(^\\d{17}(\\d|X|x)$)'),
+            message: '身份证号不合法',
+            trigger: 'blur'
+          }
+        ],
+        phone: [
+          {
+            required:
+              this.model.phone !== null &&
+              this.model.phone !== undefined &&
+              this.model.phone !== '',
+            message: '请输入手机号',
+            trigger: 'blur'
+          },
+          {
+            pattern: new RegExp('^[1][3, 4, 5, 6, 7, 8, 9][0-9]{9}$'),
+            message: '手机号不合法',
+            trigger: 'blur'
+          }
+        ],
+        email: [
+          {
+            required:
+              this.model.email !== null &&
+              this.model.email !== undefined &&
+              this.model.email !== '',
+            message: '请输入邮箱地址',
+            trigger: 'blur'
+          },
+          {
+            type: 'email',
+            message: '请输入正确的邮箱地址',
+            trigger: 'blur'
+          }
+        ],
+        officeTel: [
+          {
+            required:
+              this.model.officeTel !== null &&
+              this.model.officeTel !== undefined &&
+              this.model.officeTel !== '',
+            message: '请输入座机号',
+            trigger: 'blur'
+          },
+          {
+            pattern: new RegExp(
+              '^(?:\\(?0([1-9]\\d{1,2})\\)?[- ]?)?([2-9]\\d{6,7})$'
+            ),
+            message: '座机号不合法',
+            trigger: 'blur'
+          }
+        ],
 
         oldpassword:
           this.model.password || this.model.repassword

package/src/index.js

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