cloud-web-corejs 1.0.54-dev.787 → 1.0.54-dev.789

package/src/views/bd/project/core/branchContext.js

@@ -0,0 +1,100 @@
+/**
+ * 分支作用域上下文。
+ *
+ * 通用工程/分支工程/数据表管理三组菜单直接复用 bd/setting 下的原页面组件，
+ * 原组件不感知分支，所以由外层壳组件在自身实例上挂一个作用域标记，
+ * 请求注入器沿组件树向上找到该标记后给请求补上 branchFlag / branchCode。
+ */
+
+export const SCOPE_KEY = "__bdBranchScope__";
+
+/** 分支标识:0通用工程 1分支工程 99数据表分类 */
+export const BRANCH_FLAG = {
+  COMMON: 0,
+  BRANCH: 1,
+  DATA_TABLE: 99,
+};
+
+/**
+ * 只有后端 DTO 真正声明了 branchCode/branchFlag 的接口才允许注入，
+ * 否则多余字段会被反序列化拒绝。以路径结尾精确匹配。
+ */
+const INJECT_URLS = [
+  "/menuKind/getAllList",
+  "/menuKind/getChildren",
+  "/menuKind/save",
+  "/menuKind/update",
+
+  "/formTemplate/listPage",
+  "/formTemplate/listOtherPage",
+  "/formTemplate/listPageWf",
+  "/formTemplate/save",
+  "/formTemplate/update",
+  "/formTemplate/updateDesign",
+
+  "/formScript/listPage",
+  "/formScript/listOtherPage",
+  "/formScript/save",
+  "/formScript/update",
+  "/formScript/saves",
+  "/formScript/getServiceName",
+
+  "/szTaMb/listPage",
+  "/szTaMb/listOtherPage",
+  "/szTaMb/save",
+  "/szTaMb/update",
+
+  "/formVersion/listPage",
+  "/form_oplog/listPage",
+  "/form_import_log/listPage",
+];
+
+/**
+ * 脱离组件树创建的实例（$jsonImport 动态弹框等）找不到父链，
+ * 由当前激活的分支页面兜底。
+ */
+let fallbackScope = null;
+
+export function setFallbackScope(scope) {
+  fallbackScope = scope || null;
+}
+
+export function getFallbackScope() {
+  return fallbackScope;
+}
+
+/** 沿 $parent 向上找最近的分支作用域，找不到则用兜底作用域 */
+export function findScope(vm) {
+  let cur = vm;
+  while (cur) {
+    if (cur[SCOPE_KEY]) {
+      return cur[SCOPE_KEY];
+    }
+    cur = cur.$parent;
+  }
+  return fallbackScope;
+}
+
+export function needInject(url) {
+  if (!url) {
+    return false;
+  }
+  let path = url;
+  let qIndex = path.indexOf("?");
+  if (qIndex >= 0) {
+    path = path.substring(0, qIndex);
+  }
+  return INJECT_URLS.some((item) => path.endsWith(item));
+}
+
+/** 作用域转成请求参数：通用工程/数据表管理没有分支编码 */
+export function getScopeParams(scope) {
+  if (!scope) {
+    return null;
+  }
+  let params = { branchFlag: scope.branchFlag };
+  if (scope.branchCode) {
+    params.branchCode = scope.branchCode;
+  }
+  return params;
+}

package/src/views/bd/project/core/branchPage.js

