cloud-web-corejs 1.0.54-dev.725 → 1.0.54-dev.728

package/src/components/xform/mixins/scriptHttp.js

@@ -149,6 +149,9 @@ modules = {
                     let target2 = target1?.$attrs['parent-target'];
                     let target = !target2 ? this : target1;*/
                     let target = formTarget;
+                    // 暴露启动流程所需的 option 与上下文,供 detail-item 声明式渲染启动按钮(替代 DOM 强制注入)
+                    target.wfStartOption = opt2;
+                    target.wfStartCtx = target;
                     initWf.call(target, opt2);
                   }
                 }

package/src/components/xform/utils/util.js

@@ -999,6 +999,9 @@ export function getDefaultFormConfig() {
     wfConfigData: [],
     multiTabEnabled: false,
     multiTabLabelField: null,
+    addTabEnabled: false, // 新增打开独立页签（不走「常规」页签）
+    submitBehavior: "refreshCurrent", // 提交后行为: refreshCurrent(默认,留在详情页) | closeToList
+    billNavEnabled: false, // 详情页签显示「上一单/下一单」翻单按钮
     addFormCode: null,
     addFormName: null,
     wfTheme: null,

package/src/layout/components/AppMain.vue

@@ -90,13 +90,14 @@ export default {
 .app-main {
   /* 45= navbar  45  */
   min-height: calc(100vh - 45px);
+  //height:calc(100vh - 10px);
   width: 100%;
   position: relative;
   overflow: hidden;
 }
 
 .fixed-header + .app-main {
-  padding-top: 33px;
+  padding-top: 32px;
 }
 
 .hasTagsView {

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

@@ -68,7 +68,7 @@
             ></vFormRender>
           </div>
         </el-tab-pane>
-        <template #editTab="{ tab, index, reloadTabContent }">
+        <template #editTab="{ tab }">
           <el-tab-pane
             :key="tab.tabName"
             :label="tab.data[tab.tabLabelField]"
@@ -82,12 +82,7 @@
               :param="tab.param"
               v-if="tab.showContent"
               :parent-target="_self"
-              @reload="
-                (...args) => {
-                  formData = {};
-                  reloadTabContent(...args);
-                }
-              "
+              @reload="(...args) => onEditTabReload(tab, ...args)"
               @openCopyEditTab="openCopyEditTab"
             ></vFormRender>
           </el-tab-pane>
@@ -146,6 +141,9 @@ export default {
     return {
       activeName: "second",
       showEdit: false,
+      // 「上一单/下一单」翻单：非多标签(常规页签)模式的导航快照
+      firstNavRows: null,
+      firstNavIndex: -1,
       formJson: { formConfig: {} },
       formConfig: {},
       showRender: false,
@@ -297,18 +295,36 @@ export default {
 
       let dataId = row && row.id ? row.id : null;
       this.dataId = dataId;
+      let isAdd = !dataId;
       let formCode = null;
-      if (!dataId) {
+      if (isAdd) {
         formCode = option?.formCode || this.addFormCode;
       } else {
         formCode = option?.formCode || this.formCode2;
       }
-      if (multiTabEnabled && dataId) {
-        this.$refs.xTabs.openEditTab(row, param, {
+      // 新增页签门控：需先启用「列表启用详情多标签」，再叠加 addTabEnabled、新增、配了标题字段
+      let addTab =
+        multiTabEnabled && formConfig.addTabEnabled && isAdd && tabLabelField;
+      if ((multiTabEnabled && dataId) || addTab) {
+        // 归一：新增/编辑都走 openEditTab
+        // 新增合成唯一 id，让去重(paneKeyName='id')/tabName/paneName 三者对齐
+        let key = isAdd
+          ? "add_" + Date.now() + "_" + Math.random().toString(36).slice(2, 6)
+          : dataId;
+        let openRow = isAdd
+          ? { ...row, id: key, [tabLabelField]: "新增" }
+          : row;
+        this.$refs.xTabs.openEditTab(openRow, param, {
           tabParam: {
             formCode,
             tabLabelField,
-            tabName: formCode + dataId,
+            tabName: String(key), // el-tabs 的 name 需为 String,dataId 可能是 Number
+            isAdd,
+            // 新增时 dataId 必须为 null，避免 vFormRender 把合成 id 当真实单号去 getOne
+            ...(isAdd ? { dataId: null } : {}),
+            // 翻单快照：新增也带(navIndex=-1),保存后把新单插入序列首位
+            navRows: option?.navRows || null,
+            navIndex: option?.navIndex ?? -1,
           },
         });
       } else {
@@ -318,6 +334,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");
       }
     },
@@ -350,11 +369,145 @@ export default {
     reload(...args) {
       this.formData = {};
       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;
+      }
     },
     reload2() {
       this.formData = {};
       this.$reloadHandle(...arguments);
     },
+    // 逐级解析真实表单的 formDataModel（target 可能是包裹组件，真实表单在内层 vFormRef 上）
+    resolveFormModel(target) {
+      return (
+        (target && target.formDataModel) ||
+        (target && target.$refs && target.$refs.vFormRef
+          ? target.$refs.vFormRef.formDataModel
+          : null) ||
+        (target && target.getFormRef && target.getFormRef()
+          ? target.getFormRef().formDataModel
+          : null) ||
+        {}
+      );
+    },
+    // 应用保存结果到页签「元数据」：升级编辑态 + 同步标题。不含内容重渲染。
+    applyTabSaveResult(tab, dataId, formCode, formModel) {
+      // ① 首次新增保存：就地升级本页签为编辑态
+      if (tab.isAdd && dataId) {
+        tab.data.id = dataId; // 从列表再打开同单号可复用本页签
+        tab.dataId = dataId; // 表单不 watch dataId，此处不会触发内容重载
+        tab.isAdd = false;
+        if (formCode) tab.formCode = formCode;
+        // 新增保存:把新单插入翻单序列首位(新数组,不改动列表原 fullData 引用)
+        if (Array.isArray(tab.navRows)) {
+          tab.navRows = [tab.data, ...tab.navRows];
+          tab.navIndex = 0;
+        }
+      }
+      // ② 同步标题为「标签名称字段」最新值；无值则保持原标题，不回退用单号
+      let labelField = tab.tabLabelField;
+      let labelVal =
+        labelField != null &&
+        formModel &&
+        formModel[labelField] != null &&
+        formModel[labelField] !== ""
+          ? formModel[labelField]
+          : null;
+      if (labelVal != null) {
+        this.$set(tab.data, labelField, labelVal);
+      }
+    },
+    onEditTabReload(tab, target, param) {
+      // 动态页签（新增/编辑）表单保存后回调，tab 直接在作用域内
+      this.formData = {};
+      let dataId =
+        param != null && param.updateParam != null
+          ? param.updateParam.dataId
+          : null;
+      let formCode =
+        param != null && param.updateParam != null
+          ? param.updateParam.formCode
+          : null;
+      this.applyTabSaveResult(tab, dataId, formCode, this.resolveFormModel(target));
+      this.$refs.xTabs.reloadTabContent(target, param, tab); // 重载编辑态（内容重渲染）
+    },
+    // 供「保存并提交」路径调用：只升级当前活动新增页签的元数据，不重渲染详情内容。
+    // 目的：保存成功即升级为编辑态（防止提交失败/取消后重复入库），且不多刷一次详情。
+    promoteActiveAddTab(dataId, formCode, target) {
+      // 常规「first」页签新增(addTabEnabled 关时新增走此)保存后:升级 dataId 为编辑态,
+      // 并把新单插入翻单序列首位,使提交后「刷新当前页签」能显示详情。
+      if (this.activeName === "first") {
+        if (dataId) {
+          this.dataId = dataId;
+          if (formCode) this.formCode1 = formCode;
+          if (Array.isArray(this.firstNavRows) && this.firstNavIndex === -1) {
+            this.firstNavRows = [{ id: dataId }, ...this.firstNavRows];
+            this.firstNavIndex = 0;
+          }
+        }
+        return;
+      }
+      let xTabs = this.$refs.xTabs;
+      if (!xTabs) return;
+      let tab = xTabs.tabs.find((t) => t.tabName === xTabs.activeName);
+      if (!tab) return;
+      this.applyTabSaveResult(tab, dataId, formCode, this.resolveFormModel(target));
+    },
+    // ===== 上一单/下一单：宿主 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 &&
+        !tab.isAdd &&
+        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
+      }
+    },
     initOtherTabList() {
       if (!this.formJson.formConfig.otherTabEnabled) return;
       this.otherTabList = this.formJson.formConfig.otherTabList

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

@@ -2,70 +2,35 @@
   <div id="containt">
     <el-tabs v-model="activeName" class="tab-box">
       <el-tab-pane :label="$t1('常规')" name="first">
-        <editView
-          v-if="showEdit"
-          visible-key="showEdit"
-          :_dataId.sync="dataId"
-          :parent-target="_self"
-          @reload="$reloadHandle"
-        ></editView>
+        <editView v-if="showEdit" visible-key="showEdit" :_dataId.sync="dataId" :parent-target="_self"
+                  @reload="$reloadHandle"></editView>
       </el-tab-pane>
       <el-tab-pane :label="$t1('列表')" name="second">
         <div class="grid-height">
-          <vxe-grid
-            ref="table-m1"
-            v-bind="vxeOption"
-            @resizable-change="$vxeTableUtil.onColumnWitchChange"
-            @custom="$vxeTableUtil.customHandle"
-          >
+          <vxe-grid ref="table-m1" v-bind="vxeOption" @resizable-change="$vxeTableUtil.onColumnWitchChange"
+                    @custom="$vxeTableUtil.customHandle">
             <template #form>
               <div class="clearfix screen-btns">
                 <div class="fl">
-                  <vxe-button
-                    status="primary"
-                    class="button-sty"
-                    icon="el-icon-plus"
-                    @click="openEditDialog"
-                  >
-                    {{ $t1("新增") }}
+                  <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog">
+                    {{ $t1('新增') }}
                   </vxe-button>
-                  <base-table-export
-                    :option="{ title: $t1('岗位导出'), targetRef: 'table-m1' }"
-                    :parent-target="_self"
-                  />
+                  <base-table-export :option="{ title: $t1('岗位导出'), targetRef: 'table-m1'}" :parent-target="_self"/>
                 </div>
                 <div class="fr">
-                  <vxe-button
-                    icon="el-icon-brush"
-                    class="button-sty"
-                    @click="resetEvent"
-                    type="text"
-                    status="primary"
-                    plain
-                    >{{ $t1("重置") }}
+                  <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
+                              plain>{{ $t1('重置') }}
                   </vxe-button>
-                  <vxe-button
-                    status="warning"
-                    icon="el-icon-search"
-                    class="button-sty"
-                    @click="searchEvent"
-                  >
-                    {{ $t1("搜索") }}
+                  <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">
+                    {{ $t1('搜索') }}
                   </vxe-button>
                 </div>
               </div>
-              <vxe-form
-                ref="form"
-                class="screen-box"
-                title-width="92px"
-                title-align="right"
-                :data="formData"
-                @submit="searchEvent"
-                @reset="searchEvent"
-              >
-                <vxe-form-item :title="$t1('岗位名称') + ':'" field="name">
+              <vxe-form ref="form" class="screen-box" title-width="92px" title-align="right" :data="formData"
+                        @submit="searchEvent" @reset="searchEvent">
+                <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="code">
@@ -83,18 +48,18 @@
 </template>
 
 <script>
-import editView from "./edit.vue";
+import editView from './edit.vue';
 
 export default {
-  name: "position:list",
-  components: { editView },
+  name: 'position:list',
+  components: {editView},
   data() {
     return {
-      activeName: "second",
+      activeName: 'second',
       dataId: 0,
       showEdit: false,
       vxeOption: {},
-      formData: {},
+      formData: {}
     };
   },
   mounted() {
@@ -102,85 +67,85 @@ export default {
   },
   methods: {
     searchEvent() {
-      this.$refs["table-m1"].commitProxy("reload");
+      this.$refs['table-m1'].commitProxy('reload');
     },
     resetEvent() {
       this.formData = {};
-      this.$refs["table-m1"].commitProxy("reload");
+      this.$refs['table-m1'].commitProxy('reload');
     },
     openEditDialog(id) {
-      this.dataId = !id || typeof id == "object" ? 0 : id;
-      this.activeName = "first";
-      this.$openEditView("showEdit");
+      this.dataId = !id || typeof id == 'object' ? 0 : id;
+      this.activeName = 'first';
+      this.$openEditView('showEdit');
     },
     initTableList() {
       let that = this;
       let tableOption = {
         vue: this,
-        tableRef: "table-m1",
-        tableName: "basic_position_list-mxxxxxx",
-        path: USER_PREFIX + "/position/listCurrentPage",
+        tableRef: 'table-m1',
+        tableName: 'basic_position_list-m2',
+        path: USER_PREFIX + '/position/listCurrentPage',
         param: () => {
           return this.formData;
         },
         columns: [
-          { type: "checkbox", width: 48, resizable: false, fixed: "left" },
+          {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
           {
-            title: this.$t1("岗位名称"),
-            field: "name",
+            title: this.$t1('岗位名称'),
+            field: 'name',
             width: 150,
-            fixed: "left",
+            fixed: 'left'
           },
           /* {
             field: 'code',
             title: this.$t1('岗位编码'),
             width: 250
           }, */
-          { title: this.$t1("所属组织"), field: "companyName", width: 150 },
+          {title: this.$t1('所属组织'), field: 'companyName', width: 150},
           {
-            field: "enabled",
-            title: this.$t1("是否启用"),
+            field: 'enabled',
+            title: this.$t1('是否启用'),
             width: 150,
             slots: {
-              default: ({ row }) => {
+              default: ({row}) => {
                 if (row.enabled) {
                   return [
                     <div class="txt-status">
-                      <span>{this.$t1("启用")}</span>
-                    </div>,
+                      <span>{this.$t1('启用')}</span>
+                    </div>
                   ];
                 } else {
                   return [
                     <div class="txt-status disable">
-                      <span>{this.$t1("禁用")}</span>
-                    </div>,
+                      <span>{this.$t1('禁用')}</span>
+                    </div>
                   ];
                 }
-              },
-            },
+              }
+            }
           },
           {
-            field: "createDate",
-            title: this.$t1("创建时间"),
-            width: 150,
+            field: 'createDate',
+            title: this.$t1('创建时间'),
+            width: 150
           },
           {
-            field: "_createBy",
-            title: this.$t1("创建人"),
-            width: 150,
+            field: '_createBy',
+            title: this.$t1('创建人'),
+            width: 150
           },
           {
-            field: "_modifyBy",
-            title: this.$t1("更新人"),
-            width: 150,
+            field: '_modifyBy',
+            title: this.$t1('更新人'),
+            width: 150
           },
           {
             width: 47,
-            fixed: "right",
-            title: "",
+            fixed: 'right',
+            title: '',
             sortable: false,
             slots: {
-              default: ({ row }) => {
+              default: ({row}) => {
                 return [
                   <div>
                     <a
@@ -190,24 +155,19 @@ export default {
                         this.openEditDialog(row.id);
                       }}
                     >
-                      <el-tooltip
-                        enterable={false}
-                        effect="dark"
-                        content={this.$t1("查看")}
-                        placement="top"
-                        popper-class="tooltip-skin"
-                      >
-                        <i class="el-icon-edit" />
+                      <el-tooltip enterable={false} effect="dark" content={this.$t1('查看')} placement="top"
+                                  popper-class="tooltip-skin">
+                        <i class="el-icon-edit"/>
                       </el-tooltip>
                     </a>
-                  </div>,
+                  </div>
                 ];
-              },
-            },
-          },
-        ],
+              }
+            }
+          }
+        ]
       };
-      this.$vxeTableUtil.initVxeTable(tableOption).then((opts) => {
+      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
         this.vxeOption = opts;
       });
     },
@@ -215,14 +175,14 @@ export default {
       let that = this;
       that.$excelImport({
         prefix: USER_PREFIX,
-        excel: USER_PREFIX + "/excelTemplate/position/position.xlsx",
+        excel: USER_PREFIX + '/excelTemplate/position/position.xlsx',
         multi: false,
-        saveUrl: USER_PREFIX + "/position/save",
+        saveUrl: USER_PREFIX + '/position/save',
         callback: () => {
           that.searchEvent();
-        },
+        }
       });
-    },
-  },
+    }
+  }
 };
 </script>