cloud-web-corejs 1.0.54-dev.453 → 1.0.54-dev.456

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.453",
+  "version": "1.0.54-dev.456",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/baseInputExport/index.vue

@@ -1,18 +1,25 @@
 <template>
-  <el-dropdown @command="exportBill" trigger="hover"
-               v-if="exportTemplates.length>0">
-
+  <el-dropdown @command="exportBill" trigger="hover" v-if="exportTemplates.length > 0">
     <el-button type="primary" class="button-sty" size="mini">
-      <span>{{ buttonName }}</span><span class="line"></span> <i class="el-icon-arrow-down el-icon--right"></i>
+      <span>{{ buttonName }}</span
+      ><span class="line"></span> <i class="el-icon-arrow-down el-icon--right"></i>
     </el-button>
     <el-dropdown-menu slot="dropdown">
-      <template v-for="(item,index) in exportTemplates">
-        <el-dropdown-item v-if="item.etType == 0 || item.etType == 1" icon="el-icon-upload2" :command="item"
-                          :key="index">
+      <template v-for="(item, index) in exportTemplates">
+        <el-dropdown-item
+          v-if="item.etType == 0 || item.etType == 1 || item.etType == 5"
+          icon="el-icon-upload2"
+          :command="item"
+          :key="index"
+        >
           {{ item.etName }}
         </el-dropdown-item>
-        <el-dropdown-item v-else-if="printTypes.includes(item.etType)" icon="el-icon-printer" :command="item"
-                          :key="index">
+        <el-dropdown-item
+          v-else-if="printTypes.includes(item.etType)"
+          icon="el-icon-printer"
+          :command="item"
+          :key="index"
+        >
           {{ item.etName }}
         </el-dropdown-item>
       </template>
@@ -21,11 +28,11 @@
 </template>
 
 <script>
-import mixins from "./mixins.js"
+import mixins from "./mixins.js";
 
 export default {
-  name: 'baseInputExport',
-  mixins: [mixins]
+  name: "baseInputExport",
+  mixins: [mixins],
 };
 </script>
 

package/src/components/xform/form-designer/designer.js

@@ -93,7 +93,9 @@ let chartContainers = [],
         multiTabLabelField:null,
         addFormCode: null,
         addFormName: null,
-        wfTheme: null
+        wfTheme: null,
+        otherTabEnabled:false,
+        otherTabList:[]
       },
       dataSources: [], //数据源
 

package/src/components/xform/form-designer/setting-panel/form-setting.vue

@@ -170,6 +170,54 @@
             <el-input type="text" v-model="formConfig.multiTabLabelField"></el-input>
           </el-form-item>
         </el-collapse-item>
+        <el-collapse-item name="2" title="其他标签页信息">
+          <el-form-item :label="i18nt('启用其他标签页')">
+            <el-switch v-model="formConfig.otherTabEnabled"></el-switch>
+          </el-form-item>
+          <el-form-item :label="i18nt('其他标签页配置')"> </el-form-item>
+          <el-form-item label-width="0">
+            <div>
+              <draggable
+                tag="ul"
+                class="draggable-box"
+                :list="formConfig.otherTabList"
+                v-bind="{
+                  group: 'optionsGroup',
+                  ghostClass: 'ghost',
+                  handle: '.drag-option',
+                }"
+              >
+                <li v-for="(option, idx) in formConfig.otherTabList" :key="idx">
+                  <el-input
+                    v-model="option.label"
+                    size="mini"
+                    style="width: 100px"
+                    placeholder="标签名称"
+                  ></el-input>
+                  <el-input
+                    v-model="option.formCode"
+                    size="mini"
+                    style="width: 100px"
+                    placeholder="表单模板编码"
+                  ></el-input>
+                  <i class="el-icon-s-operation drag-option"></i>
+                  <el-button
+                    circle
+                    plain
+                    size="mini"
+                    type="danger"
+                    @click="formConfig.otherTabList.splice(idx, 1)"
+                    icon="el-icon-minus"
+                    class="col-delete-button"
+                  ></el-button>
+                </li>
+              </draggable>
+              <el-button type="text" @click="addOtherTab">{{
+                i18nt("designer.setting.addOption")
+              }}</el-button>
+            </div>
+          </el-form-item>
+        </el-collapse-item>
 
         <el-collapse-item name="3" title="详情表单信息">
           <el-form-item :label="i18nt('查看页面表单编码')">