@@ -0,0 +1,78 @@
+import branchScope from "./branchScope";
+import { BRANCH_FLAG } from "./branchContext";
+import branchPageWrap from "./branchPageWrap.vue";
+
+/**
+ * 分支工程页面通用逻辑：
+ * 1. 进入先选分支，选中后再渲染被复用的原组件
+ * 2. 选中后分支锁定，不可再改
+ * 3. 「打开新分支」以独立标签再开一页（需菜单 meta.repeatOpen）
+ */
+let modules = {};
+modules = {
+  components: { branchPageWrap },
+  mixins: [branchScope(BRANCH_FLAG.BRANCH)],
+  data() {
+    return {
+      branchCode: "",
+      branchName: "",
+      // 组件创建时记下原始菜单名，避免 route.meta.title 被改写后叠加多个分支名
+      baseTabTitle: "",
+    };
+  },
+  computed: {
+    branchLabel() {
+      if (!this.branchCode) {
+        return "";
+      }
+      if (this.branchName) {
+        return `${this.branchName}(${this.branchCode})`;
+      }
+      return this.branchCode;
+    },
+  },
+  created() {
+    this.baseTabTitle = this.resolveBaseTabTitle();
+  },
+  methods: {
+    resolveBaseTabTitle() {
+      let matched = this.$route.matched || [];
+      let last = matched[matched.length - 1] || {};
+      // 优先用路由记录上的原始 menuName，勿用可能已被污染的 meta.title
+      return (
+        last.menuName ||
+        this.$route.menuName ||
+        last.meta?.originTitle ||
+        this.$route.meta?.originTitle ||
+        last.meta?.title ||
+        this.$route.meta?.title ||
+        ""
+      );
+    },
+    onBranchChange(branch) {
+      if (!branch || !branch.branchCode) {
+        return;
+      }
+      this.branchCode = branch.branchCode;
+      this.branchName = branch.branchName || "";
+      this.updateTabTitle();
+    },
+    updateTabTitle() {
+      let base = this.baseTabTitle || this.resolveBaseTabTitle();
+      let title = this.branchName
+        ? `${base}-${this.branchName}`
+        : this.branchCode
+          ? `${base}-${this.branchCode}`
+          : base;
+      this.$store.dispatch("tagsView/updateVisitedView2", {
+        view: this.$route,
+        title,
+      });
+    },
+    openNewBranch() {
+      // 带 repeatOpen 的菜单：附带唯一 _rk，新开独立标签回到选分支态
+      this.$openView({ path: this.$route.path }, this.$route);
+    },
+  },
+};
+export default modules;

package/src/views/bd/project/core/branchPageWrap.vue

