cloud-web-corejs-haier 1.0.22 → 1.0.24

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

@@ -1,198 +1,198 @@
-<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" :reportCode.sync="reportCode"
-                  :parent-target="_self" @reload="$reloadHandle"></editView>
-      </el-tab-pane>
-      <el-tab-pane :label="$t1('列表')" name="second">
-        <div class="grid-height" style="height: calc(100vh - 122px);">
-          <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">
-                  <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog">{{ $t1('新增') }}
-                  </vxe-button>
-                  <base-table-export :option="{ title: '报表请求访问导出', targetRef: 'table-m1'}"
-                                     :parent-target="_self"/>
-                  <!-- <vxe-button status="primary" class="button-sty" icon="el-icon-download" @click="importExcel">导入</vxe-button> -->
-                </div>
-                <div class="fr">
-                  <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="请求访问名称:" field="accessName">
-                  <template v-slot>
-                    <el-input v-model="formData.accessName" size="small" clearable/>
-                  </template>
-                </vxe-form-item>
-                <vxe-form-item title="请求访问编码:" field="accessCode">
-                  <template v-slot>
-                    <el-input v-model="formData.accessCode" size="small" clearable/>
-                  </template>
-                </vxe-form-item>
-                <vxe-form-item title="是否启用:" field="enable">
-                  <template v-slot>
-                    <el-select v-model="formData.enable" clearable>
-                      <el-option :value="true" label="启用"></el-option>
-                      <el-option :value="false" label="禁用"></el-option>
-                    </el-select>
-                  </template>
-                </vxe-form-item>
-              </vxe-form>
-            </template>
-          </vxe-grid>
-        </div>
-      </el-tab-pane>
-    </el-tabs>
-  </div>
-</template>
-
-<script>
-import editView from './edit.vue';
-
-export default {
-  name: 'report_requestaccess:list',
-  props: ['reportCode'],
-  components: {editView},
-  data() {
-    return {
-      activeName: 'second',
-      dataId: 0,
-      showEdit: false,
-      vxeOption: {},
-      formData: {}
-    };
-  },
-  mounted() {
-    this.initTableList();
-  },
-  methods: {
-    searchEvent() {
-      this.$refs['table-m1'].commitProxy('reload');
-    },
-    resetEvent() {
-      this.formData = {};
-      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 returnTypeMap = {
-        0: '集合List',
-        1: '分页集合数据',
-        2: '单条数据'
-      };
-      let tableOption = {
-        vue: this,
-        tableRef: 'table-m1',
-        tableName: 'user_report_requestaccess_list-m1',
-        path: SUPPORT_PREFIX + '/report_requestaccess/listPage',
-        param: () => {
-          return {
-            reportCode: this.reportCode,
-            ...this.formData
-          };
-        },
-        columns: [
-          {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
-          {
-            title: '请求访问名称',
-            field: 'accessName',
-            width: 150,
-            fixed: 'left'
-          },
-          {
-            title: '请求访问编码',
-            field: 'accessCode',
-            width: 150
-          },
-          {
-            title: '模板编码',
-            field: 'reportCode',
-            width: 150
-          },
-          {
-            title: '返回类型',
-            field: 'returnType',
-            width: 150,
-            slots: {
-              default: ({row}) => {
-                return returnTypeMap[row.returnType] || '';
-              }
-            }
-          },
-          {
-            field: 'enabled',
-            title: this.$t1('是否启用'),
-            width: 150,
-            slots: {
-              default: ({row}) => {
-                if (row.enabled) {
-                  return [
-                    <div class="txt-status">
-                      <span>启用</span>
-                    </div>
-                  ];
-                } else {
-                  return [
-                    <div class="txt-status disable">
-                      <span>禁用</span>
-                    </div>
-                  ];
-                }
-              }
-            }
-          },
-          {
-            field: 'createDate',
-            title: this.$t1('创建时间'),
-            width: 150
-          },
-          {
-            width: 47,
-            fixed: 'right',
-            title: '',
-            sortable: false,
-            slots: {
-              default: ({row}) => {
-                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;
-      });
-    }
-  }
-};
-</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" :reportCode.sync="reportCode"
+                  :parent-target="_self" @reload="$reloadHandle"></editView>
+      </el-tab-pane>
+      <el-tab-pane :label="$t1('列表')" name="second">
+        <div class="grid-height" style="height: calc(100vh - 122px);">
+          <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">
+                  <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog">{{ $t1('新增') }}
+                  </vxe-button>
+                  <base-table-export :option="{ title: '报表请求访问导出', targetRef: 'table-m1'}"
+                                     :parent-target="_self"/>
+                  <!-- <vxe-button status="primary" class="button-sty" icon="el-icon-download" @click="importExcel">导入</vxe-button> -->
+                </div>
+                <div class="fr">
+                  <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="请求访问名称:" field="accessName">
+                  <template v-slot>
+                    <el-input v-model="formData.accessName" size="small" clearable/>
+                  </template>
+                </vxe-form-item>
+                <vxe-form-item title="请求访问编码:" field="accessCode">
+                  <template v-slot>
+                    <el-input v-model="formData.accessCode" size="small" clearable/>
+                  </template>
+                </vxe-form-item>
+                <vxe-form-item title="是否启用:" field="enable">
+                  <template v-slot>
+                    <el-select v-model="formData.enable" clearable>
+                      <el-option :value="true" label="启用"></el-option>
+                      <el-option :value="false" label="禁用"></el-option>
+                    </el-select>
+                  </template>
+                </vxe-form-item>
+              </vxe-form>
+            </template>
+          </vxe-grid>
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import editView from './edit.vue';
+
+export default {
+  name: 'report_requestaccess:list',
+  props: ['reportCode'],
+  components: {editView},
+  data() {
+    return {
+      activeName: 'second',
+      dataId: 0,
+      showEdit: false,
+      vxeOption: {},
+      formData: {}
+    };
+  },
+  mounted() {
+    this.initTableList();
+  },
+  methods: {
+    searchEvent() {
+      this.$refs['table-m1'].commitProxy('reload');
+    },
+    resetEvent() {
+      this.formData = {};
+      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 returnTypeMap = {
+        0: '集合List',
+        1: '分页集合数据',
+        2: '单条数据'
+      };
+      let tableOption = {
+        vue: this,
+        tableRef: 'table-m1',
+        tableName: 'user_report_requestaccess_list-m1',
+        path: SUPPORT_PREFIX + '/report_requestaccess/listPage',
+        param: () => {
+          return {
+            reportCode: this.reportCode,
+            ...this.formData
+          };
+        },
+        columns: [
+          {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
+          {
+            title: '请求访问名称',
+            field: 'accessName',
+            width: 150,
+            fixed: 'left'
+          },
+          {
+            title: '请求访问编码',
+            field: 'accessCode',
+            width: 150
+          },
+          {
+            title: '模板编码',
+            field: 'reportCode',
+            width: 150
+          },
+          {
+            title: '返回类型',
+            field: 'returnType',
+            width: 150,
+            slots: {
+              default: ({row}) => {
+                return returnTypeMap[row.returnType] || '';
+              }
+            }
+          },
+          {
+            field: 'enabled',
+            title: this.$t1('是否启用'),
+            width: 150,
+            slots: {
+              default: ({row}) => {
+                if (row.enabled) {
+                  return [
+                    <div class="txt-status">
+                      <span>启用</span>
+                    </div>
+                  ];
+                } else {
+                  return [
+                    <div class="txt-status disable">
+                      <span>禁用</span>
+                    </div>
+                  ];
+                }
+              }
+            }
+          },
+          {
+            field: 'createDate',
+            title: this.$t1('创建时间'),
+            width: 150
+          },
+          {
+            width: 47,
+            fixed: 'right',
+            title: '',
+            sortable: false,
+            slots: {
+              default: ({row}) => {
+                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;
+      });
+    }
+  }
+};
+</script>

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

@@ -59,6 +59,14 @@ export default {
     this.getReportTemplate();
   },
   methods: {
+    dataTableSearch() {
+      let gridRef = this.$refs.vFormRef.getGridWidgetRef()
+      if(!gridRef)return
+      let options = gridRef.widget.options;
+      if(options.searchOnSwitchTab && options.isQueryTable){
+        gridRef.searchEvent();
+      }
+    },
     initReportCode() {
       let code = this.$attrs.formCode;
       if (!code) {

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

@@ -159,6 +159,7 @@ export default {
         let num = Number(val.substring("otherTab".length));
         this.otherTabList[num].showContent = true;
       }
+      this.handleTabChange(val)
     },
   },
   created() {
@@ -171,6 +172,14 @@ export default {
     };
   },
   methods: {
+    handleTabChange(tabName){
+      if(tabName == "second"){
+        this.$refs.list.dataTableSearch();
+      }else if(tabName.startsWith("otherTab")){
+        let refName = tabName.replace("otherTab","list")
+        if(this.$refs[refName]?.length)this.$refs[refName][0].dataTableSearch();
+      }
+    },
     initParam() {
       let path = this.$route.path;
       let param = path.split("/").reverse();

package/src/mixins/table/index.js

@@ -1,151 +0,0 @@
-
-let module = {
-  install (vxetable, options) {
-    let Table = vxetable.Table;
-    // return
-
-
-
-    Table.mixins.push({
-      methods: {
-        /**
-     * 全局按下事件处理
-     */
-     handleGlobalMousedownEvent : (evnt) => {
-      let $xeTable = this
-      const { editStore, ctxMenuStore, filterStore, customStore } = reactData
-      const { mouseConfig, editRules } = props
-      const el = refElem.value
-      const editOpts = computeEditOpts.value
-      const validOpts = computeValidOpts.value
-      const areaOpts = computeAreaOpts.value
-      const { actived } = editStore
-      const $validTooltip = refValidTooltip.value
-      const tableFilter = refTableFilter.value
-      const tableCustom = refTableCustom.value
-      const tableMenu = refTableMenu.value
-      // 筛选
-      if (tableFilter) {
-        if (getEventTargetNode(evnt, el, 'vxe-cell--filter').flag) {
-          // 如果点击了筛选按钮
-        } else if (getEventTargetNode(evnt, tableFilter.getRefMaps().refElem.value).flag) {
-          // 如果点击筛选容器
-        } else {
-          if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-clear').flag) {
-            tablePrivateMethods.preventEvent(evnt, 'event.clearFilter', filterStore.args, tableMethods.closeFilter)
-          }
-        }
-      }
-      // 自定义列
-      if (tableCustom) {
-        if (customStore.btnEl === evnt.target || getEventTargetNode(evnt, document.body, 'vxe-toolbar-custom-target').flag) {
-          // 如果点击了自定义列按钮
-        } else if (getEventTargetNode(evnt, tableCustom.getRefMaps().refElem.value).flag) {
-          // 如果点击自定义列容器
-        } else {
-          if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-clear').flag) {
-            tablePrivateMethods.preventEvent(evnt, 'event.clearCustom', {}, () => {
-              if ($xeTable.closeCustom) {
-                $xeTable.closeCustom()
-              }
-            })
-          }
-        }
-      }
-
-      // 如果已激活了编辑状态
-      if (actived.row) {
-        if (!(editOpts.autoClear === false)) {
-          // 如果是激活状态，点击了单元格之外
-          const cell = actived.args.cell
-          if ((!cell || !getEventTargetNode(evnt, cell).flag)) {
-            if ($validTooltip && getEventTargetNode(evnt, $validTooltip.$el as HTMLDivElement).flag) {
-              // 如果是激活状态，且点击了校验提示框
-            } else if (!internalData._lastCallTime || internalData._lastCallTime + 50 < Date.now()) {
-              // 如果是激活状态，点击了单元格之外
-              if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-clear').flag) {
-                // 如果手动调用了激活单元格，避免触发源被移除后导致重复关闭
-                tablePrivateMethods.preventEvent(evnt, 'event.clearEdit', actived.args, () => {
-                  let isClear
-                  if (editOpts.mode === 'row') {
-                    const rowTargetNode = getEventTargetNode(evnt, el, 'vxe-body--row')
-                    const rowNodeRest = rowTargetNode.flag ? tableMethods.getRowNode(rowTargetNode.targetElem) : null
-                    // row 方式，如果点击了不同行
-                    isClear = rowNodeRest ? !$xeTable.eqRow(rowNodeRest.item, actived.args.row) : false
-                  } else {
-                    // cell 方式，如果是非编辑列
-                    isClear = !getEventTargetNode(evnt, el, 'col--edit').flag
-                  }
-                  // 如果点击表头行，则清除激活状态
-                  if (!isClear) {
-                    isClear = getEventTargetNode(evnt, el, 'vxe-header--row').flag
-                  }
-                  // 如果点击表尾行，则清除激活状态
-                  if (!isClear) {
-                    isClear = getEventTargetNode(evnt, el, 'vxe-footer--row').flag
-                  }
-                  // 如果固定了高度且点击了行之外的空白处，则清除激活状态
-                  if (!isClear && props.height && !reactData.overflowY) {
-                    const bodyWrapperElem = evnt.target as HTMLDivElement
-                    if (hasClass(bodyWrapperElem, 'vxe-table--body-wrapper')) {
-                      isClear = evnt.offsetY < bodyWrapperElem.clientHeight
-                    }
-                  }
-                  if (
-                    isClear ||
-                      // 如果点击了当前表格之外
-                      !getEventTargetNode(evnt, el).flag
-                  ) {
-                    setTimeout(() => {
-                      $xeTable.handleClearEdit(evnt).then(() => {
-                        // 如果存在校验，点击了表格之外则清除
-                        if (!internalData.isActivated && editRules && validOpts.autoClear) {
-                          reactData.validErrorMaps = {}
-                        }
-                      })
-                    })
-                  }
-                })
-              }
-            }
-          }
-        }
-      } else if (mouseConfig) {
-        if (!getEventTargetNode(evnt, el).flag && !($xeGGWrapper && getEventTargetNode(evnt, $xeGGWrapper.getRefMaps().refElem.value).flag) && !(tableMenu && getEventTargetNode(evnt, tableMenu.getRefMaps().refElem.value).flag) && !($xeToolbar && getEventTargetNode(evnt, $xeToolbar.getRefMaps().refElem.value).flag)) {
-          if ($xeTable.clearSelected) {
-            $xeTable.clearSelected()
-          }
-          if (areaOpts.autoClear) {
-            if ($xeTable.getCellAreas) {
-              const cellAreas = $xeTable.getCellAreas()
-              if (cellAreas && cellAreas.length && !getEventTargetNode(evnt, document.body, 'vxe-table--ignore-areas-clear').flag) {
-                tablePrivateMethods.preventEvent(evnt, 'event.clearAreas', {}, () => {
-                  $xeTable.clearCellAreas()
-                  $xeTable.clearCopyCellArea()
-                  dispatchEvent('clear-cell-area-selection', { cellAreas }, evnt)
-                })
-              }
-            }
-          }
-        }
-      }
-      // 如果配置了快捷菜单且，点击了其他地方则关闭
-      if ($xeTable.closeMenu) {
-        if (ctxMenuStore.visible && tableMenu && !getEventTargetNode(evnt, tableMenu.getRefMaps().refElem.value).flag) {
-          $xeTable.closeMenu()
-        }
-      }
-      const isActivated = getEventTargetNode(evnt, $xeGGWrapper ? $xeGGWrapper.getRefMaps().refElem.value : el).flag
-      // 如果存在校验，点击了表格之外则清除
-      if (!isActivated && editRules && validOpts.autoClear) {
-        reactData.validErrorMaps = {}
-      }
-      // 最后激活的表格
-      internalData.isActivated = isActivated
-    }
-      }
-    })
-  }
-}
-
-export default module