@@ -1310,6 +1358,15 @@ $\{wf.starterName\}提交的$\{pm_product_project.product_code\}$\{pm_product_pr
         item.companyCodes = row.bdCompanyCode;
       }
     },
+    addOtherTab() {
+      if (!this.formConfig.otherTabList) {
+        this.$set(this.formConfig, "otherTabList", []);
+      }
+      this.formConfig.otherTabList.push({
+        label: null,
+        formCode: null,
+      });
+    },
   },
 };
 </script>

package/src/components/xform/form-designer/setting-panel/property-editor/wfFlag-editor.vue

@@ -177,7 +177,7 @@
           <el-table-column type="index" width="35" fixed="left"></el-table-column>
           <el-table-column :label="i18nt('流程动作')" width="150">
             <template slot-scope="{ row }">
-              <el-select v-model="row.action">
+              <el-select v-model="row.action" @change="row.toValue = null">
                 <el-option value="start" label="流程启动"></el-option>
                 <el-option value="interrupt" label="流程中断"></el-option>
                 <el-option value="end" label="流程完成"></el-option>
@@ -196,7 +196,26 @@
                     </el-table-column>-->
           <el-table-column :label="i18nt('设置的值')" width="650">
             <template slot-scope="{ row }">
-              <el-input v-model="row.toValue" clearable></el-input>
+              <el-select
+                v-model="row.toValue"
+                clearable
+                style="width: 100%"
+                v-if="row.action === 'specificAction'"
+              >
+                <el-option value="wfCreateDate" label="流程创建(启动)时间"></el-option>
+                <el-option value="wfModifyDate" label="流程更新时间"></el-option>
+                <el-option value="wfInterruptDate" label="流程中断时间"></el-option>
+                <el-option value="wfEndDate" label="流程完成时间"></el-option>
+                <el-option value="wfStarterName" label="启动人姓名"></el-option>
+                <el-option value="wfName" label="流程模板名称"></el-option>
+                <el-option value="wfUuid" label="流程实例uuid"></el-option>
+                <el-option value="objTypeCode" label="流程单据类型编码"></el-option>
+                <el-option value="wfCandidateNames" label="当前审批人名"></el-option>
+                <el-option value="wfTaskName" label="当前审批节点名"></el-option>
+                <el-option value="wfStat" label="流程状态"></el-option>
+                <el-option value="wfSubjectName" label="流程主题名称"></el-option>
+              </el-select>
+              <el-input v-model="row.toValue" clearable v-else></el-input>
               <!--              <el-input v-model="row.toValue" clearable v-if="row.valueType==1"></el-input>
                             <base-input-number v-model="row.toValue" clearable v-else-if="row.valueType==2"></base-input-number>
                             <el-radio-group v-model="row.toValue" v-else-if="row.valueType==3">

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

@@ -860,7 +860,9 @@ export function getDefaultFormConfig() {
     multiTabLabelField:null,
     addFormCode:null,
     addFormName: null,
-    wfTheme: null
+    wfTheme: null,
+    otherTabEnabled:false,
+    otherTabList:[]
   };
 }
 

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

