cloud-web-corejs 1.0.258 → 1.0.259

package/src/views/bd/setting/request_async_setting/list.vue

@@ -40,7 +40,7 @@
                     type="text"
                     status="primary"
                     plain
-                    >{{ $t1("重置") }}
+                    >{{ $t1("刷新") }}
                   </vxe-button>
                   <vxe-button
                     status="warning"

package/src/views/bd/setting/request_setting/list.vue

@@ -38,7 +38,7 @@
                     type="text"
                     status="primary"
                     plain
-                    >{{ $t1("重置") }}
+                    >{{ $t1("刷新") }}
                   </vxe-button>
                   <vxe-button
                     status="warning"

package/src/views/bd/setting/table_model/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/bd/setting/table_model/list.vue

@@ -98,7 +98,7 @@
                       type="text"
                       status="primary"
                       plain
-                      >{{ $t1("重置") }}
+                      >{{ $t1("刷新") }}
                     </vxe-button>
                     <vxe-button
                       status="warning"

package/src/views/bd/setting/table_model/zdDialog.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/access_log/list.vue

@@ -62,7 +62,7 @@
                       type="text"
                       status="primary"
                       plain
-                      >{{ $t1("重置") }}
+                      >{{ $t1("刷新") }}
                     </vxe-button>
                     <vxe-button
                       status="warning"

package/src/views/user/access_log/list2.vue

@@ -42,7 +42,7 @@
                                 @click="showAdvancedSearch = true">{{ $t1('高级筛选') }}
                     </vxe-button>
                     <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/api_request/list.vue

@@ -21,7 +21,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/area/dialog.vue

@@ -168,7 +168,7 @@
                       type="text"
                       status="primary"
                       plain
-                      >{{ $t1("重置") }}
+                      >{{ $t1("刷新") }}
                     </vxe-button>
                     <vxe-button
                       status="warning"

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

@@ -38,7 +38,7 @@
                     type="text"
                     status="primary"
                     plain
-                    >{{ $t1("重置") }}
+                    >{{ $t1("刷新") }}
                   </vxe-button>
                   <vxe-button
                     status="warning"

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

@@ -53,7 +53,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/bill_setting/userDialog.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/code_rules/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/commMenu/index.vue

@@ -278,10 +278,10 @@ export default {
         if (route.linkType == 4) {
           this.jumpOutLink(route)
         } else if (route.linkType == 3) {
-          this.$router.push({path: route.path, query: {url: route.outLink}});
+          this.$openView({path: route.path, query: {url: route.outLink}}, route);
         } else {
           // this.jumpTo(route, firstRow)
-          this.$router.push(route.path);
+          this.$openView(route.path, route);
         }
       } catch (e) {
         console.error(e);

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

@@ -20,7 +20,7 @@
               class="is-pointer"
             >
               <template #form>
-                <div style="margin-bottom: 8px;" class="clearfix">
+                <div style="margin-bottom: 8px;" class="clearfix screen-btns">
                   <div class="fl">
                     <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog">
                       {{ $t1('新增属性名') }}
@@ -28,7 +28,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/common_script/list.vue

@@ -53,7 +53,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/company_info/dialog.vue

@@ -34,7 +34,7 @@
                 type="text"
                 status="primary"
                 plain
-                >{{ $t1("重置") }}
+                >{{ $t1("刷新") }}
               </vxe-button>
               <vxe-button
                 status="warning"

package/src/views/user/country/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/country/list.vue

@@ -19,7 +19,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/data_type_setting/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/extend_datasource/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('搜索') }}
@@ -51,6 +51,7 @@
                 <el-select v-model="formData.dsType" clearable>
                   <el-option :value="0" label="mysql"></el-option>
                   <el-option :value="1" label="oracle"></el-option>
+						      <el-option :value="2" label="doris"></el-option>
                 </el-select>
               </template>
             </vxe-form-item>
@@ -156,6 +157,8 @@ export default {
                   return 'mysql';
                 } else if (row.dsType === 1) {
                   return 'oracle';
+                } else if (row.dsType === 2) {
+                  return 'doris';
                 }
               }
             }

package/src/views/user/extend_datasource/edit.vue

@@ -61,11 +61,12 @@
                 <em class="f-red">*</em>
                 {{ $t1('数据源类型') }}
               </th>
-              <td>
+              <td colspan="3">
                 <el-form-item prop="dsType" :rules="[{ required: true, trigger: 'blur' }]">
                   <el-radio-group v-model="dataSource.dsType">
                     <el-radio :label="0">mysql</el-radio>
                     <el-radio :label="1">oracle</el-radio>
+                    <el-radio :label="2">doris</el-radio>
                   </el-radio-group>
                 </el-form-item>
               </td>

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

@@ -24,7 +24,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('搜索') }}
@@ -48,6 +48,7 @@
                     <el-select v-model="formData.dsType" clearable>
                       <el-option :value="0" label="mysql"></el-option>
                       <el-option :value="1" label="oracle"></el-option>
+                      <el-option :value="2" label="doris"></el-option>
                     </el-select>
                   </template>
                 </vxe-form-item>
@@ -133,6 +134,8 @@ export default {
                   return 'mysql';
                 } else if (row.dsType === 1) {
                   return 'oracle';
+                } else if (row.dsType === 2) {
+                  return 'doris';
                 }
               }
             }

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

@@ -51,7 +51,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/field_values_invisible/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/file_type/list.vue

@@ -31,7 +31,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/file_view_area/list.vue

@@ -28,7 +28,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/file_view_ins/list.vue

