cloud-web-corejs 1.1.0-dev.6 → 1.1.0-dev.61

package/src/components/VabUpload/style.scss

@@ -0,0 +1,282 @@
+// Shared upload presentation for VabUpload, xform upload fields and compatible upload views.
+
+div[hideinfo="true"] #uploadImage {
+  &.widgetSize-1 .upload-list {
+    width: 67px !important;
+    height: 67px !important ;
+  }
+  &.widgetSize-2 .upload-list {
+    width: 98px !important;
+    height: 98px !important;
+  }
+  &.widgetSize-3 .upload-list {
+    width: 142px !important;
+    height: 142px !important;
+  }
+  &.widgetSize-4 .upload-list {
+    width: 180px !important;
+    height: 180px !important;
+  }
+  &.widgetSize-5 .upload-list {
+    width: 220px !important;
+    height: 220px !important;
+  }
+}
+#uploadImage {
+  &.widgetSize-1 {
+    .el-upload {
+      //margin-top:5px;
+      .avatar-uploader {
+        height: 58px;
+        width: 58px;
+        line-height: 58px;
+        margin-bottom: 5px;
+      }
+    }
+    .el-upload-list .el-upload-list__item {
+      height: 58px;
+      padding-left: 54px;
+      width: 240px;
+      .el-upload-list__item-thumbnail {
+        width: 54px;
+        height: 54px;
+        margin-left: -54px;
+        .show-video {
+          line-height: 46px;
+          i {
+            margin: 0;
+          }
+        }
+        p {
+          width: 54px;
+          height: 54px;
+          img {
+            max-width: 54px;
+            max-height: 54px;
+          }
+        }
+      }
+      .el-upload-list__item-name {
+        p {
+          &:first-child {
+            -webkit-line-clamp: 1;
+            margin-top: 3px;
+          }
+        }
+      }
+    }
+  }
+  &.widgetSize-2 {
+    .el-upload {
+      //margin-top:5px;
+      .avatar-uploader {
+        height: 100px;
+        width: 100px;
+        line-height: 100px;
+        margin-bottom: 3px;
+      }
+    }
+    //.upload-list{height:98px;} //详情单附件有问题需要开放出来
+    .el-upload-list .el-upload-list__item {
+      height: 100px;
+      padding-left: 98px;
+      width: 298px;
+      .el-upload-list__item-thumbnail {
+        width: 98px;
+        height: 98px;
+        margin-left: -98px;
+        .show-video {
+          line-height: 98px;
+        }
+        p {
+          width: 88px;
+          height: 88px;
+          img {
+            max-width: 88px;
+            max-height: 88px;
+          }
+        }
+      }
+      .el-upload-list__item-name {
+        p {
+          margin-bottom: 4px;
+          &:first-child {
+            max-height: 32px;
+            line-height: 16px;
+          }
+        }
+      }
+    }
+  }
+  &.widgetSize-3 {
+    .el-upload {
+      //margin-top:5px;
+      .avatar-uploader {
+        height: 135px;
+        width: 135px;
+        line-height: 135px;
+        margin-bottom: 5px;
+      }
+    }
+    //.upload-list{height:142px;} //详情单附件有问题需要开放出来
+    .el-upload-list .el-upload-list__item {
+      height: 135px;
+      padding-left: 135px;
+      width: 298px;
+      .el-upload-list__item-thumbnail {
+        width: 130px;
+        height: 130px;
+        margin-left: -135px;
+        .show-video {
+          line-height: 130px;
+        }
+        p {
+          width: 130px;
+          height: 130px;
+          img {
+            max-width: 130px;
+            max-height: 130px;
+          }
+        }
+      }
+      .el-upload-list__item-name {
+        p {
+          margin-bottom: 4px;
+          &:first-child {
+            max-height: 32px;
+            line-height: 16px;
+          }
+        }
+      }
+    }
+  }
+  &.widgetSize-4 {
+    .el-upload {
+      //margin-top:5px;
+      .avatar-uploader {
+        height: 175px;
+        width: 175px;
+        line-height: 175px;
+        margin-bottom: 5px;
+      }
+    }
+    //.upload-list{height:180px;} //详情单附件有问题需要开放出来
+    .el-upload-list .el-upload-list__item {
+      height: 175px;
+      padding-left: 175px;
+      width: 356px;
+      .el-upload-list__item-thumbnail {
+        width: 175px;
+        height: 175px;
+        margin-left: -175px;
+        .show-video {
+          line-height: 175px;
+        }
+        p {
+          width: 170px;
+          height: 170px;
+          img {
+            max-width: 170px;
+            max-height: 170px;
+          }
+        }
+      }
+      .el-upload-list__item-name {
+        p {
+          margin-bottom: 5px;
+          &:first-child {
+            -webkit-line-clamp: 3;
+            max-height: 52px;
+            line-height: 16px;
+          }
+        }
+      }
+    }
+  }
+  &.widgetSize-5 {
+    .el-upload {
+      //margin-top:5px;
+      .avatar-uploader {
+        height: 215px;
+        width: 215px;
+        line-height: 215px;
+        margin-bottom: 5px;
+      }
+    }
+    //.upload-list{height:220px;} //详情单附件有问题需要开放出来
+    .el-upload-list .el-upload-list__item {
+      height: 215px;
+      padding-left: 215px;
+      width: 418px;
+      .el-upload-list__item-thumbnail {
+        width: 213px;
+        height: 213px;
+        margin-left: -215px;
+        .show-video {
+          line-height: 213px;
+        }
+        p {
+          width: 208px;
+          height: 208px;
+          img {
+            max-width: 208px;
+            max-height: 208px;
+          }
+        }
+      }
+      .el-upload-list__item-name {
+        p {
+          margin-bottom: 8px;
+          &:first-child {
+            -webkit-line-clamp: 4;
+            max-height: 68px;
+            line-height: 16px;
+          }
+        }
+      }
+    }
+  }
+  &.widgetSize-6 {
+    .el-upload {
+      // margin-top:5px;
+      .avatar-uploader {
+        height: 245px;
+        width: 245px;
+        line-height: 245px;
+        margin-bottom: 5px;
+      }
+    }
+    //.upload-list{height:245px;}
+    .el-upload-list .el-upload-list__item {
+      height: 245px;
+      padding-left: 245px;
+      width: 468px;
+      .el-upload-list__item-thumbnail {
+        width: 242px;
+        height: 242px;
+        margin-left: -245px;
+        .show-video {
+          line-height: 242px;
+        }
+        p {
+          width: 225px;
+          height: 225px;
+          img {
+            max-width: 225px;
+            max-height: 225px;
+          }
+        }
+      }
+      .el-upload-list__item-name {
+        p {
+          margin-bottom: 8px;
+          &:first-child {
+            -webkit-line-clamp: 4;
+            max-height: 68px;
+            line-height: 16px;
+          }
+        }
+      }
+    }
+  }
+}

