eoss-ui 0.6.22 → 0.6.23

package/lib/main.js

@@ -6683,8 +6683,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=edaa0dc4&scoped=true&
-var uservue_type_template_id_edaa0dc4_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=1d4b46d0&scoped=true&
+var uservue_type_template_id_1d4b46d0_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -6835,6 +6835,7 @@ var uservue_type_template_id_edaa0dc4_scoped_true_render = function () {
           _vm.visible
             ? _c("user-info", {
                 attrs: { contents: _vm.contents, value: _vm.userInfo },
+                on: { success: _vm.handleSuccess },
               })
             : _vm._e(),
         ],
@@ -6844,14 +6845,14 @@ var uservue_type_template_id_edaa0dc4_scoped_true_render = function () {
     1
   )
 }
-var uservue_type_template_id_edaa0dc4_scoped_true_staticRenderFns = []
-uservue_type_template_id_edaa0dc4_scoped_true_render._withStripped = true
+var uservue_type_template_id_1d4b46d0_scoped_true_staticRenderFns = []
+uservue_type_template_id_1d4b46d0_scoped_true_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/simplicity/user.vue?vue&type=template&id=edaa0dc4&scoped=true&
+// CONCATENATED MODULE: ./packages/main/src/simplicity/user.vue?vue&type=template&id=1d4b46d0&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=9d115418&
-var userinfovue_type_template_id_9d115418_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=028fdb19&
+var userinfovue_type_template_id_028fdb19_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -6867,11 +6868,11 @@ var userinfovue_type_template_id_9d115418_render = function () {
     2
   )
 }
-var userinfovue_type_template_id_9d115418_staticRenderFns = []
-userinfovue_type_template_id_9d115418_render._withStripped = true
+var userinfovue_type_template_id_028fdb19_staticRenderFns = []
+userinfovue_type_template_id_028fdb19_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/simplicity/userinfo.vue?vue&type=template&id=9d115418&
+// CONCATENATED MODULE: ./packages/main/src/simplicity/userinfo.vue?vue&type=template&id=028fdb19&
 
 // 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&
 //
@@ -7102,7 +7103,13 @@ userinfovue_type_template_id_9d115418_render._withStripped = true
               }
             }).catch(function (e) {});
           } else {
-            _this2.$message.success(res.msg);
+            _this2.$message({
+              message: res.msg,
+              type: 'success',
+              onClose: function onClose() {
+                _this2.$emit('success', _this2.model);
+              }
+            });
           }
         } else {
           var msg = res.msg || '系统错误，请联系管理员！';
@@ -7132,8 +7139,8 @@ userinfovue_type_template_id_9d115418_render._withStripped = true
 
 var userinfo_component = Object(componentNormalizer["a" /* default */])(
   simplicity_userinfovue_type_script_lang_js_,
-  userinfovue_type_template_id_9d115418_render,
-  userinfovue_type_template_id_9d115418_staticRenderFns,
+  userinfovue_type_template_id_028fdb19_render,
+  userinfovue_type_template_id_028fdb19_staticRenderFns,
   false,
   null,
   null,
@@ -7213,6 +7220,11 @@ var userinfo_component = Object(componentNormalizer["a" /* default */])(
 //
 //
 //
+//
+//
+//
+//
+//
 
 
 
@@ -7382,6 +7394,10 @@ var userinfo_component = Object(componentNormalizer["a" /* default */])(
     //打开修改密码弹窗
     handleOpen: function handleOpen() {
       this.visible = true;
+    },
+    handleSuccess: function handleSuccess() {
+      this.visible = false;
+      this.getData();
     }
   }
 });
@@ -7397,11 +7413,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_edaa0dc4_scoped_true_render,
-  uservue_type_template_id_edaa0dc4_scoped_true_staticRenderFns,
+  uservue_type_template_id_1d4b46d0_scoped_true_render,
+  uservue_type_template_id_1d4b46d0_scoped_true_staticRenderFns,
   false,
   null,
-  "edaa0dc4",
+  "1d4b46d0",
   null
   
 )
@@ -11799,8 +11815,8 @@ var simplicity_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var simplicity = (simplicity_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/default/index.vue?vue&type=template&id=7a0d5c92&
-var defaultvue_type_template_id_7a0d5c92_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/default/index.vue?vue&type=template&id=5f12ae62&
+var defaultvue_type_template_id_5f12ae62_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -12135,7 +12151,7 @@ var defaultvue_type_template_id_7a0d5c92_render = function () {
                       attrs: { contents: _vm.userInfoContents },
                       on: {
                         change: _vm.handleUserModel,
-                        reGetConfig: _vm.reGetConfig,
+                        success: _vm.reGetConfig,
                       },
                     },
                     "userinfo",
@@ -12188,14 +12204,14 @@ var defaultvue_type_template_id_7a0d5c92_render = function () {
     1
   )
 }
-var defaultvue_type_template_id_7a0d5c92_staticRenderFns = []
-defaultvue_type_template_id_7a0d5c92_render._withStripped = true
+var defaultvue_type_template_id_5f12ae62_staticRenderFns = []
+defaultvue_type_template_id_5f12ae62_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/default/index.vue?vue&type=template&id=7a0d5c92&
+// CONCATENATED MODULE: ./packages/main/src/default/index.vue?vue&type=template&id=5f12ae62&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/default/userinfo.vue?vue&type=template&id=d207c2e8&
-var userinfovue_type_template_id_d207c2e8_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/default/userinfo.vue?vue&type=template&id=b6520920&
+var userinfovue_type_template_id_b6520920_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -12211,11 +12227,11 @@ var userinfovue_type_template_id_d207c2e8_render = function () {
     2
   )
 }