@@ -219,6 +219,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>
         </div>
       </el-dialog>
     </div>
@@ -230,6 +239,7 @@
 import ElImageViewer from "@base/components/VabUpload/image-viewer";
 import {treeScollx} from "@base/utils/global";
 import propertiesDialog from './propertiesDialog';
+import { loadViewComponent } from "@base/utils/resolveViewComponent";
 
 export default {
   name: 'file_view_ins:list',
@@ -340,6 +350,7 @@ export default {
       showWfDialog: false,
       showWfContent: true,
       wfContent: null,
+      remoteView: null,
       wfDataId: '',
     };
   },
@@ -860,7 +871,17 @@ 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);
+      this.remoteView =
+        res.kind === "remote"
+          ? {
+              owner: res.owner,
+              targetPath: res.targetPath,
+              bizParams: { _dataId: this.wfDataId },
+              viewMeta: { visibleKey: "showWfContent", defaultShowWfContent: true, viewType: 1 },
+            }
+          : null;
+      this.wfContent = res.component;
     },
   }
 };

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

@@ -146,6 +146,9 @@ export default {
     return {
       activeName: "second",
       showEdit: false,
+      // 「上一单/下一单」翻单：非多标签(常规页签)模式的导航快照
+      firstNavRows: null,
+      firstNavIndex: -1,
       formJson: { formConfig: {} },
       formConfig: {},
       showRender: false,
@@ -309,6 +312,9 @@ export default {
             formCode,
             tabLabelField,
             tabName: formCode + dataId,
+            // 翻单快照：随页签保存，供 getActiveBillNavState 读取
+            navRows: option?.navRows || null,
+            navIndex: option?.navIndex ?? -1,
           },
         });
       } else {
@@ -318,6 +324,9 @@ export default {
         this.showEditDialog = true;
         this.param = param;
         this.formData = null;
+        // 常规页签(非多标签)模式记录翻单快照；新增也记录(navIndex=-1),保存后插入序列首位
+        this.firstNavRows = option?.navRows || null;
+        this.firstNavIndex = dataId ? option?.navIndex ?? -1 : -1;
         this.$openEditView("showEdit");
       }
     },
@@ -349,7 +358,61 @@ export default {
     },
     reload(...args) {
       this.formData = {};
-      this.$reloadHandle(...args);
+      let reloadTask = this.$reloadHandle(...args);
+      // 常规模式新增保存:把新单插入翻单序列首位(navIndex=-1 表示当前为新增未定位)
+      let param = args[1];
+      let newId = param && param.updateParam ? param.updateParam.dataId : null;
+      if (newId && Array.isArray(this.firstNavRows) && this.firstNavIndex === -1) {
+        this.firstNavRows = [{ id: newId }, ...this.firstNavRows];
+        this.firstNavIndex = 0;
+      }
+      return reloadTask;
+    },
+    // ===== 上一单/下一单：宿主 API，供详情表单 detail-item 的按钮区调用 =====
+    // 返回当前活动详情的翻单快照 {rows, index} —— 兼容多标签页签与常规「first」页签；无快照返回 null。
+    getActiveBillNavState() {
+      let activeName = this.activeName;
+      // 常规「first」页签
+      if (activeName === "first") {
+        if (
+          this.dataId &&
+          Array.isArray(this.firstNavRows) &&
+          this.firstNavRows.length > 0
+        ) {
+          return { rows: this.firstNavRows, index: this.firstNavIndex };
+        }
+        return null;
+      }
+      // 多标签动态编辑页签
+      let xTabs = this.$refs.xTabs;
+      let tab = xTabs && xTabs.tabs.find((t) => t.tabName === activeName);
+      if (tab && Array.isArray(tab.navRows) && tab.navRows.length > 0) {
+        return { rows: tab.navRows, index: tab.navIndex ?? -1, tab };
+      }
+      return null;
+    },
+    // 翻单：step = -1 上一单 / +1 下一单，把当前活动详情刷新到相邻单据。
+    navigateActiveBill(step) {
+      let state = this.getActiveBillNavState();
+      if (!state) return;
+      let idx = state.index + step;
+      if (idx < 0 || idx >= state.rows.length) return; // 到边界不循环
+      let newRow = state.rows[idx];
+      if (!newRow || !newRow.id) return;
+      if (state.tab) {
+        // 多标签模式
+        let tab = state.tab;
+        tab.navIndex = idx;
+        tab.data = newRow; // 页签标题取 tab.data[tabLabelField]，随之更新
+        tab.dataId = newRow.id; // 表单不 watch dataId，靠下方重挂载取数
+        this.$refs.xTabs.reloadTabContent(null, null, tab);
+      } else {
+        // 常规「first」页签模式
+        this.firstNavIndex = idx;
+        this.dataId = newRow.id;
+        this.formData = null;
+        this.$openEditView("showEdit"); // toggle 重挂载 → 按新 dataId getOne
+      }
     },
     reload2() {
       this.formData = {};

package/src/views/user/groups/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/groups/list.vue

@@ -21,7 +21,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/home/default.vue

@@ -565,11 +565,11 @@ export default {
       } else if (route.type == 3) {
         let menuCode = route.menuCode;
         let path = "/user/outLink/index/" + menuCode;
-        this.$router.push({ path: path, query: { url: route.url } });
+        this.$openView({ path: path, query: { url: route.url } }, route);
       } else {
         let path = this.getPath(route);
         if (!path) return;
-        this.$router.push(path);
+        this.$openView(path, route);
       }
     },
     getPath(route3) {