cloud-web-corejs 1.0.54-dev.790 → 1.0.54-dev.792

package/src/components/xform/form-render/container-item/detail-plain-item.vue

@@ -0,0 +1,92 @@
+<!--
+/**
+ * 简洁详情模块(detail-plain)：与 detail 同构，但不渲染标题栏(标题/翻单/流程/按钮控件)，
+ * 模块导航默认关闭。仅保留 panes(详情tab)内容区。
+ */
+-->
+
+<template>
+  <container-item-wrapper :widget="widget">
+    <div
+      class="detail-wrap grid-container"
+      :class="[customClass]"
+      :ref="widget.id"
+    >
+      <baseTabs :showNav="!widget.options.hideNav && !plainMode">
+        <detail-pane-widget
+          v-for="(paneWidget, index) in widget.panes"
+          :key="index"
+          :widget="paneWidget"
+          :parent-list="widget.panes"
+          :index-of-parent-list="index"
+          :parent-widget="widget"
+          :col-height="widget.options.colHeight"
+          tabRef="baseTabRef"
+          :tabPaneGrade="2"
+        ></detail-pane-widget>
+      </baseTabs>
+    </div>
+  </container-item-wrapper>
+</template>
+
+<script>
+import emitter from "../../../../components/xform/utils/emitter";
+import i18n from "../../../../components/xform/utils/i18n";
+import refMixin from "../../../../components/xform/form-render/refMixin";
+import ContainerItemWrapper from "./container-item-wrapper";
+import containerItemMixin from "./containerItemMixin";
+import detailPaneWidget from "../../../../components/xform/form-render/container-item/detail-pane-item";
+import FieldComponents from "../../../../components/xform/form-designer/form-widget/field-widget/index";
+
+export default {
+  name: "detail-plain-item",
+  componentName: "ContainerItem",
+  mixins: [emitter, i18n, refMixin, containerItemMixin],
+  components: {
+    ContainerItemWrapper,
+    detailPaneWidget,
+    ...FieldComponents,
+  },
+  props: {
+    widget: Object,
+  },
+  inject: ["refList", "sfRefList", "globalModel", "previewState"],
+  created() {
+    this.initRefList();
+    this.handleOnCreated();
+  },
+  mounted() {
+    this.handleOnMounted();
+  },
+  beforeDestroy() {
+    this.unregisterFromRefList();
+  },
+  computed: {
+    // 素身详情模式（宿主 VFormRender 传 plainDetailMode）：强制关闭模块导航
+    plainMode() {
+      let formRef = this.getFormRef && this.getFormRef();
+      return !!(formRef && formRef.plainDetailMode);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.grid-container {
+  min-height: 50px;
+  outline: 1px dashed #336699;
+
+  > div {
+    height: 100%;
+  }
+
+  .form-widget-list {
+    height: 100%;
+  }
+}
+
+.grid-container.selected,
+.grid-cell.selected {
+  outline: 2px solid $--color-primary !important;
+}
+</style>

package/src/components/xform/form-render/indexMixin.js

@@ -1660,7 +1660,7 @@ modules = {
                   t.buildDataFromWidget(e);
                 });
             });
