eoss 0.1.0-alpha.37 → 0.1.0-alpha.39

package/packages/process-rule/src/FormList.vue

@@ -13,6 +13,7 @@
 <script>
 import { loading } from 'eoss/src/utils/util';
 import { ajax } from 'eoss/src/utils/ajax';
+import Message from 'eoss/packages/message';
 
 import EsForm from 'eoss/packages/form';
 export default {
@@ -492,125 +493,139 @@ export default {
       ajax({
         url: this.url,
         params: { id: this.id }
-      }).then((res) => {
-        loadingInstance.close();
-        if (res.rCode === 0) {
-          this.formData = {};
-          if (res.results.issueModule) {
-            this.formData = res.results.issueModule;
-            this.generateTypeStatus = res.results.generateTypeStatus;
-            this.$set(this.formData, 'issueIsTime', '2');
-            this.$set(this.formData, 'isRepeatNow', '2');
-            this.$set(this.formData, 'isEnable', 'true');
-          }
-          // 编辑时
-          if (this.id) {
-            this.formData = res.results.bean;
-            this.formData.modelFillRole = res.results.issueModule.modelFillRole;
-            this.formData.issueIsTime = res.results.issueModule.issueIsTime
-              ? res.results.issueModule.issueIsTime + ''
-              : '2';
-            if (res.results.bean.tableCycle) {
-              if (res.results.bean.tableCycle.includes('季度')) {
+      })
+        .then((res) => {
+          loadingInstance.close();
+          if (res.rCode === 0) {
+            this.formData = {};
+            if (res.results.issueModule) {
+              this.formData = res.results.issueModule;
+              this.generateTypeStatus = res.results.generateTypeStatus;
+              this.$set(this.formData, 'issueIsTime', '2');
+              this.$set(this.formData, 'isRepeatNow', '2');
+              this.$set(this.formData, 'isEnable', 'true');
+            }
+            // 编辑时
+            if (this.id) {
+              this.formData = res.results.bean;
+              this.formData.modelFillRole =
+                res.results.issueModule.modelFillRole;
+              this.formData.issueIsTime = res.results.issueModule.issueIsTime
+                ? res.results.issueModule.issueIsTime + ''
+                : '2';
+              if (res.results.bean.tableCycle) {
+                if (res.results.bean.tableCycle.includes('季度')) {
+                  this.$set(
+                    this.formData,
+                    'quarter',
+                    res.results.bean.tableCycle
+                  );
+                  // this.formData.quarter = res.results.bean.tableCycle;
+                } else if (res.results.bean.tableCycle.includes('半年')) {
+                  // this.formData.year = res.results.bean.tableCycle;
+                  this.$set(this.formData, 'year', res.results.bean.tableCycle);
+                } else if (/\d/i.test(res.results.bean.tableCycle)) {
+                  // this.formData.month = res.results.bean.tableCycle;
+                  this.$set(
+                    this.formData,
+                    'month',
+                    res.results.bean.tableCycle
+                  );
+                }
+              }
+
+              this.formData.years = res.results.bean.years.toString();
+              // if (!this.readOnly) {
+              this.formData.tableNamecode =
+                res.results.issueModule.tableNamecode;
+              // }
+              if (res.results.bean.issueIsTime) {
                 this.$set(
                   this.formData,
-                  'quarter',
-                  res.results.bean.tableCycle
+                  'issueIsTime',
+                  res.results.bean.issueIsTime + ''
                 );
-                // this.formData.quarter = res.results.bean.tableCycle;
-              } else if (res.results.bean.tableCycle.includes('半年')) {
-                // this.formData.year = res.results.bean.tableCycle;
-                this.$set(this.formData, 'year', res.results.bean.tableCycle);
-              } else if (/\d/i.test(res.results.bean.tableCycle)) {
-                // this.formData.month = res.results.bean.tableCycle;
-                this.$set(this.formData, 'month', res.results.bean.tableCycle);
+              }
+              if (res.results.bean.isRepeatNow) {
+                this.$set(
+                  this.formData,
+                  'isRepeatNow',
+                  res.results.bean.isRepeatNow + ''
+                );
+              }
+              if (res.results.bean.companynames) {
+                let nameArr = res.results.bean.companynames
+                  .split(',')
+                  .map((item) => {
+                    return { showname: item };
+                  });
+                let idArr = res.results.bean.companyids
+                  .split(',')
+                  .map((item) => {
+                    return { showid: item };
+                  });
+                let companyArr = nameArr.map((item, i) => {
+                  item.showid = idArr[i].showid;
+                  return item;
+                });
+                // this.formData.singleCompanyArray = companyArr;
+                this.$set(this.formData, 'singleCompanyArray', companyArr);
+              }
+              if (res.results.bean.errorToUser) {
+                let errorToUserArray = [
+                  {
+                    showname: res.results.bean.errorToUser,
+                    showid: res.results.bean.errorToUserId
+                  }
+                ];
+                this.$set(this.formData, 'errorToUserArray', errorToUserArray);
               }
             }
-
-            this.formData.years = res.results.bean.years.toString();
-            // if (!this.readOnly) {
-            this.formData.tableNamecode = res.results.issueModule.tableNamecode;
-            // }
-            if (res.results.bean.issueIsTime) {
-              this.$set(
-                this.formData,
-                'issueIsTime',
-                res.results.bean.issueIsTime + ''
-              );
+            //补发时
+            if (this.reissue) {
+              delete this.formData.singleCompanyArray;
+            }
+            //查看时
+            if (this.readOnly) {
+              this.formData.tableName = {
+                shortName: res.results.bean.tableName,
+                cciValue: res.results.issueModule.tableNamecode
+              };
             }
-            if (res.results.bean.isRepeatNow) {
+            let businessMainList = res.results.businessMainList.map((item) => {
+              return { name: item.businessName, value: item.id };
+            });
+            this.filid = res.results.orgid;
+            this.businessMainList = businessMainList;
+            if (this.businessMainList.length == 1) {
               this.$set(
                 this.formData,
-                'isRepeatNow',
-                res.results.bean.isRepeatNow + ''
+                'businessId',
+                this.businessMainList[0].value
               );
             }
-            if (res.results.bean.companynames) {
-              let nameArr = res.results.bean.companynames
-                .split(',')
-                .map((item) => {
-                  return { showname: item };
-                });
-              let idArr = res.results.bean.companyids.split(',').map((item) => {
-                return { showid: item };
-              });
-              let companyArr = nameArr.map((item, i) => {
-                item.showid = idArr[i].showid;
-                return item;
-              });
-              // this.formData.singleCompanyArray = companyArr;
-              this.$set(this.formData, 'singleCompanyArray', companyArr);
-            }
-            if (res.results.bean.errorToUser) {
-              let errorToUserArray = [
-                {
-                  showname: res.results.bean.errorToUser,
-                  showid: res.results.bean.errorToUserId
-                }
-              ];
-              this.$set(this.formData, 'errorToUserArray', errorToUserArray);
-            }
-          }
-          //补发时
-          if (this.reissue) {
-            delete this.formData.singleCompanyArray;
-          }
-          //查看时
-          if (this.readOnly) {
-            this.formData.tableName = {
-              shortName: res.results.bean.tableName,
-              cciValue: res.results.issueModule.tableNamecode
-            };
-          }
-          let businessMainList = res.results.businessMainList.map((item) => {
-            return { name: item.businessName, value: item.id };
-          });
-          this.filid = res.results.orgid;
-          this.businessMainList = businessMainList;
-          if (this.businessMainList.length == 1) {
-            this.$set(
-              this.formData,
-              'businessId',
-              this.businessMainList[0].value
-            );
-          }
 
-          this.formData.info =
-            '注：\n1、定时下发根据上次成功下发的规则，按报表类型顺次下发\n2、开始填报时间、结束填报时间，按照上次成功下发的报表，增加报表期相应的时间，首次下发则为当前选择的时间\n3、定时下发时间根据设置的时间，增加报表期相应的时间，首次触发定时则为设置的时间，根据实际使用情况可编辑更改';
-        } else {
-          return this.$message.error(res.msg);
-        }
-      });
+            this.formData.info =
+              '注：\n1、定时下发根据上次成功下发的规则，按报表类型顺次下发\n2、开始填报时间、结束填报时间，按照上次成功下发的报表，增加报表期相应的时间，首次下发则为当前选择的时间\n3、定时下发时间根据设置的时间，增加报表期相应的时间，首次触发定时则为设置的时间，根据实际使用情况可编辑更改';
+          } else {
+            return Message.error(res.msg);
+          }
+        })
+        .catch(() => {
+          loadingInstance.close();
+        });
       ajax({
         url: this.org,
         params: { name: 'app_systemdufault_businesscode' }
-      }).then((res) => {
-        if (res.rCode === 0) {
-          this.orgcenter = res.results;
-        } else {
-          return this.$message.error(res.msg);
-        }
-      });
+      })
+        .then((res) => {
+          if (res.rCode === 0) {
+            this.orgcenter = res.results;
+          } else {
+            return Message.error(res.msg);
+          }
+        })
+        .catch(() => {});
     }
   }
 };

