Merge remote-tracking branch 'origin/master'

 Source/plt-web/plt-web-ui/src/components/PLT-basic-component/basicForm.vue

@@ -200,7 +200,6 @@
        value: item.value || item.defaultValue,
        display: item.display || !item.hidden,
        labelSuffix: item.labelSuffix || item.suffix,
        suffixIcon: item.suffixIcon || item.prefix,
        tip: item.tip || item.tooltips,
        dictCode: item.dictCode || item.comboxKey,
        valueFormat: item.valueFormat ||item.dateFormate ,

 Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue

@@ -270,6 +270,7 @@
      const queryFields = !validatenull(this.currentDefineVO.queryColumns) ? this.currentDefineVO.queryColumns.map(item => item.field) : [];
      return this.currentDefineVO.cols[0].map(item => {
        const search = queryFields.includes(item.field); // åˆ¤æ–­ field æ˜¯å¦åœ¨ queryColumns é‡Œ
        item.type = this.columnType[item.fieldType] || item.fieldType;
        if (this.currentDefineVO.btmType == 'fileobject' && item.field == 'name') {
          //是文件
          item.formatter = function (d) {
@@ -280,13 +281,17 @@
        if (typeof formatter == "string" && formatter != '') {
          formatter = eval("(" + formatter + ")");
        }
        item.type = this.columnType[item.fieldType] || item.fieldType;
        if (['date', 'datetime', 'time'].includes(item.type)) {
          item.valueFormat = item.dateFormate;
          item.format = item.dateFormate;
        }
        return {
          ...item,
          prop: item.field,
          label: item.title,
          search: search,
          formatter: formatter
          formatter: formatter,
          overHidden: true
        };
      });
    },

 Source/plt-web/plt-web-ui/src/views/wel/components/UndoTaskPortlet.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,203 @@
<template>
  <!--代办任务-->
  <basic-containers  :key="loadKey">
    <div>
      <avue-crud
        ref="crud"
        :data="data"
        :option="options"
        :page.sync="pages"
        :search.sync="searchParams"
        :table-loading="loading"
        @search-change="handleSearch"
        @search-reset="handleReset"
        @current-change="currentChange"
        @size-change="sizeChange">
        <template slot="title" slot-scope="{row}">
          <el-link type="primary" @click="linkClickHandler(row)">{{ row.title }}</el-link>
        </template>
      </avue-crud>
    </div>
  </basic-containers>
</template>

<script>
export default {
  name: "UndoTaskPortlet",
  data() {
    return {
      loadKey:0,
      data: [],
      options: {
        height: 'auto',
        calcHeight:210,
        addBtn: false,
        editBtn: false,
        delBtn: false,
        index: true,
        border: true,
        menu: false,
        refreshBtn: false,
        searchIcon: true,
        searchShow: true,
        menuWidth: 120,
        menuAlign: "center",
        column: [
          {
            label: "类型",
            prop: "msgClassifyText",
            sortable: true,
            width: 100,
          },
          {
            label: "消息标题",
            prop: "title",
            search:true,
            minWidth: 400,
            sortable: true,
            searchSpan:6,
            overHidden: true,
            slot:true,
          },
          {
            label: "发送时间",
            prop: "sendTime",
            width: 130,
            type:'datetime',
            overHidden: true,
            format:'yyyy-MM-dd HH:mm',
            sortable:true,
            slot: true
          },
          {
            label: '工号',
            prop: "sendUserCode",
            searchLabelWidth: 100,
            search:true,
            sortable: true,
            searchSpan:6,
            width: 130,
          },
          {
            label: "发送人姓名",
            prop: "sendUserName",
            searchLabelWidth: 100,
            search:true,
            searchSpan:6,
            sort: true,
            width: 130,
          },
          {
            label: "内容",
            overHidden:true,
            prop: "msgContent",
            minWidth: 300
          },
        ]
      },
      pages: {
        currentPage: 1,
        pageSize: 15,
        pageSizes: [15, 25, 45, 60, 100],
        total: 0,
        layout: "prev,pager,next,jumper,sizes,total",
      },
      loading: false,
      searchParams: {
        pageNum: 1,
        pageSize: 15,
      },
    };
  },
  created() {
    this.getTableList();
  },
  mounted() {
    window.addEventListener('resize', this.handleResize); // èŽ·å–用户缩放事件
  },
  beforeDestroy() {
    window.removeEventListener('resize', this.handleResize); // é”€æ¯ç»‘定的方法
  },
  methods: {
    // å¼ºåˆ¶ä¿®æ”¹å®¹å™¨key值
    handleResize() {
      this.loadKey += 1;
    },

    // åˆå§‹åŒ–根据分辨率来决定页面初始多少条数据
    createdPageSize(){
      let windowHeight = window.outerHeight;
      if(windowHeight > 1350) this.homeTable.pages.pageSize = 25;
      if(windowHeight > 1350) this.searchParams.pageSize = 25;
    },

    getTableList() {
      this.createdPageSize(); // åˆ¤æ–­é¡µé¢åˆ†è¾¨çŽ‡

      getList(this.searchParams).then(res => {
        if (res && res.success) {
          this.homeTable.data = res.data;
          this.homeTable.pages.total = res.total;
        }
      });
    },

    linkClickHandler(row){
      if(row.msgLink != null && row.msgLink != ''){
        var link = row.msgLink.replace("inner:","").replace("?","").split("&");
        var html = link.find((val=>(val.toLowerCase().startsWith("html=")|| val.toLowerCase().startsWith("html ="))));
        if(html!=null && html!=''){
          var page = html.split("=")[1].replace("-","/");
          var single = {
            fromUndo:true
          };
          link.forEach((val)=>{
            var temp = val.split("=");
            single[temp[0]] = temp[1];
          });
          this.$router.push({
            path:"/" + page,
            query:single
          });
        }
      }
    },

    // åˆ†é¡µé€‰æ‹©æ˜¾ç¤ºå¤šå°‘条
    sizeChange(val) {
      this.searchParams.pageSize = val;
      this.searchParams.pageNum = 1;
      this.getTableList();
    },

    // åˆ†é¡µé¡µç 
    currentChange(val) {
      this.searchParams.pageNum = val;
      this.getTableList();
    },

    // æŸ¥è¯¢
    handleSearch(params, done) {
      setTimeout(() => {
        done();
        this.searchParams = { ...params };
        this.getTableList();
      }, 300);
    },

    // æ¸…空搜索
    handleReset() {
      this.searchParams = this.defaultSearch;
      this.getTableList();
    },
    // åˆ·æ–°æ•°æ®
    handleRefresh() {
      this.getTableList();
    },
  }
}
</script>

<style scoped>

</style>

 Source/plt-web/plt-web-ui/src/views/wel/homeConfig.vue

@@ -1,10 +1,9 @@
<template>
  <basic-container>
    <avue-crud
      ref="useCrud"
      ref="crud"
      :data="data"
      :option="option"
      :page.sync="page"
      :table-loading="loading"
      @selection-change="selectChange"
      @row-click="rowClickHandler"
@@ -37,16 +36,16 @@
      width="500px"
      @close="visibleCloseHandler"
    >
      <el-form ref="form" :model="form" :rules="rules" label-width="80px" size="small">
      <el-form ref="form" :model="form" :rules="rules" label-width="90px" size="small">
        <el-row>
          <el-col :span="24">
            <el-form-item label="名称：" prop="id">
              <el-input v-model="form.id"></el-input>
            <el-form-item label="组件：" prop="id">
              <avue-select v-model="form.id" placeholder="请选择组件" type="tree" :dic="dic"></avue-select>
            </el-form-item>
          </el-col>
          <el-col :span="24">
            <el-form-item label="标签：" prop="name">
              <el-input v-model="form.name"></el-input>
            <el-form-item label="占据列数：" prop="span">
              <avue-input-number v-model="form.span" precision="0" style="width: 100%" :max="24" :min="1" controls-position="" tip="总列数为24，如占满整行请输入24"></avue-input-number>
            </el-form-item>
          </el-col>
          <el-col :span="24">
@@ -91,13 +90,12 @@
        calcHeight: -60,
        column: [
          {
            label: '名称',
            label: '组件',
            prop: 'id',
            sortable: true,
          },
          {
            label: '图标',
            prop: 'icon'
            label: '占据列数',
            prop: 'span'
          },
          {
            label: '标签',
@@ -118,18 +116,19 @@
      },
      rules: {
        id: [
          {required: true, message: '请输入名称', trigger: 'blur'},
          {required: true, message: '请选择组件', trigger: 'blur'},
        ]
      },
      dic:[{
        label:'待办任务',
        value:'UndoTaskPortlet'
      },{
        label:'选项2',
        value:1
      }],
      visible: false,
      selectList: [],
      lastIndex: null,
      page: {
        currentPage: 1,
        pageSize: 15,
        total: 0,
        pageSizes: [15, 30, 50, 100],
      },
      lastIndex: null
    }
  },
  created() {