-        else if ("detail" === e.type)
+        else if ("detail" === e.type || "detail-plain" === e.type)
           e.panes &&
             e.panes.length > 0 &&
             e.panes.forEach(function (e) {
@@ -3601,6 +3601,7 @@ modules = {
         "vf-box": "widgetList",
         card: "widgetList",
         detail: "panes",
+        "detail-plain": "panes",
         "detail-pane": "widgetList",
         "detail-h5": "panes",
         "h5-card": "panes",
@@ -3787,6 +3788,7 @@ modules = {
         "vf-box": "widgetList",
         card: "widgetList",
         detail: "panes",
+        "detail-plain": "panes",
         "detail-pane": "widgetList",
         "detail-h5": "panes",
         "h5-card": "panes",

package/src/components/xform/lang/zh-CN.js

@@ -92,6 +92,7 @@ export default {
       panel: "面板",
       query: "查询模块",
       detail: "详情模块",
+      "detail-plain": "详情模块(简洁)",
       "detail-pane": "详情tab",
       "detail-h5": "H5详情",
       "list-h5": "H5列表",

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

@@ -1554,7 +1554,7 @@ function loopHandleWidgetItem(e, p, callback) {
               loopHandleWidgetItem(childItem, e, callback);
             });
         });
-    } else if ("detail" === e.type) {
+    } else if ("detail" === e.type || "detail-plain" === e.type) {
       if (e.panes) {
         e.panes.forEach(function (childItem) {
           loopHandleWidgetItem(childItem, e, callback);

package/src/index.js

@@ -189,13 +189,16 @@ Vue.component("advancedSearchDialog", () =>
   import("@base/components/advancedSearchDialog/index.vue")
 );
 
-Vue.component("baseTabs", () =>
-  import("@base/components/baseTabs/index.vue")
-);
-
-Vue.component("baseTabPane", () =>
-  import("@base/components/baseTabs/baseTabPane.vue")
-);
+// baseTabs/baseTabPane 必须同步注册，不可懒注册：
+// xform 详情容器(detail-item)把所有 detail-pane 及其内部字段组件放在 <baseTabs> 的默认插槽里。
+// 异步组件未解析时 Vue 只渲染占位注释节点，插槽内的组件不会被实例化，
+// 于是 detail-item 的 mounted 早于内部字段组件的 created(registerToRefList)执行，
+// 模板脚本 onMounted 里的 getWidgetRef('xxx') 首次进入必然拿到 undefined（二次进入因异步工厂已缓存而正常）。
+import baseTabs from "@base/components/baseTabs/index.vue";
+import baseTabPane from "@base/components/baseTabs/baseTabPane.vue";
+
+Vue.component(baseTabs.name, baseTabs);
+Vue.component(baseTabPane.name, baseTabPane);
 
 import vb_tabs from "@base/components/vb-tabs/index.vue";
 import vb_tab_pane from "@base/components/vb-tabs/tab-pane.vue";

package/src/store/config/index.js

@@ -102,7 +102,6 @@ const bdProjectMenus = [
         hasChild: false,
         grade: 2,
         type: 0,
-        repeatOpen: true,
         children: [],
       },
       {

package/src/views/bd/project/branch/form_script/list.vue

@@ -1,22 +1,31 @@
 <template>
+  <!-- 分支说明与「打开新分支」放在左侧树区域顶部，不再占用内容区工具条 -->
   <branchPageWrap
     :branchCode.sync="branchCode"
     :branchLabel="branchLabel"
+    :show-bar="false"
     @branch-change="onBranchChange"
-    @open-new="openNewBranch"
   >
-    <baseList :key="branchCode"></baseList>
+    <baseList :key="branchCode">
+      <template #treeTop>
+        <branchTreeBar
+          :branchLabel="branchLabel"
+          @open-new="openNewBranch"
+        ></branchTreeBar>
+      </template>
+    </baseList>
   </branchPageWrap>
 </template>
 
 <script>
 import branchPage from "../../core/branchPage";
+import branchTreeBar from "../../core/branchTreeBar.vue";
 // 逻辑脚本对应 scriptType=1 的 list1
 import baseList from "@base/views/bd/setting/form_script/list1.vue";
 
 export default {
   name: "branch_form_script:list",
-  components: { baseList },
+  components: { baseList, branchTreeBar },
   mixins: [branchPage],
 };
 </script>

package/src/views/bd/project/branch/form_template/list.vue

@@ -1,21 +1,30 @@
 <template>
+  <!-- 分支说明与「打开新分支」放在左侧树区域顶部，不再占用内容区工具条 -->
   <branchPageWrap
     :branchCode.sync="branchCode"
     :branchLabel="branchLabel"
+    :show-bar="false"
     @branch-change="onBranchChange"
-    @open-new="openNewBranch"
   >
-    <baseList :key="branchCode"></baseList>
+    <baseList :key="branchCode">
+      <template #treeTop>
+        <branchTreeBar
+          :branchLabel="branchLabel"
+          @open-new="openNewBranch"
+        ></branchTreeBar>
+      </template>
+    </baseList>
   </branchPageWrap>
 </template>
 
 <script>
 import branchPage from "../../core/branchPage";
+import branchTreeBar from "../../core/branchTreeBar.vue";
 import baseList from "@base/views/bd/setting/form_template/list.vue";
 
 export default {
   name: "branch_form_template:list",
-  components: { baseList },
+  components: { baseList, branchTreeBar },
   mixins: [branchPage],
 };
 </script>

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

@@ -1,21 +1,31 @@
 <template>
+  <!-- 先选分支再进入，进入后分支作为第一个查询条件可继续切换；不提供「打开新分支」 -->
   <branchPageWrap
     :branchCode.sync="branchCode"
     :branchLabel="branchLabel"
+    :show-bar="false"
+    :show-open-new="false"
     @branch-change="onBranchChange"
-    @open-new="openNewBranch"
   >
-    <baseList :key="branchCode"></baseList>
+    <branchList :initBranchCode="branchCode" @branch-change="onBranchChange"></branchList>
   </branchPageWrap>
 </template>
 
 <script>
 import branchPage from "../../core/branchPage";
+import branchSearchPage from "../../core/branchSearchPage";
 import baseList from "@base/views/bd/setting/menu_kind/list.vue";
 
+// 复用原分类列表，只把分支塞进查询条件
+const branchList = {
+  name: "branch_menu_kind_list",
+  extends: baseList,
+  mixins: [branchSearchPage],
+};
+
 export default {
   name: "branch_menu_kind:list",
-  components: { baseList },
+  components: { branchList },
   mixins: [branchPage],
 };
 </script>

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

@@ -59,11 +59,11 @@ modules = {
     },
     updateTabTitle() {
       let base = this.baseTabTitle || this.resolveBaseTabTitle();
-      let title = this.branchName
-        ? `${base}-${this.branchName}`
-        : this.branchCode
-          ? `${base}-${this.branchCode}`
-          : base;
+      let suffix = this.branchName || this.branchCode;
+      // 菜单名形如「表单模板-分支」，选中分支后把末尾的「分支」换成分支名
+      let title = suffix
+        ? `${base.replace(/[-－—]?\s*分支$/, "")}-${suffix}`
+        : base;
       this.$store.dispatch("tagsView/updateVisitedView2", {
         view: this.$route,
         title,

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

@@ -1,12 +1,13 @@
 <template>
   <div class="bd-branch-page" :class="{ 'has-branch': !!branchCode }">
     <!-- 已选分支：内容区顶部工具条，不可改；提供打开新分支 -->
-    <div class="branch-bar" v-if="branchCode">
+    <div class="branch-bar" v-if="branchCode && showBar">
       <span class="branch-locked">
         <span class="label">{{ $t1("分支") }}:</span>
         <span class="value">{{ branchLabel || branchCode }}</span>
       </span>
       <el-button
+        v-if="showOpenNew"
         size="mini"
         type="primary"
         plain
@@ -25,7 +26,6 @@
       <p class="tip">{{ $t1("请先选择分支") }}</p>
       <branchSelect
         :value="branchCode"
-        :auto-restore="false"
         @input="$emit('update:branchCode', $event)"
         @change="$emit('branch-change', $event)"
       ></branchSelect>
@@ -44,6 +44,15 @@ export default {
   props: {
     branchCode: String,
     branchLabel: String,
+    // 页面自己在查询条件里展示/切换分支时，顶部工具条就是多余的
+    showBar: {
+      type: Boolean,
+      default: true,
+    },
+    showOpenNew: {
+      type: Boolean,
+      default: true,
+    },
   },
   watch: {
     branchCode() {
@@ -205,11 +214,11 @@ export default {
   display: inline-block;
   margin-left: 12px;
   padding: 2px 8px;
-  font-size: 12px;
-  font-weight: 400;
-  line-height: 18px;
-  color: #6386fa;
-  background: #f0f3ff;
+  font-size: 14px;
+  font-weight: 600;
+  line-height: 20px;
+  color: #ff731c;
+  background: #fff3ea;
   border-radius: 2px;
   vertical-align: middle;
 }

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

@@ -0,0 +1,285 @@
+import branchScope from "./branchScope";
+import { BRANCH_FLAG, needInject } from "./branchContext";
+
+const BRANCH_FIELD = "branchCode";
+
+/** 只读接口：分支未就绪时直接返回空结果，避免表格一直转圈 */
+const READ_SUFFIXES = [
+  "/getAllList",
+  "/getChildren",
+  "/listPage",
+  "/listOtherPage",
+  "/listPageWf",
+];
+
+function isReadUrl(url) {
+  if (!url) {
+    return false;
+  }
+  let path = url;
+  let qIndex = path.indexOf("?");
+  if (qIndex >= 0) {
+    path = path.substring(0, qIndex);
+  }
+  return READ_SUFFIXES.some((item) => path.endsWith(item));
+}
+
+/**
+ * 分支工程页面（分支收敛到查询条件）通用逻辑：
+ * 1. 不做进入前的分支门禁，也不提供「打开新分支」，分支就是查询条件里的第一个下拉框
+ * 2. 没选到有效分支时整页不可操作：不查询、不保存、不导入导出
+ * 3. 切换分支即清空其余查询条件并重新查询；分支不做记忆，每次进来都要重新选
+ * 4. 页面用 extends 复用 bd/setting 下的原组件，这里全部改在实例级的 $vxeTableUtil /
+ *    $http / $jsonImport / $jsonExport 上做，不必重写原组件的任何方法
+ */
+let modules = {};
+modules = {
+  mixins: [branchScope(BRANCH_FLAG.BRANCH)],
+  props: {
+    // 由外层前置选择页带进来的分支，组件挂载时就已经确定
+    initBranchCode: String,
+  },
+  data() {
+    return {
+      branchCode: this.initBranchCode || "",
+      branchName: "",
+      branches: [],
+      branchesLoaded: false,
+    };
+  },
+  computed: {
+    /** 后台匹配得到分支才算就绪；分支列表未回来前，先按已选分支放行 */
+    branchReady() {
+      if (!this.branchCode) {
+        return false;
+      }
+      if (!this.branchesLoaded) {
+        return true;
+      }
+      return this.branches.some((item) => item.branchCode === this.branchCode);
+    },
+  },
+  created() {
+    this.patchVxeTableUtil();
+    this.patchBranchGuard();
+  },
+  watch: {
+    "formData.branchCode"(val) {
+      this.applyBranch(val);
+    },
+  },
+  methods: {
+    /** 实例级覆盖 $vxeTableUtil.initVxeTable，给原页面的查询条件补一列分支 */
+    patchVxeTableUtil() {
+      let origin = this.$vxeTableUtil;
+      if (!origin || this._branchVxePatched) {
+        return;
+      }
+      this._branchVxePatched = true;
+      let that = this;
+      // $vxeTableUtil 上都是无 this 依赖的普通函数，原型继承 + 覆盖单个方法即可
+      this.$vxeTableUtil = Object.assign(Object.create(origin), {
+        initVxeTable(option) {
+          that.injectBranchSearchColumn(option);
+          return origin.initVxeTable(option);
+        },
+      });
+    },
+    /** 分支未就绪时拦掉本页所有分支相关请求与导入导出 */
+    patchBranchGuard() {
+      if (this._branchGuardPatched) {
+        return;
+      }
+      this._branchGuardPatched = true;
+      let that = this;
+
+      // $commonHttp 内部转调 this.$http，表格查询/树懒加载/行保存都会走到这里
+      let originHttp = this.$http;
+      let wrapped = function (option) {
+        if (option && needInject(option.url) && !that.branchReady) {
+          return that.refuseBranchRequest(option);
+        }
+        return originHttp.apply(this, arguments);
+      };
+      Object.assign(wrapped, originHttp);
+      wrapped.prototype = originHttp.prototype;
+      this.$http = wrapped;
+
+      let originImport = this.$jsonImport;
+      if (typeof originImport === "function") {
+        this.$jsonImport = function () {
+          if (!that.checkBranchReady()) {
+            return;
+          }
+          return originImport.apply(this, arguments);
+        };
+      }
+      let originExport = this.$jsonExport;
+      if (typeof originExport === "function") {
+        this.$jsonExport = function () {
+          if (!that.checkBranchReady()) {
+            return;
+          }
+          return originExport.apply(this, arguments);
+        };
+      }
+    },
+    refuseBranchRequest(option) {
+      if (isReadUrl(option.url)) {
+        let res = { type: "success", objx: { records: [], total: 0 } };
+        if (option.callback) {
+          option.callback(res);
+        }
+        if (option.success) {
+          option.success(res);
+        }
+        return Promise.resolve(res);
+      }
+      this.warnBranchRequired();
+      if (option.error) {
+        option.error(null);
+      }
+      return Promise.resolve(null);
+    },
+    checkBranchReady() {
+      if (this.branchReady) {
+        return true;
+      }
+      this.warnBranchRequired();
+      return false;
+    },
+    warnBranchRequired() {
+      // 同一批操作只提示一次，避免树表并发请求刷屏
+      if (this._branchWarning) {
+        return;
+      }
+      this._branchWarning = true;
+      setTimeout(() => {
+        this._branchWarning = false;
+      }, 1000);
+      this.$message({
+        type: "warning",
+        message: this.$t1("请先选择分支"),
+      });
+    },
+    injectBranchSearchColumn(option) {
+      if (!option) {
+        return;
+      }
+      this._branchTableRef = option.tableRef || this._branchTableRef;
+      let columns = option.searchColumns || [];
+      if (columns.some((item) => item.field === BRANCH_FIELD)) {
+        return;
+      }
+      option.searchColumns = [this.buildBranchSearchColumn(), ...columns];
+    },
+    buildBranchSearchColumn() {
+      return {
+        title: this.$t1("分支"),
+        field: BRANCH_FIELD,
+        type: "select",
+        common: true,
+        // fixed 让「查询条件设置」的保存结果无法把它挪位置或收进高级筛选
+        fixed: true,
+        // 分支不允许清空，页面必须始终处在某个分支下
+        clearable: false,
+        itemOption: [],
+        // 不做记忆，只回填前置页刚选的分支
+        defaultValue: this.branchCode || null,
+        syncHandle: () => {
+          return this.loadBranches();
+        },
+      };
+    },
+    loadBranches() {
+      return new Promise((resolve) => {
+        this.$http({
+          url: USER_PREFIX + "/bd_branch/listPage",
+          method: "post",
+          data: {
+            enabled: true,
+            current: 1,
+            size: 500,
+          },
+          success: (res) => {
+            let records = res?.objx?.records || [];
+            this.branches = records;
+            this.branchesLoaded = true;
+            this.dropInvalidBranch();
+            this.syncBranchName();
+            resolve(
+              records.map((item) => {
+                return {
+                  label: item.branchName + "(" + item.branchCode + ")",
+                  value: item.branchCode,
+                };
+              })
+            );
+          },
+          error: () => {
+            this.branchesLoaded = true;
+            resolve([]);
+          },
+        });
+      });
+    },
+    /** 已选分支后台查不到（停用/删除）时清掉，页面回到不可操作状态 */
+    dropInvalidBranch() {
+      if (!this.branchCode || this.branchReady) {
+        return;
+      }
+      this.branchCode = "";
+      if (this.formData) {
+        this.$set(this.formData, BRANCH_FIELD, null);
+      }
+      this.$message({
+        type: "warning",
+        message: this.$t1("原分支已不可用，请重新选择分支"),
+      });
+      // 清掉可能已经查回来的旧分支数据
+      this.reloadBranchTable();
+    },
+    syncBranchName() {
+      let current = this.branches.find(
+        (item) => item.branchCode === this.branchCode
+      );
+      this.branchName = current ? current.branchName || "" : "";
+    },
+    applyBranch(val) {
+      let branchCode = val || "";
+      // 值没变就不要再触发一次查询
+      if (branchCode === this.branchCode) {
+        return;
+      }
+      this.branchCode = branchCode;
+      this.syncBranchName();
+      // 换分支等于换了一套数据，其余查询条件全部清空
+      this.formData = { [BRANCH_FIELD]: branchCode || null };
+      this.reloadBranchTable();
+      // 通知外层同步标签页名等分支信息
+      this.$emit("branch-change", {
+        branchCode: this.branchCode,
+        branchName: this.branchName,
+      });
+    },
+    reloadBranchTable() {
+      let grid = this.$refs[this._branchTableRef || "table-m1"];
+      if (grid) {
+        grid.commitProxy("reload");
+      }
+    },
+    searchEvent() {
+      if (!this.checkBranchReady()) {
+        return;
+      }
+      this.reloadBranchTable();
+    },
+    /** 重置查询条件时保留已选分支 */
+    resetEvent() {
+      let branchCode = this.formData ? this.formData.branchCode : "";
+      this.formData = { [BRANCH_FIELD]: branchCode || null };
+      this.reloadBranchTable();
+    },
+  },
+};
+export default modules;

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

@@ -19,17 +19,10 @@
 </template>
 
 <script>
-const STORAGE_KEY = "bdProjectBranchCode";
-
 export default {
   name: "bdBranchSelect",
   props: {
     value: String,
-    // 首次进入时是否自动回填上次选择的分支
-    autoRestore: {
-      type: Boolean,
-      default: true,
-    },
   },
   data() {
     return {
@@ -51,26 +44,12 @@ export default {
         },
         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",