package/packages/process-rule/src/companyReportDetail.vue

@@ -25,6 +25,7 @@
 import { companyDetail } from 'eoss/src/config/api';
 import { loading } from 'eoss/src/utils/util';
 import { ajax } from 'eoss/src/utils/ajax';
+import Message from 'eoss/packages/message';
 
 import EsDataTable from 'eoss/packages/data-table';
 export default {
@@ -77,14 +78,18 @@ export default {
       ajax({
         url: this.reportDetailUrl,
         params: this.isActive == 1 ? this.ysbParam : this.wsbParam
-      }).then((res) => {
-        loadingInstance.close();
-        if (res.rCode === 0) {
-          this.detailData = res.results;
-        } else {
-          return this.$message.error(res.msg);
-        }
-      });
+      })
+        .then((res) => {
+          loadingInstance.close();
+          if (res.rCode === 0) {
+            this.detailData = res.results;
+          } else {
+            return Message.error(res.msg);
+          }
+        })
+        .catch(() => {
+          loadingInstance.close();
+        });
     },
     handleTab(val) {
       this.isActive = val;

package/packages/process-rule/src/main.vue

@@ -88,6 +88,7 @@
 import { loading } from 'eoss/src/utils/util';
 import { ajax } from 'eoss/src/utils/ajax';
 import { getStorage } from 'eoss/src/utils/storage';
+import Message from 'eoss/packages/message';
 
 import {
   ruleListJson,
@@ -522,18 +523,22 @@ export default {
         method: 'post',
         url: `/${this.bootName}${ruleUndore}`,
         data: { ids: id }
-      }).then((res) => {
-        loadingInstance.close();
-        if (res.rCode === 0) {
-          this.$message({
-            type: 'success',
-            message: res.msg
-          });
-          this.$refs.detailTable.getData();
-        } else {
-          return this.$message.error(res.msg ? res.msg : '撤回失败');
-        }
-      });
+      })
+        .then((res) => {
+          loadingInstance.close();
+          if (res.rCode === 0) {
+            Message({
+              type: 'success',
+              message: res.msg
+            });
+            this.$refs.detailTable.getData();
+          } else {
+            return Message.error(res.msg ? res.msg : '撤回失败');
+          }
+        })
+        .catch(() => {
+          loadingInstance.close();
+        });
     },
     handleRecall({ handle, row }) {
       switch (handle.text) {
@@ -558,7 +563,7 @@ export default {
     // 补发所选
     reissueSelected() {
       if (!this.multipleSelection || !this.multipleSelection.length) {
-        return this.$message.warning('您未勾选任何信息');
+        return Message.warning('您未勾选任何信息');
       }
       let ids = this.multipleSelection.map((item) => item.id).join(',');
       this.reissueItem(ids);
@@ -569,18 +574,22 @@ export default {
         url: `/${this.bootName}${supplement}`,
         method: 'post',
         data: { ids }
-      }).then((res) => {
-        loadingInstance.close();
-        if (res.rCode === 0) {
-          this.$message({
-            type: 'success',
-            message: res.msg
-          });
-          this.$refs.detailTable.getData();
-        } else {
-          return this.$message.error(res.msg);
-        }
-      });
+      })
+        .then((res) => {
+          loadingInstance.close();
+          if (res.rCode === 0) {
+            Message({
+              type: 'success',
+              message: res.msg
+            });
+            this.$refs.detailTable.getData();
+          } else {
+            return Message.error(res.msg);
+          }
+        })
+        .catch(() => {
+          loadingInstance.close();
+        });
     },
     handleSelectionChange(val) {
       this.multipleSelection = val;
@@ -702,40 +711,50 @@ export default {
           companyid: getStorage('orgId'),
           ...res
         }
-      }).then((res) => {
-        loadingInstance.close();
-        if (res.rCode === 0) {
-          this.show = false;
-          this.row = '';
-          this.$message.success(res.msg);
-          this.$refs.table.getData();
-        } else {
-          return this.$message.error(res.msg);
-        }
-      });
+      })
+        .then((res) => {
+          loadingInstance.close();
+          if (res.rCode === 0) {
+            this.show = false;
+            this.row = '';
+            Message.success(res.msg);
+            this.$refs.table.getData();
+          } else {
+            return Message.error(res.msg);
+          }
+        })
+        .catch(() => {
+          loadingInstance.close();
+        });
     },
     deleteRule(id) {
       this.$confirm('是否删除该规则？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(() => {
-        ajax({
-          method: 'post',
-          url: `/${this.bootName}${deleteRule}`,
-          data: { id: id }
-        }).then((res) => {
-          if (res.rCode === 0) {
-            this.$message({
-              type: 'success',
-              message: res.msg
+      })
+        .then(() => {
+          ajax({
+            method: 'post',
+            url: `/${this.bootName}${deleteRule}`,
+            data: { id: id }
+          })
+            .then((res) => {
+              if (res.rCode === 0) {
+                Message({
+                  type: 'success',
+                  message: res.msg
+                });
+                this.$refs.table.getData();
+              } else {
+                return Message.error(res.msg);
+              }
+            })
+            .catch(() => {
+              loadingInstance.close();
             });
-            this.$refs.table.getData();
-          } else {
-            return this.$message.error(res.msg);
-          }
-        });
-      });
+        })
+        .catch(() => {});
     },
     // closeDialog() {
     //   this.$refs.formList.resetForm();