-var userinfovue_type_template_id_d207c2e8_staticRenderFns = []
-userinfovue_type_template_id_d207c2e8_render._withStripped = true
+var userinfovue_type_template_id_b6520920_staticRenderFns = []
+userinfovue_type_template_id_b6520920_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/default/userinfo.vue?vue&type=template&id=d207c2e8&
+// CONCATENATED MODULE: ./packages/main/src/default/userinfo.vue?vue&type=template&id=b6520920&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/default/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; };
@@ -12612,7 +12628,6 @@ var userinfovue_type_script_lang_js_extends = Object.assign || function (target)
               }
             }).catch(function (e) {});
           } else {
-            _this4.$emit('reGetConfig');
             var notify = _this4.values.notify.sort().join(',');
             if (notify != _this4.notify.split(',').sort().join(',')) {
               util["a" /* default */].ajax({
@@ -12622,7 +12637,13 @@ var userinfovue_type_script_lang_js_extends = Object.assign || function (target)
                 }
               }).then(function (results) {
                 if (results.rCode === 0) {
-                  _this4.$message.success(results.msg);
+                  _this4.$message({
+                    message: results.msg,
+                    type: 'success',
+                    onClose: function onClose() {
+                      _this4.$emit('success', _this4.values);
+                    }
+                  });
                 } else {
                   _this4.$message.error(results.msg || '系统错误，请联系管理员！');
                 }
@@ -12632,7 +12653,13 @@ var userinfovue_type_script_lang_js_extends = Object.assign || function (target)
                 }
               });
             } else {
-              _this4.$message.success(res.msg);
+              _this4.$message({
+                message: res.msg,
+                type: 'success',
+                onClose: function onClose() {
+                  _this4.$emit('success', _this4.values);
+                }
+              });
             }
           }
         } else {
@@ -12664,8 +12691,8 @@ var userinfovue_type_script_lang_js_extends = Object.assign || function (target)
 
 var default_userinfo_component = Object(componentNormalizer["a" /* default */])(
   src_default_userinfovue_type_script_lang_js_,
-  userinfovue_type_template_id_d207c2e8_render,
-  userinfovue_type_template_id_d207c2e8_staticRenderFns,
+  userinfovue_type_template_id_b6520920_render,
+  userinfovue_type_template_id_b6520920_staticRenderFns,
   false,
   null,
   null,
@@ -14308,6 +14335,7 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
     reGetConfig: function reGetConfig() {
       var _this2 = this;
 
+      this.showUserInfo = false;
       util["a" /* default */].ajax({ url: this.mainConfig }).then(function (res) {
         if (res && res.rCode === 0) {
           var results = JSON.parse(JSON.stringify(res.results));
@@ -15400,8 +15428,8 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
 
 var default_component = Object(componentNormalizer["a" /* default */])(
   src_defaultvue_type_script_lang_js_,
-  defaultvue_type_template_id_7a0d5c92_render,
-  defaultvue_type_template_id_7a0d5c92_staticRenderFns,
+  defaultvue_type_template_id_5f12ae62_render,
+  defaultvue_type_template_id_5f12ae62_staticRenderFns,
   false,
   null,
   null,

package/package.json

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

package/packages/main/src/default/index.vue

@@ -186,7 +186,7 @@
           v-bind="$attrs"
           :contents="userInfoContents"
           @change="handleUserModel"
-          @reGetConfig="reGetConfig"
+          @success="reGetConfig"
         >
           <slot name="userInfo"></slot>
         </userinfo>
@@ -911,6 +911,7 @@ export default {
       }
     },
     reGetConfig() {
+      this.showUserInfo = false;
       util
         .ajax({ url: this.mainConfig })
         .then((res) => {

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

@@ -445,7 +445,6 @@ export default {
                 })
                 .catch((e) => {});
             } else {
-              this.$emit('reGetConfig');
               const notify = this.values.notify.sort().join(',');
               if (notify != this.notify.split(',').sort().join(',')) {
                 util
@@ -457,7 +456,13 @@ export default {
                   })
                   .then((results) => {
                     if (results.rCode === 0) {
-                      this.$message.success(results.msg);
+                      this.$message({
+                        message: results.msg,
+                        type: 'success',
+                        onClose: () => {
+                          this.$emit('success', this.values);
+                        }
+                      });
                     } else {
                       this.$message.error(
                         results.msg || '系统错误，请联系管理员！'
@@ -470,7 +475,13 @@ export default {
                     }
                   });
               } else {
-                this.$message.success(res.msg);
+                this.$message({
+                  message: res.msg,
+                  type: 'success',
+                  onClose: () => {
+                    this.$emit('success', this.values);
+                  }
+                });
               }
             }
           } else {

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

@@ -62,7 +62,12 @@
       修改密码 <i class="es-icon-arrow-right"></i>
     </div>
     <es-dialog title="修改密码" :visible.sync="visible">
-      <user-info v-if="visible" :contents="contents" :value="userInfo">
+      <user-info
+        v-if="visible"
+        :contents="contents"
+        :value="userInfo"
+        @success="handleSuccess"
+      >
       </user-info>
     </es-dialog>
   </div>
@@ -240,6 +245,10 @@ export default {
     //打开修改密码弹窗
     handleOpen() {
       this.visible = true;
+    },
+    handleSuccess() {
+      this.visible = false;
+      this.getData();
     }
   }
 };

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

@@ -285,7 +285,13 @@ export default {
                 })
                 .catch((e) => {});
             } else {
-              this.$message.success(res.msg);
+              this.$message({
+                message: res.msg,
+                type: 'success',
+                onClose: () => {
+                  this.$emit('success', this.model);
+                }
+              });
             }
           } else {
             let msg = res.msg || '系统错误，请联系管理员！';