cloud-web-corejs 1.0.163 → 1.0.164

package/src/views/user/form/vform/render.vue

@@ -1,30 +1,46 @@
 <template>
   <div>
-    <div class="designer-view" :class="[layoutType === 'H5' ? 'h5-layout' : layoutType === 'Pad' ? 'pad-layout' : '']">
-      <v-form-render :form-json.sync="formJson" :form-data="formData" :option-data="optionData" ref="vFormRef"
-                     :reportTemplate.sync="formTemplate" :conditionParam.sync="conditionParam"
-                     :formInsData.sync="formInsData"
-                     v-if="showRender" visible-key="showRender" :parent-target="_self" @reload="$baseReload()"
-                     :dataId.sync="dataId" :param="param" v-bind="$attrs" @openCopyEditTab="openCopyEditTab"/>
+    <div
+      class="designer-view"
+      :class="[
+        layoutType === 'H5' ? 'h5-layout' : layoutType === 'Pad' ? 'pad-layout' : '',
+      ]"
+    >
+      <v-form-render
+        :form-json.sync="formJson"
+        :form-data="formData"
+        :option-data="optionData"
+        ref="vFormRef"
+        :reportTemplate.sync="formTemplate"
+        :conditionParam.sync="conditionParam"
+        :formInsData.sync="formInsData"
+        v-if="showRender"
+        visible-key="showRender"
+        :visiable.sync="showRender"
+        :parent-target="_self"
+        @reload="$baseReload()"
+        :dataId.sync="dataId"
+        :param="param"
+        v-bind="$attrs"
+        @openCopyEditTab="openCopyEditTab"
+      />
     </div>
   </div>
-
 </template>
 <script>
-import {loadExtension} from '@base/components/xform/extension/extension-loader'
+import { loadExtension } from "@base/components/xform/extension/extension-loader";
 
-loadExtension()
-import VFormRender from '@base/components/xform/form-render/index.vue'
+loadExtension();
+import VFormRender from "@base/components/xform/form-render/index.vue";
 import scriptHttpMixin from "@base/components/xform/mixins/scriptHttp";
 
-
 export default {
-  name: 'vform_render',
+  name: "vform_render",
   mixins: [scriptHttpMixin],
   components: {
-    VFormRender
+    VFormRender,
   },
-  props: ['object_foreign_id', 'dataId', 'param'],
+  props: ["object_foreign_id", "dataId", "param"],
   data() {
     return {
       formJson: {},
@@ -35,7 +51,7 @@ export default {
       formCode: null,
       layoutType: null,
       conditionParam: null,
-      formInsData: null
+      formInsData: null,
     };
   },
   created() {
@@ -47,7 +63,7 @@ export default {
       let code = this.$attrs.formCode;
       if (!code) {
         var hash = window.location.hash;
-        let str = '#/report/xform/render/';
+        let str = "#/report/xform/render/";
         if (hash.indexOf(str) == 0) {
           code = hash.slice(str.length);
         }
@@ -61,12 +77,12 @@ export default {
       let param = {
         objTypeCode: this.$attrs.objTypeCode,
         objId: this.$attrs.objId,
-        taskId: this.$attrs.taskId
+        taskId: this.$attrs.taskId,
       };
       this.conditionParam = param;
       let url, data;
       url = USER_PREFIX + `/formTemplate/getByFormCode`;
-      data = {stringOne: this.formCode};
+      data = { stringOne: this.formCode };
       this.$http({
         aes: true,
         url: url,
@@ -75,26 +91,28 @@ export default {
         // isLoading: true,
         // loadingTarget: document.body,
         // modalStrictly: true,
-        success: async res => {
+        success: async (res) => {
           let formTemplate = res.objx || {};
           this.formTemplate = formTemplate;
-          this.formJson = formTemplate.formViewContent ? JSON.parse(formTemplate.formViewContent) : {};
-          this.layoutType = this.formJson.formConfig.layoutType
+          this.formJson = formTemplate.formViewContent
+            ? JSON.parse(formTemplate.formViewContent)
+            : {};
+          this.layoutType = this.formJson.formConfig.layoutType;
           this.getFormInsData2();
-        }
+        },
       });
     },
     getReqParam(item, dataId, billData) {
       let param = {};
       if (item.accessParam) {
         if (typeof item.accessParam === "string") {
-          let n = new Function('billData', item.accessParam);
+          let n = new Function("billData", item.accessParam);
           param = n.call(this, billData);
         } else {
-          param = item.accessParam
+          param = item.accessParam;
         }
       } else {
-        param = {id: dataId}
+        param = { id: dataId };
       }
       return param;
     },
@@ -103,13 +121,13 @@ export default {
       let formConfig = this.formJson.formConfig;
       let dataId = this.dataId;
       if (formConfig.onBeforeCreated) {
-        let n = new Function('dataId', "formCode", "done", formConfig.onBeforeCreated);
+        let n = new Function("dataId", "formCode", "done", formConfig.onBeforeCreated);
         let toDo = function (res) {
           let formData = res && res.objx ? res.objx : {};
           that.formData = formData;
           that.formInsData = formData;
           that.showRender = true;
-        }
+        };
         n.call(this, dataId, this.formCode, toDo);
       } else {
         this.formData = this.$attrs.formData ?? {};
@@ -121,25 +139,25 @@ export default {
       let getConfig = formConfig.getConfig || {};
       let dataId = this.dataId;
       if (dataId) {
-        let reqParam = {id: dataId};
-        let accessParamArguments = [{name: "id", value: dataId}]
+        let reqParam = { id: dataId };
+        let accessParamArguments = [{ name: "id", value: dataId }];
         this.scriptHttp({
           options: getConfig,
           params: reqParam,
           targetFormTemplate: this.formTemplate,
           accessParamArguments: accessParamArguments,
-          success: res => {
+          success: (res) => {
             let formData = res.objx || {};
             this.formData = formData;
             this.formInsData = res.objx;
             this.showRender = true;
-          }
-        })
+          },
+        });
       }
     },
-    openCopyEditTab(formData){
-      this.$emit("openCopyEditTab",formData)
-    }
-  }
+    openCopyEditTab(formData) {
+      this.$emit("openCopyEditTab", formData);
+    },
+  },
 };
 </script>

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>