@@ -0,0 +1,216 @@
+<template>
+  <div class="bd-branch-page" :class="{ 'has-branch': !!branchCode }">
+    <!-- 已选分支：内容区顶部工具条，不可改；提供打开新分支 -->
+    <div class="branch-bar" v-if="branchCode">
+      <span class="branch-locked">
+        <span class="label">{{ $t1("分支") }}:</span>
+        <span class="value">{{ branchLabel || branchCode }}</span>
+      </span>
+      <el-button
+        size="mini"
+        type="primary"
+        plain
+        icon="el-icon-plus"
+        @click="$emit('open-new')"
+      >
+        {{ $t1("打开新分支") }}
+      </el-button>
+    </div>
+    <div class="branch-body" ref="branchBody" v-if="branchCode">
+      <slot></slot>
+    </div>
+    <!-- 未选：先选分支再进入具体页面 -->
+    <div class="branch-empty" v-else>
+      <i class="el-icon-office-building"></i>
+      <p class="tip">{{ $t1("请先选择分支") }}</p>
+      <branchSelect
+        :value="branchCode"
+        :auto-restore="false"
+        @input="$emit('update:branchCode', $event)"
+        @change="$emit('branch-change', $event)"
+      ></branchSelect>
+    </div>
+  </div>
+</template>
+
+<script>
+import branchSelect from "./branchSelect.vue";
+
+const BADGE_CLASS = "bd-branch-detail-badge";
+
+export default {
+  name: "bdBranchPageWrap",
+  components: { branchSelect },
+  props: {
+    branchCode: String,
+    branchLabel: String,
+  },
+  watch: {
+    branchCode() {
+      this.scheduleInjectBadge();
+    },
+    branchLabel() {
+      this.scheduleInjectBadge();
+    },
+  },
+  mounted() {
+    this.scheduleInjectBadge();
+  },
+  beforeDestroy() {
+    this.clearInjectTimer();
+    this.clearBodyObserver();
+  },
+  methods: {
+    clearInjectTimer() {
+      if (this._injectTimer) {
+        clearTimeout(this._injectTimer);
+        this._injectTimer = null;
+      }
+    },
+    clearBodyObserver() {
+      if (this._bodyObserver) {
+        this._bodyObserver.disconnect();
+        this._bodyObserver = null;
+      }
+    },
+    scheduleInjectBadge() {
+      this.clearInjectTimer();
+      this._injectTimer = setTimeout(() => {
+        this.ensureBodyObserver();
+        this.injectDetailBadges();
+      }, 50);
+    },
+    ensureBodyObserver() {
+      let body = this.$refs.branchBody;
+      if (!body || this._bodyObserver) {
+        return;
+      }
+      // 详情页通过 x-tabs 异步挂载，监听后补上分支名
+      this._bodyObserver = new MutationObserver(() => {
+        if (this._injecting) {
+          return;
+        }
+        this.scheduleInjectBadge();
+      });
+      this._bodyObserver.observe(body, { childList: true, subtree: true });
+    },
+    injectDetailBadges() {
+      let body = this.$refs.branchBody;
+      if (!body || !this.branchCode || this._injecting) {
+        return;
+      }
+      this._injecting = true;
+      try {
+        let text = this.$t1("分支") + ":" + (this.branchLabel || this.branchCode);
+        let headers = body.querySelectorAll(".detail-wrap .d-header .fl");
+        headers.forEach((el) => {
+          let badge = el.querySelector("." + BADGE_CLASS);
+          if (!badge) {
+            badge = document.createElement("span");
+            badge.className = BADGE_CLASS;
+            badge.textContent = text;
+            el.appendChild(badge);
+            return;
+          }
+          // 相同文案不要再写，否则会反复触发 MutationObserver 卡死页面
+          if (badge.textContent !== text) {
+            badge.textContent = text;
+          }
+        });
+      } finally {
+        this._injecting = false;
+      }
+    },
+  },
+};</script>
+
+<style lang="scss" scoped>
+.bd-branch-page {
+  position: relative;
+  height: 100%;
+
+  &.has-branch {
+    display: flex;
+    flex-direction: column;
+  }
+
+  .branch-bar {
+    flex: none;
+    display: flex;
+    align-items: center;
+    gap: 12px;
+    margin: 0 10px 8px;
+    padding: 8px 12px;
+    background: #fff;
+    border-radius: 2px;
+    box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
+
+    .branch-locked {
+      display: inline-flex;
+      align-items: center;
+      color: #606266;
+      font-size: 13px;
+
+      .label {
+        margin-right: 6px;
+        color: #909399;
+      }
+
+      .value {
+        max-width: 320px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        font-weight: 500;
+        color: #303133;
+      }
+    }
+  }
+
+  .branch-body {
+    flex: 1;
+    min-height: 0;
+    overflow: hidden;
+  }
+
+  .branch-empty {
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    color: #909399;
+    background-color: #fff;
+    border-radius: 2px;
+    box-shadow: 0 2px 6px rgba(0, 0, 0, 0.04);
+    margin: 0 10px;
+
+    i {
+      font-size: 48px;
+      margin-bottom: 12px;
+      color: #c0c4cc;
+    }
+
+    .tip {
+      margin: 0 0 16px;
+      font-size: 14px;
+    }
+  }
+}
+</style>
+
+<style lang="scss">
+/* 注入到原详情页标题栏，不能用 scoped */
+.bd-branch-detail-badge {
+  display: inline-block;
+  margin-left: 12px;
+  padding: 2px 8px;
+  font-size: 12px;
+  font-weight: 400;
+  line-height: 18px;
+  color: #6386fa;
+  background: #f0f3ff;
+  border-radius: 2px;
+  vertical-align: middle;
+}
+</style>

package/src/views/bd/project/core/branchScope.js

@@ -0,0 +1,44 @@
+import { SCOPE_KEY, setFallbackScope } from "./branchContext";
+import { installBranchHttp } from "./httpBranchPatch";
+
+/**
+ * 壳组件 mixin：在实例上挂分支作用域标记。
+ *
+ * created 早于子组件的 created，保证被复用的原组件发出的第一个请求就带上分支参数；
+ * 请求补丁也在这里安装，无需改动 main.js。
+ *
+ * @param {number} branchFlag 分支标识:0通用工程 1分支工程 99数据表分类
+ */
+export default function branchScope(branchFlag) {
+  return {
+    created() {
+      installBranchHttp();
+      this[SCOPE_KEY] = {
+        branchFlag,
+        branchCode: this.branchCode || null,
+        branchName: this.branchName || null,
+      };
+      setFallbackScope(this[SCOPE_KEY]);
+    },
+    mounted() {
+      setFallbackScope(this[SCOPE_KEY]);
+    },
+    activated() {
+      setFallbackScope(this[SCOPE_KEY]);
+    },
+    deactivated() {
+      setFallbackScope(null);
+    },
+    beforeDestroy() {
+      setFallbackScope(null);
+    },
+    watch: {
+      branchCode(val) {
+        this[SCOPE_KEY].branchCode = val || null;
+      },
+      branchName(val) {
+        this[SCOPE_KEY].branchName = val || null;
+      },
+    },
+  };
+}