package/src/components/VabUpload/view.vue

@@ -177,15 +177,20 @@
     <!-- H5 非图片文件预览：结构与 mobile/wf/content.vue 的流程图预览一致，
          样式走 xform/styles/h5.scss 块 L 的 .pop-box（全屏 fixed + 内部 flex）。
          只在宿主传了 h5Preview 时才会被 openPreview 打开，PC 上永远不渲染。 -->
-    <div class="pop-box" v-if="showFilePreviewDialog">
-      <div>
-        <div class="header-box">
-          <i
-            class="back el-icon-close"
-            @click="showFilePreviewDialog = false"
-          ></i>
-          {{ $t2("文件预览", "components.VabUpload.filePreview") }}
-        </div>
+    <el-dialog
+      title="文件预览"
+      :modal-append-to-body="false"
+      :close-on-click-modal="false"
+      :visible.sync="showFilePreviewDialog"
+      :modal="false"
+      custom-class="dialog-style h5view-dialog"
+      width="100%"
+      top="0px"
+      v-el-drag-dialog
+      v-el-dialog-center
+      :append-to-body	="true"
+      :destroy-on-close="true"
+    >
         <div class="flex">
           <div class="form-box">
             <div class="tit">
@@ -197,21 +202,17 @@
             ></iframe>
           </div>
         </div>
