cloud-web-corejs 1.0.54-dev.35 → 1.0.54-dev.351

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

@@ -31,7 +31,7 @@ export default {
           data: {
             dw: dw
           },
-          isLoading: true,
+          // isLoading: true,
           success: res => {
             let token = res.objx;
             this.$store

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

@@ -5,7 +5,7 @@
                      :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"/>
+                     :dataId.sync="dataId" :param="param" v-bind="$attrs" @openCopyEditTab="openCopyEditTab"/>
     </div>
   </div>
 
@@ -72,9 +72,9 @@ export default {
         url: url,
         method: `post`,
         data: data,
-        isLoading: true,
-        loadingTarget: document.body,
-        modalStrictly: true,
+        // isLoading: true,
+        // loadingTarget: document.body,
+        // modalStrictly: true,
         success: async res => {
           let formTemplate = res.objx || {};
           this.formTemplate = formTemplate;
@@ -112,6 +112,7 @@ export default {
         }
         n.call(this, dataId, this.formCode, toDo);
       } else {
+        this.formData = this.$attrs.formData ?? {};
         this.showRender = true;
       }
     },
@@ -135,6 +136,9 @@ export default {
           }
         })
       }
+    },
+    openCopyEditTab(formData){
+      this.$emit("openCopyEditTab",formData)
     }
   }
 };

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

@@ -1,37 +1,38 @@
-<template>
-  <vFormRender :formCode="formCode" :dataId.sync="dataId"
-               v-if="showEdit" visible-key="showEdit" :parent-target="_self"
-               @reload="$reloadHandle"></vFormRender>
-</template>
-<script>
-
-import vFormRender from "../../../../views/user/form/vform/render.vue";
-
-export default {
-  components: {vFormRender},
-  data() {
-    return {
-      formCode: null,
-      dataId: null,
-      showEdit: false,
-    }
-  },
-  created() {
-    this.init()
-  },
-  methods: {
-    init() {
-      let formCode = this.$route.query.formCode || this.$attrs.formCode;
-      let dataId = this.$route.query.dataId || this.$attrs.dataId;
-      if (dataId && formCode) {
-        this.formCode = formCode;
-        this.dataId = Number(dataId);
-        this.showEdit = true;
-      }
-    }
-  }
-}
-</script>
-<style scoped>
-
-</style>
+<template>
+  <vFormRender :formCode="formCode" :dataId.sync="dataId"
+               v-if="showEdit" visible-key="showEdit" :parent-target="_self"
+               @reload="$reloadHandle"></vFormRender>
+</template>
+<script>
+
+import vFormRender from "../../../../views/user/form/vform/render.vue";
+
+export default {
+  components: {vFormRender},
+  data() {
+    return {
+      formCode: null,
+      dataId: null,
+      showEdit: false,
+    }
+  },
+  created() {
+    this.init()
+  },
+  methods: {
+    init() {
+      let formCode = this.$route.query.formCode || this.$attrs.formCode;
+      let dataId = this.$route.query.dataId || this.$attrs.dataId || this.$attrs._dataId;
+
+      if (dataId && formCode) {
+        this.formCode = formCode;
+        this.dataId = Number(dataId);
+        this.showEdit = true;
+      }
+    }
+  }
+}
+</script>
+<style scoped>
+
+</style>

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

@@ -1,11 +1,11 @@
 <template>
   <div id="containt">
     <template v-if="layoutType=='PC'">
-      <el-tabs v-model="activeName" class="tab-box">
+      <x-tabs ref="xTabs" v-model="activeName" class="tab-box">
         <el-tab-pane :label="$t2('常规')" name="first">
-          <vFormRender :formCode="formCode2" :dataId.sync="dataId" :param="param"
+          <vFormRender :formCode.sync="formCode1" :dataId.sync="dataId" :param="param" :formData="formData"
                        v-if="showEdit" visible-key="showEdit" :parent-target="_self"
-                       @reload="$reloadHandle"></vFormRender>
+                       @reload="reload" @openCopyEditTab="openCopyEditTab"></vFormRender>
         </el-tab-pane>
         <el-tab-pane :label="$t2('列表')" name="second">
           <div class="grid-height">
@@ -14,7 +14,15 @@
                          @reload="$reloadHandle" :openEditDialog="openEditDialog"></vFormRender>
           </div>
         </el-tab-pane>