package/packages/tree/src/tree.vue

@@ -82,7 +82,8 @@ import {
   scrollMove
 } from 'eoss/src/utils/scrollbar';
 import { throttle } from 'throttle-debounce';
-import { error, renderIcon } from 'eoss/src/utils/util';
+import { renderIcon } from 'eoss/src/utils/util';
+import Message from 'eoss/packages/message';
 
 import EsInput from 'eoss/packages/input';
 /**
@@ -922,11 +923,11 @@ export default {
             } else {
               this.nodeData = null;
             }
-            error(res.msg || res.message || '获取树数据失败', null, 2000);
+            Message.error(res.msg || res.message || '获取树数据失败');
           }
         })
         .catch((err) => {
-          error('获取树数据失败', null, 2000);
+          Message.error('获取树数据失败');
           resolve && resolve([]);
         });
     },
@@ -951,12 +952,12 @@ export default {
             if (res.rCode === 0) {
               this.nodeData = res.results;
             } else {
-              error(res.msg || res.message || '获取树数据失败', null, 2000);
+              Message.error(res.msg || res.message || '获取树数据失败');
             }
           })
           .catch((err) => {
             this.loading = false;
-            error('获取树数据失败', null, 2000);
+            Message.error('获取树数据失败');
           });
       } else {
         // 本地搜索时也需要更新滚动条

package/packages/upload/src/index.vue

@@ -202,7 +202,7 @@ import { getStorage } from 'eoss/src/utils/storage';
 import MessageBox from 'eoss/packages/message-box';
 import ImageViewer from 'eoss/packages/image-viewer';
 import { ajax, deleteFile } from 'eoss/src/utils/ajax';
-import { error, getWinTop } from 'eoss/src/utils/util';
+import { getWinTop } from 'eoss/src/utils/util';
 import EsButton from 'eoss/packages/button';
 import {
   getAdjunctProperties,
@@ -217,6 +217,7 @@ import {
   delAdjunct,
   downloadByAdjunctId
 } from 'eoss/src/config/api';
+import Message from 'eoss/packages/message';
 function noop() {}
 
 export default {
@@ -1137,7 +1138,7 @@ export default {
               }
             } else {
               let msg = res.msg || '系统错误，请联系管理员！';
-              error(msg);
+              Message.error(msg);
             }
           })
           .catch((err) => {});

package/packages/wujie/src/wujie.vue

@@ -142,7 +142,9 @@ export default {
 
   watch: {
     /**
-     * 监听 keys 变化，重建子应用实现刷新
+     * 监听 keys 变化，重建子应用实现刷新（点菜单/刷新按钮的统一通道）；
+     * url 变化不单独触发重建：换地址场景（如 fourthTabs）由调用方同时更新 keys，
+     * 避免 url+keys 同变时重建两次
      */
     keys() {
       this.refresh();
@@ -155,6 +157,10 @@ export default {
       bus.$off(this.name);
     }
     this._clearTimer();
+    // 保活模式下沙箱不随组件卸载回收，页签关闭时主动销毁，避免沙箱常驻内存
+    if (this.alive) {
+      this.destroy();
+    }
   },
 
   methods: {

package/src/index.js

@@ -266,7 +266,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.1.0-alpha.37',
+  version: '0.1.0-alpha.39',
   install,
   CollapseTransition,
   Loading,