@@ -1,349 +1,418 @@
-<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="tree-box fl">
-          <div class="tit"><b>{{ $t1('操作类型') }}</b></div>
-          <el-tree
-            :props="defaultProps"
-            :load="loadNode"
-            node-key="id"
-            ref="tree"
-            highlight-current
-            lazy
-            :expand-on-click-node="false"
-            @node-click="handleNodeClick"
-            class="tree-list"
-            icon-class="el-icon-arrow-down"
-          ></el-tree>
-        </div>
-        <label id="labBtn">
-          <div class="icon">
-            <i class="el-icon-more"></i>
-            <i class="el-icon-more"></i>
-          </div>
-        </label>
-        <div class="main-right fr" style="padding-left:6px;">
-          <div class="grid-height">
-            <vxe-grid ref="table-m1" v-bind="vxeOption" @resizable-change="$vxeTableUtil.onColumnWitchChange"
-                      @custom="$vxeTableUtil.customHandle">
-              <template #form>
-                <div class="clearfix screen-btns">
-                  <div class="fl">
-                    <base-table-export :option="{ title: $t1('访问统计导出'), targetRef: 'table-m1'}"
-                                       :parent-target="_self"/>
-                  </div>
-                  <div class="fr">
-                    <vxe-button status="warning" icon="iconfont icon-shaixuan" class="button-sty orgn"
-                                @click="showAdvancedSearch = true">{{ $t1('高级筛选') }}
-                    </vxe-button>
-                    <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>
-                  </div>
-                </div>
-                <vxe-form ref="form" class="screen-box" title-width="92px" title-align="right" :data="formData"
-                          @submit="searchEvent" @reset="searchEvent">
-                  <vxe-form-item :title="$t1('操作类型')+':'">
-                    <template v-slot>
-                      <el-input v-model="checkNode.label" :disabled="true"></el-input>
-                    </template>
-                  </vxe-form-item>
-                  <vxe-form-item :title="$t1('访问日期')+':'">
-                    <template v-slot>
-                      <el-date-picker
-                        v-model="formData.startTime"
-                        type="date"
-                        placeholder=""
-                        size="small"
-                        clearable
-                        value-format="yyyy-MM-dd"
-                        :picker-options="$baseStartPickerOptions(formData.endTime)"
-                      ></el-date-picker>
-                      <span>-</span>
-                      <el-date-picker
-                        v-model="formData.endTime"
-                        type="date"
-                        placeholder=""
-                        size="small"
-                        clearable
-                        value-format="yyyy-MM-dd"
-                        :picker-options="$baseEndPickerOptions(formData.startTime)"
-                      ></el-date-picker>
-                    </template>
-                  </vxe-form-item>
-                </vxe-form>
-              </template>
-            </vxe-grid>
-          </div>
-        </div>
-      </el-tab-pane>
-      <el-tab-pane :label="$t1('统计')" name="third">
-        <statistics_list v-if="showStatisticsList"></statistics_list>
-      </el-tab-pane>
-    </el-tabs>
-    <advancedSearchDialog v-if="showAdvancedSearch" :visiable.sync="showAdvancedSearch"
-                          :formData.sync="advancedFormData" @confirm="searchEvent">
-      <template #form>
-        <vxe-form :model="advancedFormData" title-width="102px" :inline="true" class="adSearchForm">
-          <vxe-form-item :title="$t1('操作内容') + ':'" class-name="block">
-            <template v-slot>
-              <el-input v-model="advancedFormData.content" size="small" clearable></el-input>
-            </template>
-          </vxe-form-item>
-          <vxe-form-item :title="$t1('冗余字段1') +':'">
-            <template v-slot>
-              <el-input v-model="advancedFormData.param1" size="small" clearable></el-input>
-            </template>
-          </vxe-form-item>
-          <vxe-form-item :title="$t1('冗余字段2') +':'">
-            <template v-slot>
-              <el-input v-model="advancedFormData.param2" size="small" clearable></el-input>
-            </template>
-          </vxe-form-item>
-        </vxe-form>
-      </template>
-    </advancedSearchDialog>
-
-  </div>
-</template>
-
-<script>
-import {treeScollx} from '@base/utils/global.js';
-import editView from './edit.vue';
-import statistics_list from "./statistics_list.vue";
-
-
-export default {
-  name: 'access_log:list',
-  components: {editView, statistics_list},
-  data() {
-    return {
-      activeName: 'second',
-      dataId: 0,
-      showEdit: false,
-      vxeOption: {},
-      formData: {
-        startTime: null,
-        endTime: null
-      },
-      checkNode: {},
-      defaultProps: {
-        label: 'label', //这里是树结构中需显示的数据（即接口返回的需展示在页面上的参数）
-        children: [],
-        isLeaf: 'leaf'
-      },
-      showWfDialog: false,
-      wfContentOption: {},
-      showAdvancedSearch: false,
-      advancedFormData: {},
-      showStatisticsList: false,
-      logTypeMap: {}
-    };
-  },
-  watch: {
-    activeName(val) {
-      if (this.showStatisticsList === false && val === "third") {
-        this.showStatisticsList = true;
-      }
-    }
-  },
-  computed: {
-    checkNodeData() {
-      return this.checkNode && this.checkNode.data ? this.checkNode.data : {};
-    },
-    logType() {
-      let checkNodeData = this.checkNode && this.checkNode.data ? this.checkNode.data : {};
-      return checkNodeData.value ?? null
-    }
-  },
-  async mounted() {
-    treeScollx({target: this, type: 'default'});
-    this.initTableList();
-  },
-  methods: {
-    searchEvent() {
-      this.$refs['table-m1'].commitProxy('reload');
-    },
-    resetEvent() {
-      this.formData = {};
-      this.advancedFormData = {};
-      this.checkFirstNode();
-      this.$refs['table-m1'].commitProxy('reload');
-    },
-    openEditDialog(id) {
-      this.dataId = !id || typeof id == 'object' ? 0 : id;
-      this.activeName = 'first';
-      this.$openEditView('showEdit');
-    },
-    initTableList() {
-      let that = this;
-      let logTypeMap = this.logTypeMap;
-      let tableOption = {
-        vue: this,
-        tableRef: 'table-m1',
-        tableName: 'user_access_log_list-m1',
-        path: USER_PREFIX + '/access_log/listPage',
-        param: () => {
-          return {
-            ...this.formData,
-            ...this.advancedFormData,
-            logType: this.logType
-            // ...checkParam
-          };
-        },
-        columns: [
-          {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
-          {
-            title: this.$t1('操作类型'),
-            field: 'logTypeName',
-            fixed: 'left',
-            width: 150
-          },
-          {
-            title: this.$t1('操作内容'),
-            field: 'content',
-            width: 200
-          },
-          {
-            title: this.$t1('请求地址'),
-            field: 'path',
-            width: 200
-          },
-          {
-            title: this.$t1('客户端'),
-            field: 'client',
-            width: 150
-          },
-          {
-            title: this.$t1('冗余字段1'),
-            field: 'param1',
-            width: 150
-          },
-          {
-            title: this.$t1('冗余字段2'),
-            field: 'param2',
-            width: 150
-          },
-          {
-            title: this.$t1('操作人'),
-            field: 'nickName',
-            width: 150
-          },
-          {
-            title: this.$t1('服务名'),
-            field: 'serverName',
-            width: 250
-          },
-          {
-            title: this.$t1('请求IP'),
-            field: 'ip',
-            width: 150
-          },
-          {
-            title: this.$t1('创建时间'),
-            field: 'createDate',
-            width: 150
-          },
-          {
-            width: 47,
-            fixed: 'right',
-            title: '',
-            sortable: false,
-            slots: {
-              default: ({row, rowIndex}) => {
-                return [
-                  <div>
-                    <a
-                      href="javascript:void(0);"
-                      class="a-link"
-                      onclick={() => {
-                        this.openEditDialog(row.id);
-                      }}
-                    >
-                      <el-tooltip enterable={false} effect="dark" content={this.$t1('查看')} placement="top"
-                                  popper-class="tooltip-skin">
-                        <i class="el-icon-edit"/>
-                      </el-tooltip>
-                    </a>
-                  </div>
-                ];
-              }
-            }
-          }
-        ]
-      };
-      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
-        this.vxeOption = opts;
-      });
-    },
-    clearNodeClick() {
-      this.checkNode = null;
-      this.formData.startTime = null;
-      this.formData.endTime = null;
-      this.$refs.tree.setCurrentKey();
-      this.searchEvent();
-    },
-    handleNodeClick(data, node, v) {
-      this.checkNode = node;
-      this.formData.startTime = data.all ? null : data.logDate;
-      this.formData.endTime = data.all ? null : data.logDate;
-      this.$forceUpdate();
-      this.searchEvent();
-    },
-    // 异步树叶子节点懒加载逻辑
-    loadNode(node, resolve) {
-      this.$http({
-        url: USER_PREFIX + `/user_log_classify/listPage`,
-        method: `post`,
-        data: {
-          enabled: true
-        },
-        success: res => {
-          let logTypeMap = {};
-          let rows = res.objx?.records || [];
-          let items = rows.map(item => {
-            logTypeMap[item.classifyCode] = item.classifyName;
-            return {
-              label: item.classifyName,
-              value: item.classifyCode,
-              id: item.classifyCode,
-              leaf: true,
-            }
-          })
-          this.logTypeMap = logTypeMap;
-          let data = [
-            {
-              label: this.$t1('全部类型'),
-              all: true,
-              id: -1,
-              leaf: true,
-            },
-            ...items
-          ]
-          resolve(data);
-          this.$nextTick(() => {
-            if (node.childNodes.length) {
-              this.checkFirstNode();
-              this.$forceUpdate();
-            }
-          });
-        }
-      });
-
-    },
-    checkFirstNode() {
-      let node = this.$refs.tree.getNode(-1);
-      this.$refs.tree.setCurrentKey(node);
-      this.checkNode = node;
-    }
-  }
-};
-</script>
+<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="tree-box fl">
+          <div class="tit">
+            <b>{{ $t1("操作类型") }}</b>
+          </div>
+          <el-tree
+            :props="defaultProps"
+            :load="loadNode"
+            node-key="id"
+            ref="tree"
+            highlight-current
+            lazy
+            :expand-on-click-node="false"
+            @node-click="handleNodeClick"
+            class="tree-list"
+            icon-class="el-icon-arrow-down"
+          ></el-tree>
+        </div>
+        <label id="labBtn">
+          <div class="icon">
+            <i class="el-icon-more"></i>
+            <i class="el-icon-more"></i>
+          </div>
+        </label>
+        <div class="main-right fr" style="padding-left: 6px">
+          <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>
+                    <base-table-export
+                      :option="{ title: $t1('访问统计导出'), targetRef: 'table-m1' }"
+                      :parent-target="_self"
+                    />
+                  </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>
+                  <template #operateType>
+                    <vxe-form-item :title="$t1('操作类型') + ':'">
+                      <template v-slot>
+                        <el-input v-model="checkNode.label" :disabled="true"></el-input>
+                      </template>
+                    </vxe-form-item>
+                  </template>
+                </tableForm>
+                <!-- <vxe-form
+                  ref="form"
+                  class="screen-box"
+                  title-width="92px"
+                  title-align="right"
+                  :data="formData"
+                  @submit="searchEvent"
+                  @reset="searchEvent"
+                >
+                  <vxe-form-item :title="$t1('操作类型') + ':'">
+                    <template v-slot>
+                      <el-input v-model="checkNode.label" :disabled="true"></el-input>
+                    </template>
+                  </vxe-form-item>
+                  <vxe-form-item :title="$t1('访问日期') + ':'">
+                    <template v-slot>
+                      <el-date-picker
+                        v-model="formData.startTime"
+                        type="date"
+                        placeholder=""
+                        size="small"
+                        clearable
+                        value-format="yyyy-MM-dd"
+                        :picker-options="$baseStartPickerOptions(formData.endTime)"
+                      ></el-date-picker>
+                      <span>-</span>
+                      <el-date-picker
+                        v-model="formData.endTime"
+                        type="date"
+                        placeholder=""
+                        size="small"
+                        clearable
+                        value-format="yyyy-MM-dd"
+                        :picker-options="$baseEndPickerOptions(formData.startTime)"
+                      ></el-date-picker>
+                    </template>
+                  </vxe-form-item>
+                </vxe-form> -->
+              </template>
+            </vxe-grid>
+          </div>
+        </div>
+      </el-tab-pane>
+      <el-tab-pane :label="$t1('统计')" name="third">
+        <statistics_list v-if="showStatisticsList"></statistics_list>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import { treeScollx } from "@base/utils/global.js";
+import editView from "./edit.vue";
+import statistics_list from "./statistics_list.vue";
+import tableForm from "@base/components/table/tableForm";
+
+export default {
+  name: "access_log:list",
+  components: { tableForm, editView, statistics_list },
+  data() {
+    return {
+      activeName: "second",
+      dataId: 0,
+      showEdit: false,
+      vxeOption: {},
+      formData: {
+        startTime: null,
+        endTime: null,
+      },
+      checkNode: {},
+      defaultProps: {
+        label: "label", //这里是树结构中需显示的数据（即接口返回的需展示在页面上的参数）
+        children: [],
+        isLeaf: "leaf",
+      },
+      showWfDialog: false,
+      wfContentOption: {},
+      showAdvancedSearch: false,
+      advancedFormData: {},
+      showStatisticsList: false,
+      logTypeMap: {},
+    };
+  },
+  watch: {
+    activeName(val) {
+      if (this.showStatisticsList === false && val === "third") {
+        this.showStatisticsList = true;
+      }
+    },
+  },
+  computed: {
+    checkNodeData() {
+      return this.checkNode && this.checkNode.data ? this.checkNode.data : {};
+    },
+    logType() {
+      let checkNodeData =
+        this.checkNode && this.checkNode.data ? this.checkNode.data : {};
+      return checkNodeData.value ?? null;
+    },
+  },
+  async mounted() {
+    treeScollx({ target: this, type: "default" });
+    this.initTableList();
+  },
+  methods: {
+    searchEvent() {
+      this.$refs["table-m1"].commitProxy("reload");
+    },
+    resetEvent() {
+      this.formData = {};
+      this.advancedFormData = {};
+      this.checkFirstNode();
+      this.$refs["table-m1"].commitProxy("reload");
+    },
+    openEditDialog(id) {
+      this.dataId = !id || typeof id == "object" ? 0 : id;
+      this.activeName = "first";
+      this.$openEditView("showEdit");
+    },
+    initTableList() {
+      let that = this;
+      let logTypeMap = this.logTypeMap;
+      let tableOption = {
+        vue: this,
+        tableRef: "table-m1",
+        tableName: "user_access_log_list-m1",
+        path: USER_PREFIX + "/access_log/listPage",
+        param: () => {
+          return {
+            ...this.formData,
+            // ...this.advancedFormData,
+            logType: this.logType,
+            // ...checkParam
+          };
+        },
+        columns: [
+          { type: "checkbox", width: 48, resizable: false, fixed: "left" },
+          {
+            title: this.$t1("操作类型"),
+            field: "logTypeName",
+            fixed: "left",
+            width: 150,
+          },
+          {
+            title: this.$t1("操作内容"),
+            field: "content",
+            width: 200,
+          },
+          {
+            title: this.$t1("请求地址"),
+            field: "path",
+            width: 200,
+          },
+          {
+            title: this.$t1("客户端"),
+            field: "client",
+            width: 150,
+          },
+          {
+            title: this.$t1("冗余字段1"),
+            field: "param1",
+            width: 150,
+          },
+          {
+            title: this.$t1("冗余字段2"),
+            field: "param2",
+            width: 150,
+          },
+          {
+            title: this.$t1("操作人"),
+            field: "nickName",
+            width: 150,
+          },
+          {
+            title: this.$t1("服务名"),
+            field: "serverName",
+            width: 250,
+          },
+          {
+            title: this.$t1("请求IP"),
+            field: "ip",
+            width: 150,
+          },
+          {
+            title: this.$t1("创建时间"),
+            field: "createDate",
+            width: 150,
+          },
+          {
+            width: 47,
+            fixed: "right",
+            title: "",
+            sortable: false,
+            slots: {
+              default: ({ row, rowIndex }) => {
+                return [
+                  <div>
+                    <a
+                      href="javascript:void(0);"
+                      class="a-link"
+                      onclick={() => {
+                        this.openEditDialog(row.id);
+                      }}
+                    >
+                      <el-tooltip
+                        enterable={false}
+                        effect="dark"
+                        content={this.$t1("查看")}
+                        placement="top"
+                        popper-class="tooltip-skin"
+                      >
+                        <i class="el-icon-edit" />
+                      </el-tooltip>
+                    </a>
+                  </div>,
+                ];
+              },
+            },
+          },
+        ],
+        searchColumns: [
+          {
+            title: this.$t1("操作类型"),
+            field: "operateType",
+            type: "input",
+            common: true,
+            slot: "operateType",
+          },
+          {
+            title: this.$t1("访问日期"),
+            field: "startTime",
+            field2: "endTime",
+            type: "dateRange",
+            common: true,
+            widgetType: "date",
+            valueFormat: "yyyy-MM-dd",
+          },
+          {
+            title: this.$t1("操作人"),
+            field: "nickName",
+            type: "input",
+            common: true,
+          },
+          {
+            title: this.$t1("操作内容"),
+            field: "content",
+            type: "input",
+            common: false,
+          },
+          {
+            title: this.$t1("请求IP"),
+            field: "ip",
+            type: "input",
+            common: false,
+          },
+          {
+            title: this.$t1("冗余字段1"),
+            field: "param1",
+            type: "input",
+            common: false,
+          },
+          {
+            title: this.$t1("冗余字段2"),
+            field: "param2",
+            type: "input",
+            common: false,
+          },
+        ],
+      };
+      this.$vxeTableUtil.initVxeTable(tableOption).then((opts) => {
+        this.vxeOption = opts;
+      });
+    },
+    clearNodeClick() {
+      this.checkNode = null;
+      this.formData.startTime = null;
+      this.formData.endTime = null;
+      this.$refs.tree.setCurrentKey();
+      this.searchEvent();
+    },
+    handleNodeClick(data, node, v) {
+      this.checkNode = node;
+      this.formData.startTime = data.all ? null : data.logDate;
+      this.formData.endTime = data.all ? null : data.logDate;
+      this.$forceUpdate();
+      this.searchEvent();
+    },
+    // 异步树叶子节点懒加载逻辑
+    loadNode(node, resolve) {
+      this.$http({
+        url: USER_PREFIX + `/user_log_classify/listPage`,
+        method: `post`,
+        data: {
+          enabled: true,
+        },
+        success: (res) => {
+          let logTypeMap = {};
+          let rows = res.objx?.records || [];
+          let items = rows.map((item) => {
+            logTypeMap[item.classifyCode] = item.classifyName;
+            return {
+              label: item.classifyName,
+              value: item.classifyCode,
+              id: item.classifyCode,
+              leaf: true,
+            };
+          });
+          this.logTypeMap = logTypeMap;
+          let data = [
+            {
+              label: this.$t1("全部类型"),
+              all: true,
+              id: -1,
+              leaf: true,
+            },
+            ...items,
+          ];
+          resolve(data);
+          this.$nextTick(() => {
+            if (node.childNodes.length) {
+              this.checkFirstNode();
+              this.$forceUpdate();
+            }
+          });
+        },
+      });
+    },
+    checkFirstNode() {
+      let node = this.$refs.tree.getNode(-1);
+      this.$refs.tree.setCurrentKey(node);
+      this.checkNode = node;
+    },
+  },
+};
+</script>

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

@@ -32,6 +32,28 @@
             ></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);
+                }
+              "
+            ></vFormRender>
+          </div>
+        </el-tab-pane>
         <template #editTab="{ tab, index, reloadTabContent }">
           <el-tab-pane
             :key="tab.data.id"
@@ -124,8 +146,21 @@ 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();
@@ -168,6 +203,7 @@ export default {
           }
           this.addFormCode = addFormCode;
           this.multiTabLabelField = formJson.formConfig?.multiTabLabelField;
+          this.initOtherTabList();
         },
       });
     },
@@ -231,6 +267,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>