cloud-web-corejs 1.0.258 → 1.0.260

package/src/views/user/user/form_dialog.vue

@@ -27,7 +27,7 @@
           <div class="clearfix screen-btns">
             <div class="fr">
               <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                          plain>{{ $t1('重置') }}
+                          plain>{{ $t1('刷新') }}
               </vxe-button>
               <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">
                 {{ $t1('搜索') }}

package/src/views/user/user/form_list.vue

@@ -26,7 +26,7 @@
                 </template>
                 <template #buttonRight>
                   <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                              plain>{{ $t1('重置') }}
+                              plain>{{ $t1('刷新') }}
                   </vxe-button>
                   <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">
                     {{ $t1('搜索') }}

package/src/views/user/user/list.vue

@@ -84,7 +84,7 @@
                       type="text"
                       status="primary"
                       plain
-                      >{{ $t1("重置") }}
+                      >{{ $t1("刷新") }}
                     </vxe-button>
                     <vxe-button
                       status="warning"
@@ -111,7 +111,7 @@ import { treeScollx } from "@base/utils/global.js";
 import tableForm from "@base/components/table/tableForm";
 
 export default {
-  name: "user:form_list",
+  name: "user:list",
   props: {
     userType: {
       type: Number,

package/src/views/user/user_log_classify/list.vue

@@ -20,7 +20,7 @@
                 </div>
                 <div class="fr">
                   <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                              plain>{{ $t1('重置') }}
+                              plain>{{ $t1('刷新') }}
                   </vxe-button>
                   <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">
                     {{ $t1('搜索') }}

package/src/views/user/wf/iframe/index.vue

@@ -13,6 +13,7 @@
 </template>
 
 <script>
+import { loadViewComponent } from "@base/utils/resolveViewComponent";
 export default {
   data() {
     return {
@@ -36,7 +37,11 @@ export default {
       this.wfDataId = !id || typeof id == 'object' ? 0 : id;
       // this.showWfDialog = true;
       this.showWfContent = true;
-      this.wfContent = require('@/views' + url).default;
+      let res = loadViewComponent(url);
+      if (res.kind === "remote") {
+        this.$message({ message: "该单据归属子应用 " + res.owner + "，请从对应入口打开", type: "warning" });
+      }
+      this.wfContent = res.component;
 
     }
   }

package/src/views/user/wf/iframe/index2.vue

@@ -12,6 +12,7 @@
 </template>
 
 <script>
+import { loadViewComponent } from "@base/utils/resolveViewComponent";
 export default {
   data() {
     return {
@@ -34,7 +35,11 @@ export default {
       }
       let url = purl + '.vue';
       this.showWfContent = true;
-      this.wfContent = require('@/views' + url).default;
+      let res = loadViewComponent(url);
+      if (res.kind === "remote") {
+        this.$message({ message: "该单据归属子应用 " + res.owner + "，请从对应入口打开", type: "warning" });
+      }
+      this.wfContent = res.component;
 
     },
     login() {

package/src/views/user/wf/wfReport/index.vue

@@ -99,7 +99,7 @@
         @click="resetEvent"
         icon="el-icon-brush"
       >
-        {{ $t1("重置") }}
+        {{ $t1("刷新") }}
       </el-button>
       <el-button
         type="warning"
@@ -163,7 +163,7 @@
                   </div>
                   <div class="fr">
                     <!-- <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                                plain>{{ $t1('重置') }}
+                                plain>{{ $t1('刷新') }}
                     </vxe-button>
                     <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">
                       {{ $t1('搜索') }}
@@ -520,6 +520,10 @@ export default {
   background: none;
   padding: 10px 0 0;
   box-shadow: none;
+  display:flex;flex-direction: column;
+  > .el-row{flex:1;
+    > .el-col{height:100%;}
+  }
 }
 .filter-btns {
   .f-btn {
@@ -580,12 +584,13 @@ export default {
   }
 }
 ::v-deep .box-style1 {
-  margin: 10px 5px 0;
+  margin: 10px 5px 0;height:calc(100% - 10px);display:flex;flex-direction:column;
   .el-card__body {
-    height: calc(100vh - 254px);
+    flex:1;min-height:0;
   }
 }
 .node-box {
+  height:100%;overflow:auto;display:flex;flex-direction: column;
   .info {
     border: solid 1px #e6ebf5;
     background: #f6faff;
@@ -602,18 +607,19 @@ export default {
       position: absolute;
       right: 12px;
       top: 50%;
-      margin-top: -14px;
+      margin-top: -14px !important;
     }
     .tit {
       font-size: 13px;
       color: #212121;
       margin-bottom: 5px;
+      margin-top:0;
     }
   }
   .el-steps {
-    height: calc(100vh - 326px);
     overflow: auto;
     padding-right: 10px;
+    flex:1;
   }
 }
 </style>

package/src/views/user/wf/wf_auto_submit_data/list.vue

@@ -44,7 +44,7 @@
                   </div>
                   <div class="fr">
                     <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                                plain>{{ $t1('重置') }}
+                                plain>{{ $t1('刷新') }}
                     </vxe-button>
                     <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">
                       {{ $t1('搜索') }}
@@ -147,7 +147,7 @@
                     <div class="fr">
                       <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent2" type="text"
                                   status="primary"
-                                  plain>{{ $t1('重置') }}
+                                  plain>{{ $t1('刷新') }}
                       </vxe-button>
                       <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent2">
                         {{ $t1('搜索') }}

package/src/views/user/wf/wf_manage/list.vue

@@ -12,6 +12,15 @@
           :_viewType="1"
           @reload="$reloadHandle"
         ></component>
+        <micro-view-host
+          v-else-if="showWfContent && remoteView"
+          :owner="remoteView.owner"
+          :target-path="remoteView.targetPath"
+          :biz-params="remoteView.bizParams"
+          :view-meta="remoteView.viewMeta"
+          @reload="$reloadHandle"
+          @close="showWfContent = false"
+        ></micro-view-host>
       </el-tab-pane>
       <el-tab-pane :label="$t1('我的流程')" name="second">
         <div class="tree-box fl">
@@ -49,7 +58,10 @@
                 <div class="clearfix screen-btns">
                   <div class="fl">
                     <base-table-export
-                      :option="{ title: $t1('流程待办导出'), targetRef: 'table-m1' }"
+                      :option="{
+                        title: $t1('流程待办导出'),
+                        targetRef: 'table-m1',
+                      }"
                       :parent-target="_self"
                     />
                   </div>
@@ -61,7 +73,7 @@
                       type="text"
                       status="primary"
                       plain
-                      >{{ $t1("重置") }}
+                      >{{ $t1("刷新") }}
                     </vxe-button>
                     <vxe-button
                       status="warning"
@@ -84,15 +96,26 @@
                 >
                   <vxe-form-item :title="$t1('待办类型') + ':'">
                     <template v-slot>
-                      <el-input v-model="checkNodeData.label" size="small" disabled />
+                      <el-input
+                        v-model="checkNodeData.label"
+                        size="small"
+                        disabled
+                      />
                     </template>
                   </vxe-form-item>
                   <vxe-form-item :title="$t1('流程主题') + ':'" field="name">
                     <template v-slot>
-                      <el-input v-model="formData.name" size="small" clearable />
+                      <el-input
+                        v-model="formData.name"
+                        size="small"
+                        clearable
+                      />
                     </template>
                   </vxe-form-item>
-                  <vxe-form-item :title="$t1('单据类型') + ':'" field="objTypeName">
+                  <vxe-form-item
+                    :title="$t1('单据类型') + ':'"
+                    field="objTypeName"
+                  >
                     <template v-slot>
                       <el-input
                         class="search-input"
@@ -116,15 +139,31 @@
                   <vxe-form-item :title="$t1('流程状态') + ':'" field="stat">
                     <template v-slot>
                       <el-select v-model="formData.stat" clearable>
-                        <el-option :value="1" :label="$t1('审核中')"></el-option>
-                        <el-option :value="2" :label="$t1('已完成')"></el-option>
-                        <el-option :value="3" :label="$t1('已驳回')"></el-option>
+                        <el-option
+                          :value="1"
+                          :label="$t1('审核中')"
+                        ></el-option>
+                        <el-option
+                          :value="2"
+                          :label="$t1('已完成')"
+                        ></el-option>
+                        <el-option
+                          :value="3"
+                          :label="$t1('已驳回')"
+                        ></el-option>
                       </el-select>
                     </template>
                   </vxe-form-item>
-                  <vxe-form-item :title="$t1('启动人') + ':'" field="starterName">
+                  <vxe-form-item
+                    :title="$t1('启动人') + ':'"
+                    field="starterName"
+                  >
                     <template v-slot>
-                      <el-input v-model="formData.starterName" size="small" clearable />
+                      <el-input
+                        v-model="formData.starterName"
+                        size="small"
+                        clearable
+                      />
                     </template>
                   </vxe-form-item>
                   <vxe-form-item title="启动时间:">
@@ -136,7 +175,9 @@
                         size="small"
                         clearable
                         value-format="yyyy-MM-dd HH:mm:ss"
-                        :picker-options="$baseStartPickerOptions(formData.endTime)"
+                        :picker-options="
+                          $baseStartPickerOptions(formData.endTime)
+                        "
                       ></el-date-picker>
                       <span>-</span>
                       <el-date-picker
@@ -147,7 +188,9 @@
                         clearable
                         value-format="yyyy-MM-dd HH:mm:ss"
                         default-time="23:59:59"
-                        :picker-options="$baseEndPickerOptions(formData.startTime)"
+                        :picker-options="
+                          $baseEndPickerOptions(formData.startTime)
+                        "
                       ></el-date-picker>
                     </template>
                   </vxe-form-item>
@@ -169,7 +212,10 @@
               <div class="clearfix screen-btns">
                 <div class="fl">
                   <base-table-export
-                    :option="{ title: $t1('流程待办导出'), targetRef: 'table-m2' }"
+                    :option="{
+                      title: $t1('流程待办导出'),
+                      targetRef: 'table-m2',
+                    }"
                     :parent-target="_self"
                   />
                   <el-button
@@ -187,7 +233,7 @@
                     type="text"
                     status="primary"
                     plain
-                    >{{ $t1("重置") }}
+                    >{{ $t1("刷新") }}
                   </vxe-button>
                   <vxe-button
                     status="warning"
@@ -213,7 +259,10 @@
                     <el-input v-model="formData2.name" size="small" clearable />
                   </template>
                 </vxe-form-item>
-                <vxe-form-item :title="$t1('单据类型') + ':'" field="objTypeName">
+                <vxe-form-item
+                  :title="$t1('单据类型') + ':'"
+                  field="objTypeName"
+                >
                   <template v-slot>
                     <el-input
                       class="search-input"
@@ -243,9 +292,16 @@
                     </el-select>
                   </template>
                 </vxe-form-item>
-                <vxe-form-item :title="$t1('当前任务用户') + ':'" field="candidateNames">
+                <vxe-form-item
+                  :title="$t1('当前任务用户') + ':'"
+                  field="candidateNames"
+                >
                   <template v-slot>
-                    <el-input v-model="formData2.candidateNames" size="small" clearable />
+                    <el-input
+                      v-model="formData2.candidateNames"
+                      size="small"
+                      clearable
+                    />
                   </template>
                 </vxe-form-item>
                 <vxe-form-item :title="$t1('禁用用户流程') + ':'">
@@ -368,6 +424,7 @@
 import { treeScollx } from "@base/utils/global.js";
 import wfObjConfigDialog from "../../../../views/user/wf/wf_obj_config/dialog.vue";
 import userDialog from "@base/views/user/user/dialog";
+import { loadViewComponent } from "@base/utils/resolveViewComponent";
 
 export default {
   name: "wf_manage:list",
@@ -401,6 +458,7 @@ export default {
 
       param: {},
       wfContent: null,
+      remoteView: null,
       showWfContent: false,
 
       showCurrentTaskUserDialog: false,
@@ -419,7 +477,9 @@ export default {
   },
   computed: {
     type() {
-      return this.checkNode && this.checkNode.data ? this.checkNode.data.type : "";
+      return this.checkNode && this.checkNode.data
+        ? this.checkNode.data.type
+        : "";
     },
     checkNodeData() {
       return this.checkNode && this.checkNode.data ? this.checkNode.data : {};
@@ -608,17 +668,30 @@ export default {
           _dataId: wfDataId,
         };
         let url = row.url + ".vue";
-        this.wfContent = require("@/views" + url).default;
+        let res = loadViewComponent(url);
+        this.remoteView =
+          res.kind === "remote"
+            ? {
+                owner: res.owner,
+                targetPath: res.targetPath,
+                bizParams: this.param,
+                viewMeta: { visibleKey: "showWfContent", defaultShowWfContent: true, viewType: 1 },
+              }
+            : null;
+        this.wfContent = res.component;
       }
       this.activeName = "first";
       this.$openEditView("showWfContent");
     },
     guid() {
-      return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function (c) {
-        var r = (Math.random() * 16) | 0,
-          v = c == "x" ? r : (r & 0x3) | 0x8;
-        return v.toString(16);
-      });
+      return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(
+        /[xy]/g,
+        function (c) {
+          var r = (Math.random() * 16) | 0,
+            v = c == "x" ? r : (r & 0x3) | 0x8;
+          return v.toString(16);
+        }
+      );
     },
     clearNodeClick() {
       /* this.formData.saleOrgId = '';