cloud-web-corejs 1.0.281 → 1.1.0-dev.4

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

@@ -0,0 +1,81 @@
+<template>
+  <!-- 分支模块：挂在左侧树顶部、「表单分类」之上 -->
+  <div class="bd-branch-tree-bar">
+    <div class="branch-info">
+      <span class="value" :title="branchLabel">{{ branchLabel }}</span>
+    </div>
+    <el-tooltip
+      :enterable="false"
+      effect="dark"
+      :content="$t1('打开新分支')"
+      placement="top"
+      popper-class="tooltip-skin"
+    >
+      <el-button
+        class="open-new"
+        icon="el-icon-plus"
+        @click="$emit('open-new')"
+      ></el-button>
+    </el-tooltip>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "bdBranchTreeBar",
+  props: {
+    branchLabel: String,
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+/* 与树上方的 .tree-userChange 保持同一套模块样式 */
+.bd-branch-tree-bar {
+  flex: none;
+  display: flex;
+  align-items: center;
+  margin: 9px 10px 0;
+  padding: 7px 7px 7px 10px;
+  background: #f4f6fa;
+  border-radius: 5px;
+
+  .branch-info {
+    flex: 1;
+    min-width: 0;
+    display: flex;
+    align-items: flex-start;
+    font-size: 14px;
+    line-height: 20px;
+
+    .value {
+      flex: 1;
+      min-width: 0;
+      /* 长分支名换行显示，最多两行，超出再省略 */
+      display: -webkit-box;
+      -webkit-line-clamp: 2;
+      -webkit-box-orient: vertical;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      word-break: break-all;
+      font-weight: 600;
+      /* 与详情页标题栏的分支标记同色 */
+      color: #ff731c;
+    }
+  }
+
+  .open-new {
+    flex: none;
+    width: 26.5px;
+    height: 26.5px;
+    margin-left: 8px;
+    padding: 0;
+    line-height: 26.5px;
+    text-align: center;
+    background: #fff;
+    border: solid 1px rgba(99, 134, 250, 0.15);
+    border-radius: 5px;
+    color: #6386fa;
+  }
+}
+</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/bd_company_env/dialog.vue

@@ -1,174 +1,174 @@
-<template>
-  <el-dialog
-    :title="$t1('组织环境设置列表')"
-    :append-to-body="true"
-    :modal-append-to-body="true"
-    :close-on-click-modal="falseValue"
-    :visible.sync="showDialog"
-    :modal="falseValue"
-    custom-class="dialog-style list-dialog dialog-checkbox pd_0"
-    width="1200px"
-    @close="dialogClose"
-    v-el-drag-dialog
-    v-el-dialog-center
-  >
-    <div class="cont" style="height:450px">
-      <vxe-grid
-        class="is-pointer"
-        ref="table-m1"
-        v-bind="vxeOption"
-        @resizable-change="$vxeTableUtil.onColumnWitchChange"
-        @custom="$vxeTableUtil.customHandle"
-        @checkbox-change="addDataTable"
-        @checkbox-all="checkAll"
-        @cell-dblclick="checkWithSubmit"
-      >
-        <template #form>
-          <tableForm :formData.sync="formData" @searchEvent="searchEvent" @resetEvent="resetEvent">
-            <template #buttonLeft>
-            </template>
-            <template #buttonRight>
-              <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>
-            </template>
-          </tableForm>
-        </template>
-      </vxe-grid>
-    </div>
-    <label id="labBtn" class="transverse">
-      <div class="icon">
-        <i class="el-icon-more"></i>
-        <i class="el-icon-more"></i>
-      </div>
-    </label>
-    <div class="multipleChoice">
-      <el-tooltip :enterable="false" effect="dark" :content="$t1('全部删除')" placement="top"><a
-        class="allDel icon-quanbushanchu" @click="clearChecked()"></a></el-tooltip>
-      <div class="list">
-        <div class="item" v-for="(checkRow, index) in checkRows" :key="index">
-          <p>{{ getCheckLabel(checkRow, 'bdCompanyCode') }}</p>
-          <a class="el-icon-close" @click="clearTable1Select(index)"></a>
-        </div>
-      </div>
-    </div>
-    <span slot="footer" class="dialog-footer">
-			<span class="fl tips" v-if="!selectMulti">{{ $t1('注：双击确认选择（单选）') }}</span>
-			<el-button type="primary" plain class="button-sty" @click="dialogClose">
-				<i class="el-icon-close el-icon"></i>
-				{{ $t1('取 消') }}
-			</el-button>
-			<el-button type="primary" @click="dialogPrimary" class="button-sty">
-				<i class="el-icon-check el-icon"></i>
-				{{ $t1('确 定') }}
-			</el-button>
-		</span>
-  </el-dialog>
-</template>
-
-<script>
-import {selectDialogMixins} from '@base/mixins/selectDialog/index.js';
-import tableForm from "@base/components/table/tableForm.vue";
-
-export default {
-  name: 'positionDialog',
-  props: ['visiable', 'multi', 'rows', 'param'],
-  mixins: [selectDialogMixins],
-  components: {
-    tableForm
-  },
-  created() {
-    this.initSetting();
-  },
-  mounted() {
-    this.initTableM1();
-  },
-  data() {
-    var that = this;
-    return {
-      showDialog: true,
-      falseValue: false,
-      selectMulti: true,
-      formData: {},
-      vxeOption: {}
-    };
-  },
-  methods: {
-    initTableM1() {
-      let that = this;
-      let bdServiceMap = {"dev": this.$t1("测试"), "uat": this.$t1("UAT"), "prod": this.$t1("正式")};
-      let url = USER_PREFIX + '/bd_company_env/listPage';
-      let tableOption = {
-        vue: that,
-        tableRef: 'table-m1',
-        tableName: 'basic_position_dialog-m1',
-        path: url,
-        param: () => {
-          return {
-            ...this.formData
-          }
-        },
-        columns: [
-          {type: 'checkbox', fixed: 'left', width: 48, resizable: false},
-          {
-            title: this.$t1('服务'),
-            field: 'bdService',
-            width: 150,
-            fixed: 'left',
-            slots: {
-              default: ({row}) => {
-                return bdServiceMap[row.bdService] || "";
-              }
-            }
-          },
-          {
-            title: this.$t1('组织编码'),
-            field: 'bdCompanyCode',
-            width: 150,
-          },
-          {
-            title: this.$t1('组织备注'),
-            field: 'bdCompanyRemark',
-            width: 150,
-          },
-          {
-            width: 47,
-            fixed: 'right',
-            title: '',
-            sortable: false
-          }
-        ],
-        searchColumns: [
-          {
-            title: this.$t1('服务'), field: "bdService", type: "select", common: true, itemOption: [
-              {label: this.$t1("测试"), value: "dev"},
-              {label: this.$t1("UAT"), value: "uat"},
-              {label: this.$t1("正式"), value: "prod"}
-            ]
-          },
-          {
-            title: this.$t1("组织编码"),
-            field: "bdCompanyCode",
-            type: "input",
-            common: true,
-          }
-        ],
-        config: {
-          checkboxConfig: {
-            checkStrictly: true,
-            showHeader: this.selectMulti,
-            trigger: 'row'
-          }
-        }
-      };
-      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
-        that.vxeOption = opts;
-      });
-    }
-  }
-};
-</script>
+<template>
+  <el-dialog
+    :title="$t1('组织环境设置列表')"
+    :append-to-body="true"
+    :modal-append-to-body="true"
+    :close-on-click-modal="falseValue"
+    :visible.sync="showDialog"
+    :modal="falseValue"
+    custom-class="dialog-style list-dialog dialog-checkbox pd_0"
+    width="1200px"
+    @close="dialogClose"
+    v-el-drag-dialog
+    v-el-dialog-center
+  >
+    <div class="cont" style="height:450px">
+      <vxe-grid
+        class="is-pointer"
+        ref="table-m1"
+        v-bind="vxeOption"
+        @resizable-change="$vxeTableUtil.onColumnWitchChange"
+        @custom="$vxeTableUtil.customHandle"
+        @checkbox-change="addDataTable"
+        @checkbox-all="checkAll"
+        @cell-dblclick="checkWithSubmit"
+      >
+        <template #form>
+          <tableForm :formData.sync="formData" @searchEvent="searchEvent" @resetEvent="resetEvent">
+            <template #buttonLeft>
+            </template>
+            <template #buttonRight>
+              <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>
+            </template>
+          </tableForm>
+        </template>
+      </vxe-grid>
+    </div>
+    <label id="labBtn" class="transverse">
+      <div class="icon">
+        <i class="el-icon-more"></i>
+        <i class="el-icon-more"></i>
+      </div>
+    </label>
+    <div class="multipleChoice">
+      <el-tooltip :enterable="false" effect="dark" :content="$t1('全部删除')" placement="top"><a
+        class="allDel icon-quanbushanchu" @click="clearChecked()"></a></el-tooltip>
+      <div class="list">
+        <div class="item" v-for="(checkRow, index) in checkRows" :key="index">
+          <p>{{ getCheckLabel(checkRow, 'bdCompanyCode') }}</p>
+          <a class="el-icon-close" @click="clearTable1Select(index)"></a>
+        </div>
+      </div>
+    </div>
+    <span slot="footer" class="dialog-footer">
+			<span class="fl tips" v-if="!selectMulti">{{ $t1('注：双击确认选择（单选）') }}</span>
+			<el-button type="primary" plain class="button-sty" @click="dialogClose">
+				<i class="el-icon-close el-icon"></i>
+				{{ $t1('取 消') }}
+			</el-button>
+			<el-button type="primary" @click="dialogPrimary" class="button-sty">
+				<i class="el-icon-check el-icon"></i>
+				{{ $t1('确 定') }}
+			</el-button>
+		</span>
+  </el-dialog>
+</template>
+
+<script>
+import {selectDialogMixins} from '@base/mixins/selectDialog/index.js';
+import tableForm from "@base/components/table/tableForm.vue";
+
+export default {
+  name: 'positionDialog',
+  props: ['visiable', 'multi', 'rows', 'param'],
+  mixins: [selectDialogMixins],
+  components: {
+    tableForm
+  },
+  created() {
+    this.initSetting();
+  },
+  mounted() {
+    this.initTableM1();
+  },
+  data() {
+    var that = this;
+    return {
+      showDialog: true,
+      falseValue: false,
+      selectMulti: true,
+      formData: {},
+      vxeOption: {}
+    };
+  },
+  methods: {
+    initTableM1() {
+      let that = this;
+      let bdServiceMap = {"dev": this.$t1("测试"), "uat": this.$t1("UAT"), "prod": this.$t1("正式")};
+      let url = USER_PREFIX + '/bd_company_env/listPage';
+      let tableOption = {
+        vue: that,
+        tableRef: 'table-m1',
+        tableName: 'basic_position_dialog-m1',
+        path: url,
+        param: () => {
+          return {
+            ...this.formData
+          }
+        },
+        columns: [
+          {type: 'checkbox', fixed: 'left', width: 48, resizable: false},
+          {
+            title: this.$t1('服务'),
+            field: 'bdService',
+            width: 150,
+            fixed: 'left',
+            slots: {
+              default: ({row}) => {
+                return bdServiceMap[row.bdService] || "";
+              }
+            }
+          },
+          {
+            title: this.$t1('组织编码'),
+            field: 'bdCompanyCode',
+            width: 150,
+          },
+          {
+            title: this.$t1('组织备注'),
+            field: 'bdCompanyRemark',
+            width: 150,
+          },
+          {
+            width: 47,
+            fixed: 'right',
+            title: '',
+            sortable: false
+          }
+        ],
+        searchColumns: [
+          {
+            title: this.$t1('服务'), field: "bdService", type: "select", common: true, itemOption: [
+              {label: this.$t1("测试"), value: "dev"},
+              {label: this.$t1("UAT"), value: "uat"},
+              {label: this.$t1("正式"), value: "prod"}
+            ]
+          },
+          {
+            title: this.$t1("组织编码"),
+            field: "bdCompanyCode",
+            type: "input",
+            common: true,
+          }
+        ],
+        config: {
+          checkboxConfig: {
+            checkStrictly: true,
+            showHeader: this.selectMulti,
+            trigger: 'row'
+          }
+        }
+      };
+      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+        that.vxeOption = opts;
+      });
+    }
+  }
+};
+</script>