package/src/views/bd/project/core/branchSelect.vue

@@ -0,0 +1,106 @@
+<template>
+  <div class="bd-branch-select">
+    <span class="label">{{ $t1("分支") }}:</span>
+    <el-select
+      :value="value"
+      size="small"
+      filterable
+      :placeholder="$t1('请选择分支')"
+      @change="handleChange"
+    >
+      <el-option
+        v-for="item in branches"
+        :key="item.branchCode"
+        :label="item.branchName + '(' + item.branchCode + ')'"
+        :value="item.branchCode"
+      ></el-option>
+    </el-select>
+  </div>
+</template>
+
+<script>
+const STORAGE_KEY = "bdProjectBranchCode";
+
+export default {
+  name: "bdBranchSelect",
+  props: {
+    value: String,
+    // 首次进入时是否自动回填上次选择的分支
+    autoRestore: {
+      type: Boolean,
+      default: true,
+    },
+  },
+  data() {
+    return {
+      branches: [],
+    };
+  },
+  mounted() {
+    this.initData();
+  },
+  methods: {
+    initData() {
+      this.$http({
+        url: USER_PREFIX + "/bd_branch/listPage",
+        method: "post",
+        data: {
+          enabled: true,
+          current: 1,
+          size: 500,
+        },
+        success: (res) => {
+          this.branches = res?.objx?.records || [];
+          this.restore();
+        },
+      });
+    },
+    restore() {
+      if (!this.autoRestore || this.value) {
+        return;
+      }
+      let last = localStorage.getItem(STORAGE_KEY);
+      if (last && this.branches.some((item) => item.branchCode === last)) {
+        this.handleChange(last);
+      }
+    },
+    handleChange(val) {
+      let branchCode = val || "";
+      if (branchCode) {
+        localStorage.setItem(STORAGE_KEY, branchCode);
+      } else {
+        localStorage.removeItem(STORAGE_KEY);
+      }
+      this.$emit("input", branchCode);
+      this.$emit(
+        "change",
+        this.branches.find((item) => item.branchCode === branchCode) || null
+      );
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.bd-branch-select {
+  display: inline-flex;
+  align-items: center;
+
+  .label {
+    margin-right: 6px;
+    color: #666;
+    white-space: nowrap;
+  }
+
+  /* 覆盖全局 .el-select{display:block} / .el-input{width:148px}，避免框体和内层宽度不一致 */
+  ::v-deep .el-select {
+    display: inline-block;
+    width: 180px;
+
+    .el-input,
+    .el-input__inner {
+      width: 100% !important;
+    }
+  }
+}
+</style>

package/src/views/bd/project/core/httpBranchPatch.js

@@ -0,0 +1,58 @@
+import Vue from "vue";
+import { findScope, getScopeParams, needInject } from "./branchContext";
+
+/**
+ * 给 Vue.prototype.$http 追加分支参数。
+ *
+ * $commonHttp 内部也是转调 this.$http，vxe 表格代理、$jsonExport、表单设计器保存、
+ * 版本回滚等全部走这一个出口，所以只需要在这里包一层就能覆盖所有请求点，
+ * 不必改动 bd/setting 下的任何原文件。
+ */
+
+let patched = false;
+
+/** 调用方已显式指定分支参数时以调用方为准（如分支定义里固定查通用分类） */
+function merge(data, params) {
+  let next = { ...(data || {}) };
+  Object.keys(params).forEach((key) => {
+    if (next[key] === undefined || next[key] === null) {
+      next[key] = params[key];
+    }
+  });
+  return next;
+}
+
+export function installBranchHttp() {
+  if (patched) {
+    return;
+  }
+  const origin = Vue.prototype.$http;
+  // $http 由 utils/vab.js 在启动时安装，此处尚未就绪则不标记已打补丁，留待下次调用
+  if (typeof origin !== "function") {
+    return;
+  }
+  patched = true;
+
+  const wrapped = function (option) {
+    let scope = findScope(this);
+    let params = needInject(option && option.url) ? getScopeParams(scope) : null;
+    if (!params) {
+      return origin.apply(this, arguments);
+    }
+    let data = option.data;
+    let nextData;
+    if (Array.isArray(data)) {
+      // /formScript/saves 的 body 是 DTO 数组，需要逐项补参数
+      nextData = data.map((item) => merge(item, params));
+    } else {
+      nextData = merge(data, params);
+    }
+    return origin.call(this, { ...option, data: nextData });
+  };
+
+  // request.js 在 $http 上挂了额外属性（如取消、拦截相关），透传出去
+  Object.assign(wrapped, origin);
+  wrapped.prototype = origin.prototype;
+
+  Vue.prototype.$http = wrapped;
+}

package/src/views/bd/project/datatable/menu_kind/list.vue

@@ -0,0 +1,15 @@
+<template>
+  <baseList></baseList>
+</template>
+
+<script>
+import branchScope from "../../core/branchScope";
+import { BRANCH_FLAG } from "../../core/branchContext";
+import baseList from "@base/views/bd/setting/menu_kind/list.vue";
+
+export default {
+  name: "dt_menu_kind:list",
+  components: { baseList },
+  mixins: [branchScope(BRANCH_FLAG.DATA_TABLE)],
+};
+</script>

package/src/views/bd/project/datatable/table_model/list.vue

@@ -0,0 +1,15 @@
+<template>
+  <baseList></baseList>
+</template>
+
+<script>
+import branchScope from "../../core/branchScope";
+import { BRANCH_FLAG } from "../../core/branchContext";
+import baseList from "@base/views/bd/setting/table_model/list.vue";
+
+export default {
+  name: "dt_table_model:list",
+  components: { baseList },
+  mixins: [branchScope(BRANCH_FLAG.DATA_TABLE)],
+};
+</script>

package/src/views/bd/setting/form_template/formDesignerDialog.vue

@@ -17,6 +17,7 @@
         <designer
           ref="designer"
           :formCode.sync="formCode"
+          :id="formTemplate && formTemplate.id"
           @reflushTemplateList="reflushTemplateList"
           :readonly="readonly"
           :historyFlag="historyFlag"

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

@@ -1,6 +1,6 @@
 <template>
   <div id="containt">
-    <x-tabs ref="xTabs" v-model="activeName" class="tab-box" paneKeyName="formCode">
+    <x-tabs ref="xTabs" v-model="activeName" class="tab-box" paneKeyName="id">
       <el-tab-pane :label="$t1('常规')" name="first">
         <editView
           v-if="showEdit"
@@ -201,7 +201,7 @@
         <el-tab-pane
           :key="tab.data.id"
           :label.sync="tab.data.formName"
-          :name="tab.data.formCode"
+          :name="tab.data.id + ''"
           :closable="true"
         >
           <editView

package/src/views/bd/setting/form_template/mixins/edit.js

@@ -116,10 +116,10 @@ modules = {
       }else if (this.dataId) {
         this.$commonHttp({
           aes: true,
-          url: USER_PREFIX + `/formTemplate/getByFormCode`,
+          url: USER_PREFIX + `/formTemplate/get`,
           method: `post`,
           data: {
-            stringOne: this.dataId
+            id: this.dataId
           },
           isLoading: true,
           modalStrictly: true,
@@ -195,7 +195,7 @@ modules = {
               } else {
                 this.$baseReload({
                   updateParam: {
-                    _dataId: this.formTemplate.formCode
+                    _dataId: res.objx || this.formTemplate.id
                   }
                 });
               }

package/src/views/bd/setting/form_template/mixins/list.js

@@ -185,13 +185,13 @@ modules = {
       this.$refs["table-m1"].commitProxy("reload");
     },
     openEditDialog(row) {
-      let formCode = row?.formCode || null;
+      let dataId = row?.id || 0;
       /*this.dataId = !id || typeof id === 'object' ? 0 : id;
       this.activeName = 'first';
       this.showItemEdit = false;
       this.$openEditView('showEdit');*/
-      if (!formCode) {
-        this.dataId = formCode;
+      if (!dataId) {
+        this.dataId = dataId;
         this.activeName = "first";
         this.$openEditView("showEdit");
       } else {