cloud-web-corejs 1.0.163 → 1.0.165

package/src/views/user/form/view/list.vue

@@ -1,42 +1,70 @@
 <template>
   <div id="containt">
     <template v-if="layoutType == 'PC'">
-      <x-tabs ref="xTabs" v-model="activeName" class="tab-box">
+      <x-tabs ref="xTabs" v-model="activeName" class="tab-box" :tabNameEnable="true">
         <el-tab-pane :label="$t2('常规')" name="first">
           <vFormRender
+            ref="edit"
             :formCode.sync="formCode1"
             :dataId.sync="dataId"
             :param="param"
             :formData="formData"
             v-if="showEdit"
             visible-key="showEdit"
+            :visiable.sync="showEdit"
             :parent-target="_self"
             @reload="reload"
             @openCopyEditTab="openCopyEditTab"
           ></vFormRender>
         </el-tab-pane>
-        <el-tab-pane :label="$t2('列表')" name="second">
+        <el-tab-pane :label="$t2(formConfig.customListTabLabel || '列表')" name="second">
           <div class="grid-height">
             <vFormRender
+              ref="list"
               :formCode="formCode"
               style="height: 100%"
               v-if="showRender"
               visible-key="showRender"
+              :visiable.sync="showRender"
               :parent-target="_self"
               @reload="$reloadHandle"
               :openEditDialog="openEditDialog"
             ></vFormRender>
           </div>
         </el-tab-pane>
+        <el-tab-pane
+          v-for="(item, index) in otherTabList"
+          :key="index"
+          :label="$t2(item.label)"
+          :name="`otherTab${index}`"
+        >
+          <div class="grid-height">
+            <vFormRender
+              :ref="`list${index}`"
+              :formCode.sync="item.formCode"
+              :dataId.sync="item.dataId"
+              :param="item.param"
+              v-if="item.showContent"
+              :parent-target="_self"
+              @reload="
+                (...args) => {
+                  reloadAutoContent(...args);
+                }
+              "
+              :openEditDialog="openEditDialog1"
+            ></vFormRender>
+          </div>
+        </el-tab-pane>
         <template #editTab="{ tab, index, reloadTabContent }">
           <el-tab-pane
-            :key="tab.data.id"
-            :label="tab.data[multiTabLabelField]"
-            :name="tab.data.id + ''"
+            :key="tab.tabName"
+            :label="tab.data[tab.tabLabelField]"
+            :name="tab.tabName"
             :closable="true"
           >
             <vFormRender
-              :formCode="tab.formCode"
+              ref="multiEdit"
+              :formCode.sync="tab.formCode"
               :dataId.sync="tab.dataId"
               :param="tab.param"
               v-if="tab.showContent"
