wangting
2024-05-08 923004d8ca3cb956d33f1990b34a5f221da30669
列表右侧设置默认按钮
已修改7个文件
85 ■■■■■ 文件已修改
Source/ProjectWeb/src/components/actions/AddEditDialog.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/ProjectWeb/src/components/dynamic-components/dynamic-form.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/ProjectWeb/src/components/dynamic-components/dynamic-tree.vue 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/ProjectWeb/src/components/dynamic-components/index.vue 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/ProjectWeb/src/views/base/UIContentArea.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/ProjectWeb/src/components/actions/AddEditDialog.vue
@@ -26,6 +26,7 @@
             :context="paramVOS.context"
             :inDialog="true"
             :canEdit="true"
             :actionType="type"
             :sourceData="sourceData"
             :dataStore="dataStore"
             :paramVOS="paramVOS"
Source/ProjectWeb/src/components/dynamic-components/dynamic-form.vue
@@ -42,6 +42,10 @@
      type:Boolean,
      default:false
    },
    actionType:{
      //按钮操作类型
      default:""
    },
    areasName: {
      type: String,
      default: ''
@@ -137,7 +141,7 @@
      if (Object.keys(this.paramVOS).length>0) {
        for (let j in this.paramVOS) {
          if (this.paramVOS[j] && this.paramVOS[j].constructor === Object) continue;
          if (j == 'type' || j == 'context' || j == 'content') continue;
          if (j == 'type' || j == 'context' || j == 'content' || j == "getdataurl" || j == "getdatamethod" || j == "url" || j == "method" || j == "uploadfileurl" || j == "title") continue;
          sourceDataMap['sourceData["' + j + '"]'] = this.paramVOS[j]
        }
      }
@@ -161,7 +165,7 @@
      if (this.paramVOS.initvalue) {
        this.form=this.paramVOS.initvalue;
      }
      if (Object.keys(this.sourceData).length>0 && this.isShow) {
      if (Object.keys(this.sourceData).length>0 && this.isShow && this.actionType!="add") {
        this.loading = true;
        dataForm(this.params).then(res => {
          this.form = res.data.obj;
Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue
@@ -13,6 +13,7 @@
               @size-change="sizeChange"
               @row-click="rowClickChange"
               @search-change='searchChange'
               @filter-change="filterChange"
               @selection-change="selectChange">
      <!--top区域按钮-->
      <template slot="menuLeft" slot-scope="scope">
@@ -29,6 +30,22 @@
                        LocationType="menu"
                        @afterMethod="handleRefresh"
                        type="table"></dynamic-button>
      </template>
      <template  slot="menuRight" slot-scope="scope">
        <el-button icon="el-icon-printer" title="打印"
                   circle @click="$refs.dataTable.rowPrint()"
                   :size="scope.size"></el-button>
        <el-button icon="el-icon-download" title="导出"
                   circle @click="rowExcel"
                   :size="scope.size"></el-button>
        <el-button icon="el-icon-tickets" circle title="筛选"  @click="$refs.dataTable.$refs.dialogFilter.box=!0"
                  :size="scope.size"></el-button>
        <el-button icon="el-icon-s-operation" circle title="列显隐"  @click="$refs.dataTable.$refs.dialogColumn.columnBox=!0"
                   :size="scope.size"></el-button>
        <el-button icon="el-icon-search" circle title="查询" @click="$refs.dataTable.$refs.headerSearch.handleSearchShow()"
                   :size="scope.size"></el-button>
        <el-button icon="el-icon-refresh" circle title="刷新" @click="$refs.dataTable.refreshChange()"
                   :size="scope.size"></el-button>
      </template>
    </avue-crud>
  </div>
@@ -119,6 +136,12 @@
        addBtn: false,
        editBtn: false,
        delBtn: false,
        refreshBtn:false,
        columnBtn:false,
        searchShowBtn:false,
        printBtn:false,
        excelBtn:false,
        filterBtn:false,
        selection: true,
        tip: false,
        height: '100%',
@@ -266,7 +289,7 @@
      if (Object.keys(this.paramVOS).length>0) {
        for (let j in this.paramVOS) {
          if (this.paramVOS[j] && this.paramVOS[j].constructor === Object) continue;
          if (j == 'type' || j == 'context' || j == 'content') continue;
          if (j == 'type' || j == 'context' || j == 'content' || j == "getdataurl" || j == "getdatamethod" || j == "url" || j == "method" || j == "uploadfileurl" || j == "title") continue;
          sourceDataMap['sourceData["' + j + '"]'] = this.paramVOS[j]
        }
      }
@@ -335,6 +358,10 @@
      this.onLoad(this.page);
      done();
    },
    filterChange(result){
      debugger;
    },
    searchReset() {
      this.query = {};
      this.onLoad(this.page);
@@ -349,6 +376,16 @@
    },
    handleRefresh(type) {
      this.onLoad(this.page, this.query);
    },
    rowExcel() {
      //导出
      this.$refs.dataTable.$refs.dialogExcel.handleShow();
      //导出弹窗中的确定按钮
      this.$refs.dataTable.$refs.dialogExcel.handleSubmit = function () {
        this.$Export.excel({title: this.$refs.dataTable.$refs.dialogExcel.form.name, columns: this.$refs.dataTable.$refs.dialogExcel.columns, data: this.$refs.dataTable.$refs.dialogExcel.handleSum()});
        this.$refs.dataTable.$refs.dialogExcel.box = !1
      }
      //this.$refs.dataTable.rowExcel()
    }
  }
}
Source/ProjectWeb/src/components/dynamic-components/dynamic-tree.vue
@@ -56,6 +56,10 @@
      type:Boolean,
      default:false
    },
    actionType:{
      //按钮操作类型
      default:""
    },
    areasName:{
      type:String,
      default:''
@@ -174,7 +178,6 @@
            this.sourceData.oid = this.sourceData.oid.split('@vcitreesep@')[1];
          }
          sourceDataMap.sourceBtmName = this.sourceBtmType;
          ;
          sourceDataMap.sourceOid = this.sourceData.oid;
        }
        for (let i in this.sourceData) {
@@ -188,7 +191,7 @@
      if (Object.keys(this.paramVOS).length > 0) {
        for (let j in this.paramVOS) {
          if (this.paramVOS[j] && this.paramVOS[j].constructor === Object) continue;
          if (j == 'type' || j == 'context' || j == 'content') continue;
          if (j == 'type' || j == 'context' || j == 'content' || j == "getdataurl" || j == "getdatamethod" || j == "url" || j == "method" || j == "uploadfileurl" || j == "title") continue;
          sourceDataMap['sourceData["' + j + '"]'] = this.paramVOS[j]
        }
      }
Source/ProjectWeb/src/components/dynamic-components/index.vue
@@ -5,6 +5,7 @@
                 :key="areasName+'table-'+componentVO.oid"
                 :inDialog="inDialog"
                 :canEdit="canEdit"
                 :actionType="actionType"
                 :componentVO="componentVO"
                 :sourceData="sourceData"
                 :sourceBtmType="sourceBtmType"
@@ -22,6 +23,7 @@
                :key="areasName+'form-'+componentVO.oid"
                :inDialog="inDialog"
                :canEdit="canEdit"
                :actionType="actionType"
                :componentVO="componentVO"
                :sourceData="sourceData"
                :sourceBtmType="sourceBtmType"
@@ -39,6 +41,7 @@
                :key="areasName+'tree-'+componentVO.oid"
                :inDialog="inDialog"
                :canEdit="canEdit"
                :actionType="actionType"
                :componentVO="componentVO"
                :sourceData="sourceData"
                :sourceBtmType="sourceBtmType"
@@ -54,6 +57,7 @@
                  :uiContext="uiContext"
                  :inDialog="inDialog"
                  :canEdit="canEdit"
                  :actionType="actionType"
                  :key="areasName+'custom-'+componentVO.oid"
                  :componentVO="componentVO"
                  :sourceData="sourceData"
@@ -99,6 +103,10 @@
      type:Boolean,
      default:false
    },
    actionType:{
      //按钮操作类型
      default:""
    },
    areasName:{
      type:String,
      default:''
Source/ProjectWeb/src/views/base/UIContentArea.vue
@@ -26,6 +26,7 @@
                          :uiContext="uiContext"
                          :inDialog="inDialog"
                          :canEdit="canEdit"
                          :actionType="actionType"
                          :componentVO="areaItem.componentVOs[0]"
                          :sourceData="newSourceData"
                          :sourceBtmType="sourceBtmType"
@@ -50,6 +51,7 @@
                            :uiContext="uiContext"
                            :inDialog="inDialog"
                            :canEdit="canEdit"
                            :actionType="actionType"
                            :componentVO="componentVO"
                            :sourceData="newSourceData"
                            :sourceBtmType="sourceBtmType"
@@ -68,6 +70,7 @@
                        :uiContext="uiContext"
                        :inDialog="inDialog"
                        :canEdit="canEdit"
                        :actionType="actionType"
                        :componentVO="newAreasData[0].componentVOs[0]"
                        :sourceData="newSourceData"
                        :sourceBtmType="sourceBtmType"
@@ -133,6 +136,10 @@
      type:Boolean,
      default:false
    },
    actionType:{
      //按钮操作类型
      default:""
    },
    areasName:{
      type:String,
      default:''
Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue
@@ -10,6 +10,7 @@
                     :paramVOS="paramVOS"
                     :inDialog="inDialog"
                     :canEdit="canEdit"
                     :actionType="actionType"
                     :sourceData="sourceData"
                     :sourceBtmType="btmType"
                     areas-name="northAreaInDialog"
@@ -30,6 +31,7 @@
                       :paramVOS="paramVOS"
                       :inDialog="inDialog"
                       :canEdit="canEdit"
                       :actionType="actionType"
                       :sourceData="sourceData"
                       :sourceBtmType="btmType"
                       areas-name="westAreaInDialog"
@@ -48,6 +50,7 @@
                         :paramVOS="paramVOS"
                         :inDialog="inDialog"
                         :canEdit="canEdit"
                         :actionType="actionType"
                         :sourceData="(uiDefineVO.westAreas && uiDefineVO.westAreas.length>0)?checkedData.westAreaInDialog.data[checkedData.westAreaInDialog.data.length-1]:sourceData"
                         :sourceBtmType="(uiDefineVO.westAreas && uiDefineVO.westAreas.length>0)?checkedData.westAreaInDialog.DefineVOBtmType:btmType"
                         areas-name="centerAreaInDialog"
@@ -66,6 +69,7 @@
                         :paramVOS="paramVOS"
                         :inDialog="inDialog"
                         :canEdit="canEdit"
                         :actionType="actionType"
                         :sourceData="checkedData.centerAreaInDialog.data[checkedData.centerAreaInDialog.data.length-1]"
                         :sourceBtmType="checkedData.centerAreaInDialog.DefineVOBtmType"
                         areas-name="southAreaInDialog"
@@ -102,6 +106,10 @@
      //内容是否可编辑
      type:Boolean,
      default:false
    },
    actionType:{
      //按钮操作类型
      default:"add"
    },
    sourceData:{
      //所属区域的上一区域选中数据
@@ -200,6 +208,13 @@
      } else {
        this.centerHeight = '100%';
      }
      if(this.uiDefineVO.westAreas && this.uiDefineVO.westAreas.length>0){
        this.checkedData.westAreaInDialog.data=this.dataStore;
      }else if(this.uiDefineVO.centerAreas && this.uiDefineVO.centerAreas.length>0){
        this.checkedData.centerAreaInDialog.data=this.dataStore;
      }else {
        this.checkedData.southAreaInDialog.data=this.dataStore;
      }
    },
    setData(value) {
      this.data[value.area].DefineVO = value.currentDefineVO;