-        <!-- 与流程图预览/任务情况预览同款：底部一个铺满行的「关 闭」。
-             .btn 的 flex:1 由 xform/styles/h5.scss 块 L 给，单个按钮自动占满。 -->
-        <div class="fixed-bottom-btns">
+        <span slot="footer" class="dialog-footer">
           <el-button
             type="primary"
             plain
-            class="btn"
+            class="button-sty"
             icon="el-icon-close"
             @click="showFilePreviewDialog = false"
+            >{{$t2('关 闭', 'system.button.close2')}}</el-button
           >
-            {{ $t2("关 闭", "system.button.close2") }}
-          </el-button>
-        </div>
-      </div>
-    </div>
+        </span>
+      </el-dialog>
   </div>
 </template>
 

package/src/components/baseArea/index.vue

@@ -1322,7 +1322,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "~@/styles/variables.scss";
+@import "~@base/styles/variables.scss";
 
 .base-area {
   width: 100%;
@@ -1593,7 +1593,7 @@ export default {
 </style>
 
 <style lang="scss">
-@import "~@/styles/variables.scss";
+@import "~@base/styles/variables.scss";
 
 /* el-popover 根节点为 inline span，需强制块级铺满 */
 .base-area {

package/src/components/baseInputExport/mixins.js

@@ -1,4 +1,3 @@
-import { getToken } from "../../utils/auth";
 import { openCnPrint } from "../../components/cnPrint/index";
 import { openHiPrint } from "../../components/hiprint/index";
 import { openJdPrint } from "../../components/jdPrint/index";
@@ -7,10 +6,6 @@ import { openVipPrint } from "../../components/vipPrint/index";
 import { openXhsPrint } from "../../components/xhsPrint/index";
 
 let modules;
-let configUtil = {
-  baseUrl: process.env.VUE_APP_BASE_API,
-  getToken,
-};
 
 modules = {
   props: ["parentTarget", "option"],
@@ -390,7 +385,6 @@ modules = {
           realFileName = fileName ? fileName + "-" + row.uuid : row.uuid;
         }
         let fileUrl =
-          configUtil.baseUrl +
           that.option.prefix +
           "/export_ins/download?uuid=" +
           row.uuid +
@@ -413,6 +407,7 @@ modules = {
             a.download = realFileName;
             a.href = blobUrl;
             a.click();
+            setTimeout(() => window.URL.revokeObjectURL(blobUrl), 0);
           },
         });
       }

package/src/components/bizTab/BizTabListPage.vue

@@ -163,33 +163,34 @@ export default {
       return key;
     },
     /**
-     * 打开「详情/编辑」页签。同一单据已开则复用并激活，不重复开。
+     * 打开「详情/编辑」页签。同一单据已开则复用并重新加载，不检查未保存修改。
      * option.navRows / option.navIndex 传了就能用「上一单/下一单」翻单，
      * 一般直接把列表的 fullData 和当前行下标丢进来。
      */
     openDetail(row, param, option) {
       let dataId = row ? row.id : null;
       if (dataId == null || dataId === "") return this.openAdd(param, option);
-      if (!this.hasTab(dataId) && !this.checkTabLimit()) return null;
-      let key = String(dataId);
-      // 这单已经开着、而且里面有没保存的修改：只激活，不重新取数。
-      // openEditTab 的复用分支会 showContent 置 false 再置 true（等于重挂载），
-      // 从列表再点一次就把用户改了半天的内容无声冲掉了。
-      if (this.hasTab(key) && this.isDetailDirty(this.getTab(key))) {
-        this.activeName = key;
-        return key;
-      }
-      this.$refs.xTabs.openEditTab(row, param || null, {
-        tabParam: {
-          tabName: key,
-          tabLabelField: this.titleField,
-          isAdd: false,
-          dataId: dataId,
-          navRows: (option && option.navRows) || null,
-          navIndex: (option && option.navIndex != null) ? option.navIndex : -1,
-          ...((option && option.tabParam) || {}),
-        },
-      });
+      let tab = this.getTabByDataId(dataId);
+      if (!tab && !this.checkTabLimit()) return null;
+      let key = tab ? tab.tabName : this.getAvailableTabName(option?.tabParam?.tabName || dataId);
+      let tabParam = {
+        tabLabelField: this.titleField,
+        navRows: (option && option.navRows) || null,
+        navIndex: (option && option.navIndex != null) ? option.navIndex : -1,
+        ...((option && option.tabParam) || {}),
+        tabName: key,
+        isAdd: false,
+        dataId,
+      };
+      if (tab) {
+        // 已按当前单据定位，直接更新原页签，避免 x-tabs 按 row.id 严格比较时
+        // 把数字/字符串 ID 当成两张单据；tabName 始终保留，详情登记关系不变。
+        Object.assign(tab, { data: row, param: param || null }, tabParam);
+        this.activeName = key;
+        this.refreshTab(tab);
+      } else {
+        this.$refs.xTabs.openEditTab(row, param || null, { tabParam });
+      }
       return key;
     },
 
@@ -215,7 +216,7 @@ export default {
           tab.navIndex = 0;
         }
         // 页签 key(tabName) 仍是当初的合成 id：换掉会连带 el-tab-pane 重建、详情被迫重挂载，
-        // 正好破坏「保存后不刷详情」的设计。重复打开的去重靠 tab.data.id，它已是真单号。
+        // 正好破坏「保存后不刷详情」的设计。重复打开按当前 dataId 去重。
       }
       this.syncTabTitle(tab, info ? info.title : null);
     },