-      </el-tabs>
+        <template #editTab="{tab,index,reloadTabContent}">
+          <el-tab-pane :key="tab.data.id" :label="tab.data[multiTabLabelField]" :name="tab.data.id+''"
+                       :closable="true">
+            <vFormRender :formCode="formCode2" :dataId.sync="tab.dataId" :param="tab.param"
+                         v-if="tab.showContent" :parent-target="_self"
+                         @reload="(...args)=>{formData = {};reloadTabContent(...args)}" @openCopyEditTab="openCopyEditTab"></vFormRender>
+          </el-tab-pane>
+        </template>
+      </x-tabs>
     </template>
     <template v-else-if="layoutType=='H5'">
       <el-dialog
@@ -66,10 +74,14 @@ export default {
       /*      formCode: null,*/
       layoutType: null,
       formCode: null,
+      formCode1: null,
       formCode2: null,
+      addFormCode:null,
       dataId: null,
       showEditDialog: false,
-      param: {}
+      param: {},
+      multiTabLabelField:null,
+      formData:null
     };
   },
   created() {
@@ -90,16 +102,23 @@ export default {
         url: USER_PREFIX + `/formTemplate/getByFormCode`,
         method: `post`,
         data: {stringOne: this.formCode},
-        isLoading: true,
-        loadingTarget: document.body,
-        modalStrictly: true,
+        // isLoading: true,
+        // loadingTarget: document.body,
+        // modalStrictly: true,
         success: async res => {
           let formTemplate = res.objx || {};
           this.formTemplate = formTemplate;
           let formJson = formTemplate.formViewContent ? JSON.parse(formTemplate.formViewContent) : {};
           this.formJson = formJson;
           this.layoutType = formJson.formConfig?.layoutType
-          this.formCode2 = formJson.formConfig?.editFormCode ?? null;
+          let addFormCode = formJson.formConfig?.addFormCode ?? null;
+          let formCode2 = formJson.formConfig?.editFormCode ?? null;
+          this.formCode2 = formCode2
+          if(!addFormCode) {
+            addFormCode = formCode2
+          }
+          this.addFormCode = addFormCode;
+          this.multiTabLabelField = formJson.formConfig?.multiTabLabelField
         }
       });
     },
@@ -108,14 +127,29 @@ export default {
         this.openEditH5Dialog(row);
         return;
       }
-      this.dataId = row && row.id ? row.id : null;
-      this.activeName = 'first';
-      this.showEdit = false;
-      this.showEditDialog = true;
-      this.param = param
-      this.$openEditView('showEdit');
+      let formConfig = this.formJson.formConfig
+      let multiTabEnabled = formConfig.multiTabEnabled && formConfig.multiTabLabelField
+      let dataId = row && row.id ? row.id : null;
+      this.dataId = dataId
+      if(!dataId){
+          this.formCode1 = this.addFormCode;
+      }else{
+        this.formCode1 = this.formCode2;
+      }
+      if(multiTabEnabled && dataId){
+        this.$refs.xTabs.openEditTab(row,param);
+      }else{
+        this.activeName = 'first';
+        this.showEdit = false;
+        this.showEditDialog = true;
+        this.param = param
+        this.formData = null;
+        this.$openEditView('showEdit');
+      }
+
     },
     openEditH5Dialog(row) {
+      this.formCode1 = this.addFormCode;
       this.dataId = row && row.id ? row.id : null;
       this.activeName = 'first';
       this.showEdit = false;
@@ -124,6 +158,25 @@ export default {
         this.$openEditView('showEdit');
       });
     },
+
+    openCopyEditTab(formData) {
+      this.dataId = null
+      this.formCode1 = this.addFormCode;
+      this.activeName = 'first';
+      this.showEdit = false;
+      this.showEditDialog = true;
+      // this.param = param
+      this.formData = formData;
+      this.$openEditView('showEdit');
+    },
+    reload(...args){
+      this.formData = {};
+      this.$reloadHandle(...args)
+    },
+    reload2(){
+      this.formData = {};
+      this.$reloadHandle(...arguments)
+    }
   }
 };
 </script>

package/src/views/user/groups/edit.vue

@@ -76,6 +76,7 @@ export default {
       if (this.dataId && !isNaN(this.dataId)) {
         this.isEdit = true;
         this.$commonHttp({
+          aes:true,
           url: USER_PREFIX + `/groups/get`,
           method: `post`,
           data: {
@@ -95,6 +96,7 @@ export default {
           this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
             var url = USER_PREFIX + (this.isEdit ? `/groups/update` : `/groups/save`);
             this.$http({
+              aes:true,
               url: url,
               method: `post`,
               data: this.groups,

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

@@ -86,6 +86,7 @@ export default {
         vue: this,
         tableRef: 'table-m1',
         tableName: 'user_groups_list-m1',
+        aes: true,
         path: USER_PREFIX + '/groups/listPage',
         param: () => {
           return this.formData;