@@ -103,8 +131,7 @@ export default {
     return {
       activeName: "second",
       showEdit: false,
-
-      formJson: {},
+      formJson: { formConfig: {} },
       formConfig: {},
       showRender: false,
       formTemplate: null,
@@ -119,12 +146,30 @@ export default {
       param: {},
       multiTabLabelField: null,
       formData: null,
+      otherTabList: [],
     };
   },
+  watch: {
+    activeName(val) {
+      if (
+        this.formJson.formConfig.otherTabEnabled &&
+        this.otherTabList.length > 0 &&
+        val.startsWith("otherTab")
+      ) {
+        let num = Number(val.substring("otherTab".length));
+        this.otherTabList[num].showContent = true;
+      }
+    },
+  },
   created() {
     this.initParam();
     this.getReportTemplate();
   },
+  provide() {
+    return {
+      _self: this,
+    };
+  },
   methods: {
     initParam() {
       let path = this.$route.path;
@@ -135,7 +180,7 @@ export default {
     },
     getReportTemplate() {
       this.$http({
-        aes: true,
+        // aes: true,
         url: USER_PREFIX + `/formTemplate/getByFormCode`,
         method: `post`,
         data: { stringOne: this.formCode },
@@ -149,6 +194,7 @@ export default {
             ? JSON.parse(formTemplate.formViewContent)
             : {};
           this.formJson = formJson;
+          this.formConfig = formJson.formConfig || {};
           this.layoutType = formJson.formConfig?.layoutType;
           let addFormCode = formJson.formConfig?.addFormCode ?? null;
           let formCode2 = formJson.formConfig?.editFormCode ?? null;
@@ -158,6 +204,7 @@ export default {
           }
           this.addFormCode = addFormCode;
           this.multiTabLabelField = formJson.formConfig?.multiTabLabelField;
+          this.initOtherTabList();
         },
       });
     },
@@ -167,7 +214,16 @@ export default {
         return;
       }
       let formConfig = this.formJson.formConfig;
-      let multiTabEnabled = formConfig.multiTabEnabled && formConfig.multiTabLabelField;
+      let tabLabelField = option?.multiTabLabelField || formConfig.multiTabLabelField;
+      let multiTabEnabled = false;
+      if (tabLabelField) {
+        if (option?.multiTabEnabled) {
+          multiTabEnabled = true;
+        } else if (formConfig.multiTabEnabled && option?.multiTabEnabled !== false) {
+          multiTabEnabled = true;
+        }
+      }
+
       let dataId = row && row.id ? row.id : null;
       this.dataId = dataId;
       let formCode = null;
@@ -180,6 +236,8 @@ export default {
         this.$refs.xTabs.openEditTab(row, param, {
           tabParam: {
             formCode,
+            tabLabelField,
+            tabName: formCode + dataId,
           },
         });
       } else {
@@ -192,6 +250,9 @@ export default {
         this.$openEditView("showEdit");
       }
     },
+    openEditDialog1(row, param, option) {
+      this.openEditDialog(row, param, { multiTabEnabled: false, ...option });
+    },
     openEditH5Dialog(row) {
       this.formCode1 = this.addFormCode;
       this.dataId = row && row.id ? row.id : null;
@@ -221,6 +282,38 @@ export default {
       this.formData = {};
       this.$reloadHandle(...arguments);
     },
+    initOtherTabList() {
+      if (!this.formJson.formConfig.otherTabEnabled) return;
+      this.otherTabList = this.formJson.formConfig.otherTabList
+        .filter((item) => !!item.formCode && !!item.label)
+        .map((item) => {
+          return {
+            label: item.label,
+            formCode: item.formCode,
+            showContent: false,
+            dataId: null,
+            param: null,
+          };
+        });
+    },
+    reloadAutoContent(target, param, tab) {
+      let updateParam =
+        param != null && param.updateParam != null ? param.updateParam : {};
+      for (let key in updateParam) {
+        target.$emit("update:" + key, updateParam[key]);
+      }
+
+      if (!tab) {
+        let activeName = this.activeName;
+        tab = this.tabs.find((item) => item.label == activeName);
+      }
+      if (tab) {
+        tab.showContent = false;
+        setTimeout(() => {
+          tab.showContent = true;
+        }, 200);
+      }
+    },
   },
 };
 </script>

package/src/views/user/menu/list.vue

@@ -351,7 +351,7 @@ export default {
         treeNodeUrl: USER_PREFIX + '/menu/listChildren',
         editSaveUrl: USER_PREFIX + '/menu/save',
         editDefaultRow: () => {
-          return {enabled: true, type: this.menuType};
+          return {enabled: true, type: this.menuType,checkPermission: 0};
         },
         param: () => {
           return this.formData;
@@ -450,6 +450,29 @@ export default {
               }
             }
           },
+          {
+            field: 'checkPermission',
+            title: this.$t1('查询数据权限'),
+            width: 150,
+            editRender: {},
+            slots: {
+              default: ({row}) => {
+                if (row.checkPermission) {
+                  return [<div class="txt-status">{this.$t1('启用')}</div>];
+                } else {
+                  return [<div class="txt-status s-3">{this.$t1('禁用')}</div>];
+                }
+              },
+              edit: ({row}) => {
+                return [
+                  <el-select v-model={row.checkPermission}>
+                      <el-option value={1} label={this.$t1('启用')}></el-option>
+                      <el-option value={0} label={this.$t1('禁用')}></el-option>
+                  </el-select>
+                ]
+              }
+            }
+          },
           // { field: 'treePathName', title: '上级菜单', width: 200 },
           {field: 'orders', title: this.$t1('序号'), width: 100, editRender: {name: 'input'}},
           {

package/src/views/user/role/authConfig.vue

@@ -0,0 +1,89 @@
+<template>
+  <el-form
+    :model="formData"
+    status-icon
+    label-width="100px"
+    class="demo-ruleForm"
+    style="border: solid 1px #e9e9e9; padding: 5px"
+  >
+    <el-form-item :label="$t1('查询数据权限')">
+      <el-radio-group
+        v-model="formData.permissions"
+        @change="formData.menuRolePermOrgDTOs = []"
+      >
+        <el-radio :label="1">{{ $t1("创建人") }}</el-radio>
+        <el-radio :label="3">{{ $t1("所有") }}</el-radio>
+        <el-radio :label="2">{{ $t1("当前与下级所有机构权限") }}</el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item :label="$t1('额外机构')" v-if="formData.permissions == 2">
+      <el-tag
+        v-for="(item, index) in formData.menuRolePermOrgDTOs"
+        :key="index"
+        type="warning"
+        :disable-transitions="false"
+        :closable="true"
+        @close="formData.menuRolePermOrgDTOs.splice(index, 1)"
+      >
+        <el-tooltip
+          :enterable="false"
+          effect="dark"
+          :content="item.saleOrgName"
+          placement="bottom"
+        >
+          <span>{{ item.saleOrgName }}</span>
+        </el-tooltip>
+      </el-tag>
+      <el-button
+        icon="el-icon-plus"
+        type="warning"
+        class="el-button-tag"
+        @click="openProjectTagDialog"
+      ></el-button>
+    </el-form-item>
+    <saleOrgsDialog
+      v-if="showSaleOrgsDialog"
+      :visiable.sync="showSaleOrgsDialog"
+      @confirm="confirmSaleOrgsDialog"
+    ></saleOrgsDialog>
+  </el-form>
+</template>
+<script>
+import saleOrgsDialog from "@base/views/user/sale_org/dialog.vue";
+export default {
+  props: {
+    formData: {
+      type: Object,
+      default: () => {},
+    },
+  },
+  components: {
+    saleOrgsDialog,
+  },
+  data() {
+    return {
+      showSaleOrgsDialog: false,
+    };
+  },
+  methods: {
+    openProjectTagDialog() {
+      this.showSaleOrgsDialog = true;
+    },
+    confirmSaleOrgsDialog(rows) {
+      if (rows.length) {
+        let ids = this.formData.menuRolePermOrgDTOs.map((item) => item.saleOrgId);
+        let items = rows
+          .filter((item) => !ids.includes(item.id))
+          .map((item) => {
+            return {
+              menus: this.formData.id,
+              saleOrgId: item.id,
+              saleOrgName: item.name,
+            };
+          });
+        if (items.length) this.formData.menuRolePermOrgDTOs.push(...items);
+      }
+    },
+  },
+};
+</script>

package/src/views/user/role/dialog.vue

@@ -12,7 +12,7 @@
     v-el-drag-dialog
     v-el-dialog-center
   >
-    <div class="cont" style="height:65vh">
+    <div class="cont" style="height: 65vh">
       <vxe-grid
         class="is-pointer"
         ref="table-m1"
@@ -26,24 +26,41 @@
         <template #form>
           <div class="clearfix screen-btns">
             <div class="fr">
-              <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                          plain>{{ $t1('重置') }}
+              <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
+                status="warning"
+                icon="el-icon-search"
+                class="button-sty"
+                @click="searchEvent"
+              >
+                {{ $t1("搜索") }}
               </vxe-button>
             </div>
           </div>
-          <vxe-form class="screen-box" title-width="92px" title-align="right" :data="formData" @submit="searchEvent"
-                    @reset="resetEvent">
-            <vxe-form-item :title="$t1('用户角色')+':'" field="name">
+          <vxe-form
+            class="screen-box"
+            title-width="92px"
+            title-align="right"
+            :data="formData"
+            @submit="searchEvent"
+            @reset="resetEvent"
+          >
+            <vxe-form-item :title="$t1('用户角色') + ':'" field="name">
               <template v-slot>
-                <el-input v-model="formData.name" size="small" clearable/>
+                <el-input v-model="formData.name" size="small" clearable />
               </template>
             </vxe-form-item>
-            <vxe-form-item :title="$t1('角色编码')+':'" field="code">
+            <vxe-form-item :title="$t1('角色编码') + ':'" field="code">
               <template v-slot>
-                <el-input v-model="formData.code" size="small" clearable/>
+                <el-input v-model="formData.code" size="small" clearable />
               </template>
             </vxe-form-item>
             <vxe-button type="submit" @click="searchEvent" v-show="false"></vxe-button>
@@ -58,9 +75,12 @@
       </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
+        :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">
@@ -70,25 +90,27 @@
       </div>
     </div>
     <span slot="footer" class="dialog-footer">
-      <span class="fl tips" v-if="!selectMulti">{{ $t1('注：双击确认选择（单选）') }}</span>
+      <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('取 消') }}
+        {{ $t1("取 消") }}
       </el-button>
       <el-button type="primary" @click="dialogPrimary" class="button-sty">
         <i class="el-icon-check el-icon"></i>
-        {{ $t1('确 定') }}
+        {{ $t1("确 定") }}
       </el-button>
     </span>
   </el-dialog>
 </template>
 
 <script>
-import {selectDialogMixins} from '@base/mixins/selectDialog/index.js';
+import { selectDialogMixins } from "@base/mixins/selectDialog/index.js";
 
 export default {
-  name: 'roleDialog',
-  props: ['visiable', 'multi', 'rows', 'param'],
+  name: "roleDialog",
+  props: ["visiable", "multi", "rows", "param"],
   mixins: [selectDialogMixins],
   created() {
     this.initSetting();
@@ -103,64 +125,64 @@ export default {
       falseValue: false,
       selectMulti: true,
       formData: {},
-      vxeOption: {}
+      vxeOption: {},
     };
   },
   methods: {
     initTableM1() {
       let that = this;
-      let url = USER_PREFIX + '/role/listCurrentPage';
+      let url = USER_PREFIX + "/role/listCurrentPage";
       let tableOption = {
         vue: that,
-        tableRef: 'table-m1',
-        tableName: 'basic_role_dialog-m1',
+        tableRef: "table-m1",
+        tableName: "basic_role_dialog-m1",
         path: url,
         param: () => {
           return {
             ...this.formData,
-            ...this.param
+            ...this.param,
           };
         },
         columns: [
-          {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
-          {title: this.$t1('用户角色'), field: 'name', width: 250, fixed: 'left'},
-          {title: this.$t1('角色编码'), field: 'code', width: 150},
-          {title: this.$t1('角色描述'), field: 'description', width: 150},
+          { type: "checkbox", width: 48, resizable: false, fixed: "left" },
+          { title: this.$t1("用户角色"), field: "name", width: 250, fixed: "left" },
+          { title: this.$t1("角色编码"), field: "code", width: 150 },
+          { title: this.$t1("角色描述"), field: "description", width: 150 },
           {
-            title: this.$t1('是否内置'),
-            field: 'systems',
+            title: this.$t1("是否内置"),
+            field: "systems",
             width: 150,
             slots: {
-              default: ({row}) => {
+              default: ({ row }) => {
                 if (row.systems) {
-                  return this.$t1('是');
+                  return this.$t1("是");
                 } else {
-                  return this.$t1('否');
+                  return this.$t1("否");
                 }
-              }
-            }
+              },
+            },
           },
-          {title: this.$t1('所属组织'), field: 'companyName', width: 150},
-          {title: this.$t1('创建时间'), field: 'createDate', width: 150},
+          { title: this.$t1("所属组织"), field: "companyName", width: 150 },
+          { title: this.$t1("创建时间"), field: "createDate", width: 150 },
           {
             width: 47,
-            fixed: 'right',
-            title: '',
-            sortable: false
-          }
+            fixed: "right",
+            title: "",
+            sortable: false,
+          },
         ],
         config: {
           checkboxConfig: {
             checkStrictly: true,
             showHeader: this.selectMulti,
-            trigger: 'row'
-          }
-        }
+            trigger: "row",
+          },
+        },
       };
-      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+      this.$vxeTableUtil.initVxeTable(tableOption).then((opts) => {
         that.vxeOption = opts;
       });
-    }
-  }
+    },
+  },
 };
 </script>