@@ -288,14 +289,28 @@ export default {
      * 翻单会丢掉未保存的修改，所以先过一遍脏数据确认（与关页签同一判据）。
      * @returns {Promise<Boolean>} 是否真的翻了
      */
-    navigateTab(tab, step) {
-      let idx = this.canNavigate(tab, step);
-      if (idx < 0) return Promise.resolve(false);
-      return this.confirmLeaveDetail(tab).then((pass) => {
+    navigateTab(tab, step) {
+      let idx = this.canNavigate(tab, step);
+      if (idx < 0) return Promise.resolve(false);
+      let existing = this.getTabByDataId(tab.navRows[idx].id);
+      if (existing && existing !== tab) {
+        // 与重复打开一致：直接重新加载目标详情，不检查其未保存修改。
+        this.activeName = existing.tabName;
+        this.refreshTab(existing);
+        return Promise.resolve(true);
+      }
+      return this.confirmLeaveDetail(tab).then((pass) => {
         if (!pass) return false;
         // 确认期间可能已经被关掉或翻走了，重新校一次
-        let target = this.canNavigate(tab, step);
-        if (target < 0 || !this.isLiveTab(tab)) return false;
+        let target = this.canNavigate(tab, step);
+        if (target < 0 || !this.isLiveTab(tab)) return false;
+        // 确认期间目标单据可能已从其他入口打开。
+        let existing = this.getTabByDataId(tab.navRows[target].id);
+        if (existing && existing !== tab) {
+          this.activeName = existing.tabName;
+          this.refreshTab(existing);
+          return true;
+        }
         tab.navIndex = target;
         tab.data = tab.navRows[target];
         tab.dataId = tab.data.id; // 详情不 watch dataId，靠下面的重挂载按新单号取数
@@ -338,14 +353,32 @@ export default {
     getTabs() {
       return this.$refs.xTabs ? this.$refs.xTabs.tabs : [];
     },
-    getTab(tabName) {
-      return this.getTabs().find((tab) => tab.tabName === tabName) || null;
-    },
+    getTab(tabName) {
+      return this.getTabs().find((tab) => tab.tabName === tabName) || null;
+    },
+    getTabByDataId(dataId) {
+      if (dataId == null || dataId === "") return null;
+      return this.getTabs().find((tab) => {
+        if (tab.isAdd) return false;
+        const currentId = tab.dataId ?? tab.data?.id;
+        return currentId != null && String(currentId) === String(dataId);
+      }) || null;
+    },
+    getAvailableTabName(preferredName) {
+      const baseName = String(preferredName);
+      let name = baseName;
+      let suffix = 1;
+      // 翻单后旧页签仍占用原名称；列表页签名称也不可复用。
+      while (name === LIST_TAB_NAME || this.getTab(name)) {
+        name = baseName + "_" + suffix++;
+      }
+      return name;
+    },
     isLiveTab(tab) {
       return this.getTabs().indexOf(tab) >= 0;
     },
-    hasTab(dataId) {
-      return this.getTabs().some((tab) => tab.tabName === String(dataId));
+    hasTab(dataId) {
+      return !!this.getTabByDataId(dataId);
     },
     getTabLabel(tab) {
       let label = tab.data ? tab.data[this.titleField] : null;

package/src/components/bizTab/README.md

@@ -94,7 +94,9 @@ this.$refs.bizTab.openAdd(null, { navRows: rows });
 
 内置关闭确认的判定顺序：详情实现了 `isBillDirty()` → 问它；否则只拦「还没保存过的新增页签」。
 
-**未保存的修改在三条路径上都会拦**（都以 `isBillDirty()` 为判据）：关页签要确认；**翻单**要确认（放弃修改才翻）；**从列表重复打开同一单**时若详情是脏的，只激活页签、不重新取数（否则 `openEditTab` 的复用分支会重挂载，把改了半天的内容无声冲掉）。详情没实现 `isBillDirty()` 时后两条不拦。
+**重复打开单据时直接重新加载**：按当前 `dataId` 复用页签，不检查 `isBillDirty()`、不弹确认，未保存的修改会被重新加载的数据覆盖。翻单目标已在其他页签打开时，同样激活并重新加载目标页签，源页签内容保留。关闭页签、在原页签内翻到未打开的单据时，仍按 `isBillDirty()` 判断是否需要放弃修改确认；详情没实现该方法时不拦。
+
+单据查找按当前 `dataId` 匹配（数字与字符串 ID 等价）；`tabName` 是稳定的页签标识，翻单和新增保存时保持不变。`getTab(tabName)` 用于按页签名称查找，`getTabByDataId(dataId)` / `hasTab(dataId)` 用于按当前单据查找。`openDetail()` 返回实际页签名称，可能与单据 ID 不同，应使用返回值激活页签。重新打开翻单前的单据时，会为新页签分配未占用的名称。
 
 #### behavior
 

package/src/components/bizTab/bizBillDetailMixin.js

@@ -43,6 +43,7 @@ import {
   isWfUserRangeEnabled,
   loadWfUserRange,
 } from "@base/components/wf/wfUserRange";
+import { loadWfTransferEnabled } from "@base/components/wf/wfTransferEnabled";
 
 // wf 组件回调 _handleCallback(flag) 的 flag → 页签行为类型
 const WF_FLAG_KIND = {
@@ -185,6 +186,7 @@ export default {
     //预热，点击路径上的 await 直接命中缓存
     loadWfAutoConfirm(this);
     loadWfUserRange(this);
+    loadWfTransferEnabled(this);
     this.checkBillHooks();
     // 登记到宿主：关页签确认要问详情脏没脏、翻单要按 tabName 找回实例
     let host = this.bizTabHost;

package/src/components/code-editor/ace-chrome.scss

@@ -0,0 +1,17 @@
+// Ace editor chrome extracted from the app stylesheet.
+.ace-editor {
+  border: solid 1px #e8e8e8;
+  border-radius: 2px;
+}
+.ace-sqlserver .ace_print-margin {
+  display: none;
+}
+
+.ns-resize-ing {
+  cursor: ns-resize !important;
+  -moz-user-select: none;
+  -webkit-user-select: none;
+  -ms-user-select: none;
+  -khtml-user-select: none;
+  user-select: none;
+}