eoss-ui 0.4.22 → 0.4.23

package/lib/main.js

@@ -2765,7 +2765,7 @@ module.exports = require("stompjs");
 // 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/main/src/main.vue?vue&type=template&id=928abdb6&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=9860f06c&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3184,7 +3184,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=928abdb6&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=9860f06c&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/userinfo.vue?vue&type=template&id=d575fa30&
 var userinfovue_type_template_id_d575fa30_render = function () {
@@ -6076,6 +6076,7 @@ var log = util["a" /* default */].getParams('console');
     handleJump: function handleJump(page, type, res) {
       var _this9 = this;
 
+      console.log(page);
       if (util["a" /* default */].win.location.hash === page) {
         this.refresh = true;
         return;

package/lib/select.js

@@ -3026,6 +3026,8 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
           if (sysCode) {
             store["a" /* default */].set(sysCode, JSON.parse(JSON.stringify(_this3.options)));
           }
+        } else {
+          _this3.$message.error(res.msg);
         }
       }).catch(function (err) {
         _this3.loading = false;
@@ -3138,7 +3140,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
       return '';
     },
     reload: function reload() {
-      this.getData(arguments);
+      this.getData.apply(this, arguments);
     },
     handleExpand: function handleExpand(data, node) {
       if (this.onExpand) {

package/package.json

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

package/packages/dialog/src/main.vue

@@ -290,6 +290,9 @@ export default {
     },
     tableReload: {
       default: ''
+    },
+    esDialog: {
+      default: ''
     }
   },
   props: {

package/packages/flow/src/main.vue

@@ -429,6 +429,7 @@
       :close-on-click-modal="false"
       :visible.sync="handleVisible"
       v-if="handleVisible"
+      :closeParent="closeParent"
       height="auto"
     >
       <ProcessForm
@@ -600,7 +601,8 @@ export default {
       }
     },
     beforeSubmit: Function,
-    title: { type: String, default: '事务表单办理' }
+    title: { type: String, default: '事务表单办理' },
+    closeParent: Boolean
   },
   data() {
     return {
@@ -2103,11 +2105,6 @@ export default {
           if (this.nextNode.isAddSign != '1') {
             delete params.addSignUserId;
           }
-          // if(this.isSubmitButtonShowAgreeAndDisagree == 1){
-          //   this.value = this.value
-          // }
-          // console.log(params,'params')
-          // return
           this.loading = util.loading(this.$loading, '提交中...');
           const {
             isEndUserTask,

package/packages/flow/src/startTaskRead.vue

@@ -122,8 +122,8 @@
       <el-form-item
         v-show="
           nextNode.noticeType.length != 0 &&
-            configInfo.isCdjxjTaskHandle != 'true' &&
-            type == 'transfer'
+          configInfo.isCdjxjTaskHandle != 'true' &&
+          type == 'transfer'
         "
         prop="nextNode"
         label="通知消息"
@@ -131,7 +131,7 @@
         <span>{{ newsInfo }}</span>
       </el-form-item>
       <el-form-item>
-        <div style="text-align:right">
+        <div style="text-align: right">
           <el-button type="primary" size="small" @click="submit('nextNode')">
             提交
           </el-button>
@@ -233,7 +233,7 @@ export default {
       };
       util
         .ajax(params)
-        .then(res => {
+        .then((res) => {
           const {
             status,
             message,
@@ -251,7 +251,7 @@ export default {
             this.$message.error(message || '系统错误，请联系管理员！');
           }
         })
-        .catch(err => {
+        .catch((err) => {
           this.loading = false;
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
@@ -352,14 +352,14 @@ export default {
       if (this.type != 'taskReadAndEnd') delete params.params.taskAction;
       util
         .ajax(params)
-        .then(res => {
+        .then((res) => {
           const { status, data } = res;
           if (status === 'success') {
             this.configInfo = data;
             this.isMultiple();
           }
         })
-        .catch(err => {
+        .catch((err) => {
           this.loading = false;
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
@@ -370,7 +370,7 @@ export default {
       const { nextUser, options, mixList } = val;
       this.nextNode[type] = nextUser;
       this.mixList = mixList;
-      options.map(item => {
+      options.map((item) => {
         this.newSelectUserList.push({
           showname: item.showname,
           showid: item.showid
@@ -383,13 +383,13 @@ export default {
           url: findCodeValues,
           params: { ccCode: 'notification_type' }
         })
-        .then(res => {
+        .then((res) => {
           const { status, data } = res;
           if (status === 'success') {
             this.noticeList = data;
           }
         })
-        .catch(err => {
+        .catch((err) => {
           this.loading = false;
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
@@ -418,7 +418,7 @@ export default {
       };
       util
         .ajax(params)
-        .then(res => {
+        .then((res) => {
           const { message, status } = res;
           if (status === 'success') {
             this.$message.success('操作成功');
@@ -428,7 +428,7 @@ export default {
           }
           this.loading = false;
         })
-        .catch(err => {
+        .catch((err) => {
           this.loading = false;
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
@@ -437,7 +437,7 @@ export default {
     },
     // 提交表单
     submit(formName) {
-      this.$refs[formName].validate(valid => {
+      this.$refs[formName].validate((valid) => {
         if (valid) {
           if (!this.option && this.isOpinionRequired === 1) {
             this.$message.warning('请选择输入审批意见');
@@ -479,17 +479,12 @@ export default {
               // nextNodeId: this.form.nextNodeId
             };
             delete params.nextUser;
-            const {
-              fyDoresult,
-              fyeh,
-              download,
-              isCdjxjTaskHandle
-            } = this.configInfo;
+            const { fyDoresult, fyeh, download, isCdjxjTaskHandle } =
+              this.configInfo;
             fyDoresult != 'true' && delete params.showDoresult;
             fyeh != 'true' && delete params.isInHistory;
             !download && delete params.isDownload;
             isCdjxjTaskHandle == 'true' && delete params.noticeType;
-            console.log(params,'aaa')
             util
               .ajax({
                 url: taskReadHtml,
@@ -498,7 +493,7 @@ export default {
                 method: 'post',
                 data: params
               })
-              .then(res => {
+              .then((res) => {
                 const { message, status } = res;
                 this.loading = false;
                 if (status === 'success') {
@@ -508,7 +503,7 @@ export default {
                   this.$message.error(message || '系统错误，请联系管理员！');
                 }
               })
-              .catch(err => {
+              .catch((err) => {
                 this.loading = false;
                 if (err.message && err.message !== 'canceled') {
                   this.$message.error(err.message);
@@ -531,7 +526,7 @@ export default {
         .ajax({
           url: findSysCodes
         })
-        .then(res => {
+        .then((res) => {
           const { status, message } = res;
           this.loading = false;
           if (status === 'success') {
@@ -546,7 +541,7 @@ export default {
             this.toStartTaskRead();
           }
         })
-        .catch(err => {
+        .catch((err) => {
           this.loading = false;
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);

package/packages/flow-group/src/main.vue

@@ -371,6 +371,7 @@
       @startTaskRead="handleTaskRead"
       @success="handleSuccess"
       @save="handleSave"
+      :closeParent="closeParent"
     ></es-flow>
   </div>
 </template>
@@ -410,6 +411,10 @@ export default {
       type: Boolean,
       default: true
     },
+    closeParent: {
+      type: Boolean,
+      default: true
+    },
     appId: String,
     zoom: false
   },

package/packages/main/src/main.vue

@@ -5,7 +5,7 @@
       class="es-main-header"
       :style="{ backgroundImage: headerImg ? 'url(' + headerImg + ')' : '' }"
     >
-     <AsyncComponent
+      <AsyncComponent
         v-if="themeJSON.logo.comp"
         :style="!themeJSON.topNav.comp ? 'width:100%' : ''"
         :key="themeJSON.logo.comp"
@@ -34,7 +34,7 @@
           "
         ></es-menu>
       </div>
-       <AsyncComponent
+      <AsyncComponent
         v-if="themeJSON.topNav.comp"
         :style="!themeJSON.logo.comp ? 'width:100%' : ''"
         :hide="hide"
@@ -83,7 +83,7 @@
             @click="handleClick"
           ></es-handle-user>
         </div>
-         <AsyncComponent
+        <AsyncComponent
           v-if="themeJSON.leftNav.comp"
           :biserial="biserial"
           :newTitle="showNavTitle ? title : false"
@@ -177,7 +177,7 @@
               /></keep-alive>
             </template>
           </div>
-           <AsyncComponent
+          <AsyncComponent
             style="
               position: absolute;
               height: 60px;
@@ -368,7 +368,7 @@ export default {
       type: Boolean,
       default: true
     },
-    isCustomMain:{
+    isCustomMain: {
       type: Boolean,
       default: false
     }
@@ -617,7 +617,7 @@ export default {
       this.customMenu = res;
       this.setMenu(res);
     },
-        //获取主题模板JSON
+    //获取主题模板JSON
     getMainDetail(id) {
       let params = {
         url: mainDetail,
@@ -796,10 +796,10 @@ export default {
       let mainFrameLayout = results.mainFrameLayout;
       if (results.userStyle.layout && this.isCustomMain) {
         this.getMainDetail(results.userStyle.layout);
-      } else if(this.isCustomMain){
+      } else if (this.isCustomMain) {
         this.getMainDetail(mainFrameLayout);
-      }else{
-        this.showDefault = true
+      } else {
+        this.showDefault = true;
       }
     },
     //获取用户配置及信息
@@ -968,18 +968,18 @@ export default {
         }
         if (this.modal === 'subsystem' || this.modal === 'topside') {
           if (this.modal === 'subsystem') {
-             if (this.menuType === 'custom') {
+            if (this.menuType === 'custom') {
               this.subsystem = this.customMenu;
             } else {
               this.subsystem = res;
             }
           } else if (this.modal === 'topside') {
-             if (this.menuType === 'custom') {
+            if (this.menuType === 'custom') {
               this.navs = this.customMenu;
               this.topActive = res[0].id;
             } else {
               this.navs = res;
-            this.topActive = res[0].id;
+              this.topActive = res[0].id;
             }
           }
           if (this.application) {
@@ -998,12 +998,12 @@ export default {
             this.active = this.getFirst(this.menu[0]);
           }
         } else if (this.modal === 'topnav') {
-            if (this.menuType === 'custom') {
+          if (this.menuType === 'custom') {
             this.navs = this.customMenu;
             this.topActive = this.getFirst(res[0]);
           } else {
-           this.navs = res;
-          this.topActive = this.getFirst(res[0]);
+            this.navs = res;
+            this.topActive = this.getFirst(res[0]);
           }
         } else {
           this.menu = res;
@@ -1114,14 +1114,13 @@ export default {
         this.modal === 'topSide'
       ) {
         if (this.modal === 'subsystem' || this.modal === 'subSystem') {
-           if (this.menuType === 'custom') {
+          if (this.menuType === 'custom') {
             this.subsystem = this.customMenu;
             this.sysId = active[0];
           } else {
             this.subsystem = res;
-          this.sysId = active[0];
+            this.sysId = active[0];
           }
-          
         } else if (
           this.modal === 'topnav' ||
           this.modal === 'topNav' ||
@@ -1384,6 +1383,7 @@ export default {
     },
     //跳转页面
     handleJump(page, type, res) {
+      console.log(page);
       if (util.win.location.hash === page) {
         this.refresh = true;
         return;

package/packages/select/src/main.vue

@@ -329,6 +329,8 @@ export default {
             if (sysCode) {
               store.set(sysCode, JSON.parse(JSON.stringify(this.options)));
             }
+          } else {
+            this.$message.error(res.msg);
           }
         })
         .catch((err) => {
@@ -474,7 +476,7 @@ export default {
       return '';
     },
     reload() {
-      this.getData(arguments);
+      this.getData(...arguments);
     },
     handleExpand(data, node) {
       if (this.onExpand) {

package/src/index.js

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