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

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

@@ -0,0 +1,186 @@
+/**
+ * 字段脱敏（"密文文本"）判定。
+ *
+ * 规则在组件属性面板 textFlag-editor 维护：
+ * - options.userTextRuleEnabled 总开关
+ * - options.userTextRuleConfig 规则列表，单条为
+ *   { serveName, companyCodes, roleCodes, type, encryptFormula }
+ *   - serveName / companyCodes 为空表示不限；companyCodes、roleCodes 为逗号分隔串
+ *   - type=1：角色不匹配时脱敏；type=2：角色匹配时脱敏
+ *   - encryptFormula 形如 "3*3" / "3*" / "*3" / "*" / "-"
+ * - 规则列表是全遍历而非命中即止，后置规则会覆盖前置规则的结论
+ * - 规则里的 loginAccounts / saleOrgCodes 两个维度目前不参与匹配（历史遗留字段）
+ *
+ * 本文件是该判定的唯一实现：渲染侧（form-item-wrapper 的只读文本）与导出侧
+ * （数据表格按列剔除）必须共用，否则会出现界面打码、导出放行的漂移。
+ */
+
+/** 列 params 上的私有标记：记录 exportDisabled 是脱敏判定打的，撤销时才敢删 */
+const MASK_MARK_KEY = "exportDisabledByTextMask";
+
+/**
+ * @param {Array} list1 规则侧编码列表。为空表示不限。
+ * @param {Array} list2 当前用户编码列表。
+ * @returns {Boolean} 是否匹配。
+ */
+export function compareToList(list1, list2) {
+  if (!list1.length) {
+    return true;
+  }
+  if (!list2.length) {
+    return false;
+  }
+  return list1.some((item) => {
+    return list2.some((item2) => item == item2);
+  });
+}
+
+/**
+ * @param {Object} widgetOptions 组件 options。
+ * @returns {Boolean} 是否配置了脱敏规则（不代表当前用户命中）。
+ */
+export function hasTextMaskRule(widgetOptions) {
+  if (!widgetOptions || !widgetOptions.userTextRuleEnabled) return false;
+  let ruleList = widgetOptions.userTextRuleConfig || [];
+  return ruleList.some((item) => {
+    let type = item.type ?? null;
+    return type !== null && type !== "";
+  });
+}
+
+/**
+ * @param {Object} formRef 表单实例（form-render）。
+ * @param {String} companyCode 当前公司编码（store.getters.companyCode）。
+ * @returns {Object} 判定上下文 { bdService, companyCode, roleCodeList }。
+ */
+export function buildTextMaskContext(formRef, companyCode) {
+  let roleCodeList = (formRef?.userRoleDTOs || []).map((item) => item.roleCode);
+  return {
+    bdService: formRef?.bdService,
+    companyCode,
+    roleCodeList,
+  };
+}
+
+/**
+ * @param {Object} ctx 判定上下文。
+ * @returns {Boolean} 用户上下文是否已就绪（bdService / 角色均由异步接口填充）。
+ */
+export function isTextMaskContextReady(ctx) {
+  return !!ctx?.bdService && !!(ctx?.roleCodeList || []).length;
+}
+
+/**
+ * @param {Object} widgetOptions 组件 options。
+ * @param {Object} ctx 用户上下文 { bdService, companyCode, roleCodeList }。
+ * @returns {{masked: Boolean, encryptFormula: String}} 是否脱敏及命中的加密规则。
+ */
+export function resolveTextMaskFlag(widgetOptions, ctx) {
+  let result = { masked: false, encryptFormula: null };
+  if (!widgetOptions || !widgetOptions.userTextRuleEnabled) return result;
+
+  let bdService = ctx?.bdService;
+  let companyCode = ctx?.companyCode;
+  let roleCodeList = ctx?.roleCodeList || [];
+
+  let userTextRuleConfig = widgetOptions.userTextRuleConfig || [];
+  userTextRuleConfig.forEach((item) => {
+    let type = item.type ?? null;
+    if (type === null || type === "") return;
+
+    let companyCodeStr = item.companyCodes;
+    let companyCodes = companyCodeStr
+      ? companyCodeStr.split(",").filter((code) => !!code)
+      : [];
+    let roleCodeStr = item.roleCodes;
+    let roleCodes = roleCodeStr
+      ? roleCodeStr.split(",").filter((code) => !!code)
+      : [];
+
+    let flag1 = !item.serveName || item.serveName == bdService;
+    let flag2 = !companyCodes.length || companyCodes.includes(companyCode);
+    if (!flag1 || !flag2) return;
+
+    result.encryptFormula = item.encryptFormula;
+    let flag5 = compareToList(roleCodes, roleCodeList);
+    if (flag5) {
+      //匹配角色
+      if (type == 2) result.masked = true; //type=2时加密
+    } else {
+      //角色不匹配
+      if (type == 1) result.masked = true;
+    }
+  });
+
+  return result;
+}
+
+/**
+ * 导出前按脱敏规则给命中列打 params.exportDisabled，由 excelExport 的三处过滤
+ * （字段选择树、表头 JSON、取数）统一剔除整列。
+ *
+ * 之所以要按列剔除：命中脱敏规则的字段在界面上只渲染掩码文本，但导出取值走
+ * filterVal / 原始字段快路径，不经过渲染层，会把明文写进文件。
+ *
+ * bdService / userRoleDTOs 由异步接口填充，上下文缺失时按 fail-closed 处理——配了
+ * 规则的列一律剔除，因为角色列表为空会被判成"角色不匹配"，type=2 的规则会误判为
+ * 不脱敏。本函数幂等且可自愈：上下文就绪后重复调用会撤销自己此前多打的标记
+ * （靠私有键区分，不碰 isNonDataExportColumn 打的标记）。
+ *
+ * @param {Object} $grid vxe-grid 实例。
+ * @param {Object} ctx 判定上下文，由 buildTextMaskContext 生成。
+ */
+export function markMaskedExportColumns($grid, ctx) {
+  if (!$grid || typeof $grid.getTableColumn !== "function") return;
+
+  let contextReady = isTextMaskContextReady(ctx);
+
+  /** 打标记。列本就被其它规则（isNonDataExportColumn）剔除时不接管，避免撤销时误删。 */
+  let disable = (params) => {
+    if (params.exportDisabled && !params[MASK_MARK_KEY]) return;
+    params.exportDisabled = true;
+    params[MASK_MARK_KEY] = true;
+  };
+  /** 撤销本函数此前打的标记（上下文未就绪时的 fail-closed 结论）。 */
+  let restore = (params) => {
+    if (!params[MASK_MARK_KEY]) return;
+    delete params[MASK_MARK_KEY];
+    delete params.exportDisabled;
+  };
+
+  let maskedFields = new Set();
+  let markColumn = (column) => {
+    if (column.children && column.children.length) {
+      column.children.forEach(markColumn);
+      return;
+    }
+    let widgetOptions = column.params?.widget?.options;
+    if (!hasTextMaskRule(widgetOptions)) return;
+    if (contextReady && !resolveTextMaskFlag(widgetOptions, ctx).masked) {
+      restore(column.params);
+      return;
+    }
+    disable(column.params);
+    if (column.field) maskedFields.add(column.field);
+  };
+  let { collectColumn } = $grid.getTableColumn();
+  (collectColumn || []).forEach(markColumn);
+
+  // 明细导出列是独立配置（只有 field/title，没有组件），按字段名对齐主表脱敏列
+  let markItemColumn = (column) => {
+    if (column.children && column.children.length) {
+      column.children.forEach(markItemColumn);
+      return;
+    }
+    if (!column.field) return;
+    column.params = column.params || {};
+    if (maskedFields.has(column.field)) {
+      disable(column.params);
+    } else {
+      restore(column.params);
+    }
+  };
+  let originOption = $grid.params?.originOption;
+  let exportItemColumns = originOption?.exportItemConfig?.columns || [];
+  exportItemColumns.forEach(markItemColumn);
+}

