cloud-web-corejs 1.0.54-dev.19 → 1.0.54-dev.191

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

@@ -1,7 +1,7 @@
 <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"
                        v-if="showEdit" visible-key="showEdit" :parent-target="_self"
@@ -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="reloadTabContent"></vFormRender>
+          </el-tab-pane>
+        </template>
+      </x-tabs>
     </template>
     <template v-else-if="layoutType=='H5'">
       <el-dialog
@@ -69,7 +77,8 @@ export default {
       formCode2: null,
       dataId: null,
       showEditDialog: false,
-      param: {}
+      param: {},
+      multiTabLabelField:null
     };
   },
   created() {
@@ -100,6 +109,7 @@ export default {
           this.formJson = formJson;
           this.layoutType = formJson.formConfig?.layoutType
           this.formCode2 = formJson.formConfig?.editFormCode ?? null;
+          this.multiTabLabelField = formJson.formConfig?.multiTabLabelField
         }
       });
     },
@@ -108,12 +118,20 @@ 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;
+      if(multiTabEnabled && dataId){
+        this.$refs.xTabs.openEditTab(row,param);
+      }else{
+        this.dataId = dataId
+        this.activeName = 'first';
+        this.showEdit = false;
+        this.showEditDialog = true;
+        this.param = param
+        this.$openEditView('showEdit');
+      }
+
     },
     openEditH5Dialog(row) {
       this.dataId = row && row.id ? row.id : null;

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;