package/src/index.js

@@ -44,6 +44,7 @@ VXETable.setup({
 }) */
 
 import Vab from "@base/utils/vab";
+import createCodeEditorAsyncComponent from "@base/components/code-editor/async";
 
 Vue.use(Vab);
 
@@ -208,9 +209,7 @@ Vue.component("status-tag", () =>
   import("@base/components/statusTag/index.vue")
 );
 
-Vue.component("CodeEditor", () =>
-  import("@base/components/code-editor/index.vue")
-);
+Vue.component("CodeEditor", createCodeEditorAsyncComponent);
 
 Vue.component("scriptDescriptionButton", () =>
   import("@base/components/scriptDescription/button")

package/src/store/config/index.js

@@ -1,4 +1,225 @@
 //bdadmin 7,dev_admin 6, 普通dev账号 8
+
+// 通用工程/分支工程/数据表管理：分组父节点不配 url，仅作侧边栏分组，叶子的 menuCode 与壳组件 name 一致
+const bdProjectMenus = [
+  {
+    id: 900001,
+    orders: 101,
+    parent: null,
+    menuName: "通用工程",
+    menuEnName: null,
+    menuCode: "bd_project_common",
+    menuImg: "icon-fenzu",
+    url: null,
+    route: null,
+    enabled: true,
+    treePathName: ",",
+    hasChild: true,
+    grade: 1,
+    type: 0,
+    children: [
+      {
+        id: 900002,
+        orders: 1,
+        parent: 900001,
+        menuName: "分类-通用",
+        menuEnName: null,
+        menuCode: "common_menu_kind:list",
+        menuImg: "icon-fenlei",
+        url: "@base/views/bd/project/common/menu_kind/list",
+        route: "/bd/project/common/menu_kind/list",
+        enabled: true,
+        treePathName: ",",
+        hasChild: false,
+        grade: 2,
+        type: 0,
+        children: [],
+      },
+      {
+        id: 900003,
+        orders: 2,
+        parent: 900001,
+        menuName: "表单模板-通用",
+        menuEnName: null,
+        menuCode: "common_form_template:list",
+        menuImg: "icon-biaodanguanli",
+        url: "@base/views/bd/project/common/form_template/list",
+        route: "/bd/project/common/form_template/list",
+        enabled: true,
+        treePathName: ",",
+        hasChild: false,
+        grade: 2,
+        type: 0,
+        children: [],
+      },
+      {
+        id: 900004,
+        orders: 3,
+        parent: 900001,
+        menuName: "逻辑脚本-通用",
+        menuEnName: null,
+        menuCode: "common_form_script:list",
+        menuImg: "icon-liuchengshu",
+        url: "@base/views/bd/project/common/form_script/list",
+        route: "/bd/project/common/form_script/list",
+        enabled: true,
+        treePathName: ",",
+        hasChild: false,
+        grade: 2,
+        type: 0,
+        children: [],
+      },
+    ],
+  },
+  {
+    id: 900005,
+    orders: 102,
+    parent: null,
+    menuName: "分支工程",
+    menuEnName: null,
+    menuCode: "bd_project_branch",
+    menuImg: "icon-danjuliuchengshezhi",
+    url: null,
+    route: null,
+    enabled: true,
+    treePathName: ",",
+    hasChild: true,
+    grade: 1,
+    type: 0,
+    children: [
+      {
+        id: 900006,
+        orders: 1,
+        parent: 900005,
+        menuName: "分类-分支",
+        menuEnName: null,
+        menuCode: "branch_menu_kind:list",
+        menuImg: "icon-fenlei",
+        url: "@base/views/bd/project/branch/menu_kind/list",
+        route: "/bd/project/branch/menu_kind/list",
+        enabled: true,
+        treePathName: ",",
+        hasChild: false,
+        grade: 2,
+        type: 0,
+        repeatOpen: true,
+        children: [],
+      },
+      {
+        id: 900007,
+        orders: 2,
+        parent: 900005,
+        menuName: "表单模板-分支",
+        menuEnName: null,
+        menuCode: "branch_form_template:list",
+        menuImg: "icon-biaodanguanli",
+        url: "@base/views/bd/project/branch/form_template/list",
+        route: "/bd/project/branch/form_template/list",
+        enabled: true,
+        treePathName: ",",
+        hasChild: false,
+        grade: 2,
+        type: 0,
+        repeatOpen: true,
+        children: [],
+      },
+      {
+        id: 900008,
+        orders: 3,
+        parent: 900005,
+        menuName: "逻辑脚本-分支",
+        menuEnName: null,
+        menuCode: "branch_form_script:list",
+        menuImg: "icon-liuchengshu",
+        url: "@base/views/bd/project/branch/form_script/list",
+        route: "/bd/project/branch/form_script/list",
+        enabled: true,
+        treePathName: ",",
+        hasChild: false,
+        grade: 2,
+        type: 0,
+        repeatOpen: true,
+        children: [],
+      },
+      {
+        id: 900009,
+        orders: 4,
+        parent: 900005,
+        menuName: "分支定义",
+        menuEnName: null,
+        menuCode: "bd_branch:list",
+        menuImg: "icon-bianma1",
+        url: "@base/views/bd/project/branch/bd_branch/list",
+        route: "/bd/project/branch/bd_branch/list",
+        enabled: true,
+        treePathName: ",",
+        hasChild: false,
+        grade: 2,
+        type: 0,
+        children: [],
+      },
+    ],
+  },
+  {
+    id: 900010,
+    orders: 103,
+    parent: null,
+    menuName: "数据表管理",
+    menuEnName: null,
+    menuCode: "bd_project_datatable",
+    menuImg: "icon-shujuguanli",
+    url: null,
+    route: null,
+    enabled: true,
+    treePathName: ",",
+    hasChild: true,
+    grade: 1,
+    type: 0,
+    children: [
+      {
+        id: 900011,
+        orders: 1,
+        parent: 900010,
+        menuName: "数据表分类",
+        menuEnName: null,
+        menuCode: "dt_menu_kind:list",
+        menuImg: "icon-fenlei",
+        url: "@base/views/bd/project/datatable/menu_kind/list",
+        route: "/bd/project/datatable/menu_kind/list",
+        enabled: true,
+        treePathName: ",",
+        hasChild: false,
+        grade: 2,
+        type: 0,
+        children: [],
+      },
+      {
+        id: 900012,
+        orders: 2,
+        parent: 900010,
+        menuName: "数据表定义",
+        menuEnName: null,
+        menuCode: "dt_table_model:list",
+        menuImg: "icon-biaoge",
+        url: "@base/views/bd/project/datatable/table_model/list",
+        route: "/bd/project/datatable/table_model/list",
+        enabled: true,
+        treePathName: ",",
+        hasChild: false,
+        grade: 2,
+        type: 0,
+        children: [],
+      },
+    ],
+  },
+];
+
+// 普通dev账号(8)开放同样的分组，但不给「分支定义」的维护入口
+const bdProjectMenusForDev = bdProjectMenus.map((group) => ({
+  ...group,
+  children: group.children.filter((item) => item.menuCode !== "bd_branch:list"),
+}));
+
 let modules = {};
 modules = {
   userFlagMenuMap: {
@@ -297,6 +518,7 @@ modules = {
         grade: 2,
         type: 0,
       },
+      ...bdProjectMenus,
     ],
     7: [
       {
@@ -433,6 +655,7 @@ modules = {
         grade: 2,
         type: 0,
       },
+      ...bdProjectMenus,
     ],
     8: [
       {
@@ -661,6 +884,7 @@ modules = {
         grade: 2,
         type: 0,
       },
+      ...bdProjectMenusForDev,
     ],
   },
 };

package/src/store/modules/tagsView.js

@@ -198,9 +198,11 @@ actions = {
     commit("UPDATE_VISITED_VIEW", view);
   },
   updateVisitedView2({ commit }, { view, title }) {
-    let newView0 = { ...(view || window.$vueRoot.$route) };
+    let src = view || window.$vueRoot.$route;
+    // 浅拷贝后再拷贝 meta，避免直接改写路由上共享的 meta.title
+    let newView0 = { ...src };
     delete newView0.matched;
-    newView0.meta.title = title;
+    newView0.meta = { ...(src.meta || {}), title };
     let newView = _.cloneDeep(newView0);
 
     commit("UPDATE_VISITED_VIEW", newView);

package/src/views/bd/project/branch/bd_branch/edit.vue

@@ -0,0 +1,145 @@
+<template>
+  <div class="detail-wrap">
+    <el-form ref="editForm" :model="bdBranch">
+      <div class="d-header clearfix">
+        <div class="fl">
+          <i class="el-icon-info" />
+          {{ dataId ? $t1("查看分支定义") : $t1("新增分支定义") }}
+        </div>
+        <div class="fr">
+          <el-button
+            type="primary"
+            plain
+            class="button-sty"
+            @click="$baseReload()"
+            icon="el-icon-refresh-right"
+          >
+            {{ $t1("重置") }}
+          </el-button>
+          <el-button
+            type="primary"
+            class="button-sty"
+            icon="el-icon-check"
+            @click="saveData"
+            >{{ $t1("保存") }}
+          </el-button>
+        </div>
+      </div>
+      <div class="d-cont">
+        <div class="d-item">
+          <div class="title first">
+            <b>{{ $t1("基本信息") }}</b>
+          </div>
+          <table class="table-detail">
+            <tbody>
+              <tr>
+                <th>
+                  <em class="f-red">*</em>
+                  {{ $t1("分支编码") }}
+                </th>
+                <td>
+                  <el-form-item prop="branchCode" :rules="branchCodeRules">
+                    <el-input
+                      type="text"
+                      autocomplete="off"
+                      v-model="bdBranch.branchCode"
+                      :disabled="isEdit"
+                      clearable
+                    />
+                  </el-form-item>
+                </td>
+                <th>
+                  <em class="f-red">*</em>
+                  {{ $t1("分支名称") }}
+                </th>
+                <td>
+                  <el-form-item prop="branchName" :rules="branchNameRules">
+                    <el-input
+                      type="text"
+                      autocomplete="off"
+                      v-model="bdBranch.branchName"
+                      clearable
+                    />
+                  </el-form-item>
+                </td>
+                <th>{{ $t1("是否启用") }}</th>
+                <td>
+                  <el-switch v-model="bdBranch.enabled"></el-switch>
+                </td>
+              </tr>
+              <tr>
+                <th>{{ $t1("备注") }}</th>
+                <td colspan="5">
+                  <el-input
+                    type="textarea"
+                    :rows="2"
+                    :placeholder="$t1('请输入内容')"
+                    size="small"
+                    v-model="bdBranch.remark"
+                    clearable
+                  ></el-input>
+                </td>
+              </tr>
+              <tr>
+                <th>{{ $t1("创建人") }}</th>
+                <td>{{ bdBranch.createBy }}</td>
+                <th>{{ $t1("创建时间") }}</th>
+                <td>{{ bdBranch.createDate }}</td>
+                <th>{{ $t1("更新人") }}</th>
+                <td>{{ bdBranch.modifyBy }}</td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+        <div class="d-item">
+          <div class="title">
+            <b>{{ $t1("分支菜单类型") }}</b>
+          </div>
+          <div class="grid-height" style="height: 320px">
+            <vxe-grid
+              ref="table-menuKind"
+              :data="menuKindRows"
+              v-bind="menuKindOption"
+              @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="openMenuKindDialog"
+                    >
+                      {{ $t1("选择分类") }}
+                    </vxe-button>
+                    <span class="tips">{{
+                      $t1("注：只能选择「分类-通用」的一级分类")
+                    }}</span>
+                  </div>
+                </div>
+              </template>
+            </vxe-grid>
+          </div>
+        </div>
+      </div>
+    </el-form>
+    <menuKindDialog
+      v-if="showMenuKindDialog"
+      :visiable.sync="showMenuKindDialog"
+      :rows="checkedMenuKindRows"
+      multi="true"
+      @confirm="confirmMenuKindDialog"
+    ></menuKindDialog>
+  </div>
+</template>
+
+<script>
+import mixin from "./mixins/edit";
+
+export default {
+  name: "bdBranchEdit",
+  mixins: [mixin],
+};
+</script>

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

@@ -0,0 +1,72 @@
+<template>
+  <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>
+      </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"
+          >
+            <template #form>
+              <tableForm
+                :formData.sync="formData"
+                @searchEvent="searchEvent"
+                @resetEvent="resetEvent"
+              >
+                <template #buttonLeft>
+                  <vxe-button
+                    status="primary"
+                    class="button-sty"
+                    icon="el-icon-plus"
+                    @click="openEditDialog"
+                  >
+                    {{ $t1("新增") }}
+                  </vxe-button>
+                </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>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import mixin from "./mixins/list";
+
+export default {
+  name: "bd_branch:list",
+  mixins: [mixin],
+};
+</script>