Merge remote-tracking branch 'origin/master'

 Source/plt-web/plt-web-ui/src/api/system/fileCab/api.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,41 @@
import request from '@/router/axios';

// åˆ—表查询
export function getPvolumesPage(params) {
  return request({
    url: "/api/pvolumesController/getPvolumesPage",
    method: "get",
    params
  });
}
export function savePvolume(params) {
  return request({
    url: "/api/pvolumesController/savePvolume",
    method: "post",
    data: params
  });
}
export function updatePvolume(params) {
  return request({
    url: "/api/pvolumesController/updatePvolume",
    method: "post",
    data: params
  });
}
export function deletePvolume(params) {
  return request({
    url: "/api/pvolumesController/deletePvolume",
    method: "delete",
    params
  })
}
// å¯¼å‡º
export const exportPvolumes = (params) => {
  return request({
    url: '/api/pvolumesController/exportPvolumes',
    method: 'POST',
    headers: {'Content-Type': 'application/json;charset=UTF-8'},
    responseType: 'blob',
    data: params
  })
}

 Source/plt-web/plt-web-ui/src/api/system/fileManager/index.vue

ÎļþÒÑɾ³ý

 Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/tableDialog.vue

@@ -9,10 +9,10 @@
    width="60%"
    @close="closeDialog"
  >
    <el-form v-loading="formLoading" :model="form" :rules="rules" label-position="right" label-width="100px">
    <el-form ref="form" v-loading="formLoading" :model="form" :rules="rules" label-position="right" label-width="100px">
      <el-row>
        <el-col :span="12">
          <el-form-item label="名称">
          <el-form-item label="名称" prop="viName">
            <el-input v-model="form.viName" placeholder="请输入名称" size="mini"></el-input>
          </el-form-item>
        </el-col>
@@ -30,14 +30,14 @@
        </el-col>

        <el-col :span="12">
          <el-form-item label="绑定表单">
          <el-form-item label="绑定表单" prop="itemInObj">
            <div style="display: flex;align-items: center;">
              <el-select v-model="form.itemInObj" clearable placeholder="请选择绑定表单" size="mini">
              <el-select v-model="form.itemInObj" clearable placeholder="请选择绑定表单" size="mini"
                         @change="formSelectChange">
                <el-option v-for="(item,index) in selectList" :key="index" :label="item.viName"
                           :value="item.id"></el-option>
              </el-select>
              <el-button plain size="mini" style="margin-left: 3px" type="success" @click="formSelectClickHandler">选择
              </el-button>

            </div>
          </el-form-item>
        </el-col>
@@ -54,131 +54,42 @@
          </el-form-item>
        </el-col>

        <el-col :span="12">
          <el-form-item label="显示字段">
            <div style="display: flex; align-items: center">
              <div style="height: 260px; width: 160px; border: 1px solid #bdbbbb;overflow-y: auto">
                <el-table
                  :data="form.itemSelectOutFieldList"
                  :highlight-current-row="true"
                  style="width: 100%"
                  @row-click="showLabelLeftRowClick">
                  <el-table-column
                    align="center"
                    label="可使用字段"
                    prop="id">
                  </el-table-column>
                </el-table>
              </div>
              <div style="margin-left: 10px; margin-right: 10px">
                <el-button circle icon="el-icon-back" style="margin-right: 10px"
                           @click="showLeftTransferClick"></el-button>
                <el-button circle icon="el-icon-right" @click="showRightTransferClick"></el-button>
              </div>
              <div style="height: 260px; width: 160px; border: 1px solid #bdbbbb;overflow-y: auto">
                <el-table
                  :data="form.itemOutFieldList"
                  :highlight-current-row="true"
                  style="width: 100%"
                  @row-click="showLabelRightRowClick">
                  <el-table-column
                    align="center"
                    label="需要使用字段"
                    prop="id">
                  </el-table-column>
                </el-table>
              </div>
            </div>
          </el-form-item>
        </el-col>

        <el-col :span="12">
          <el-form-item label="搜索字段">
            <div style="display: flex; align-items: center">
              <div style="height: 260px; width: 160px; border: 1px solid #bdbbbb;overflow-y: auto">
                <el-table
                  :data="form.itemSearchFieldList"
                  :highlight-current-row="true"
                  style="width: 100%"
                  @row-click="searchLeftRowClick">
                  <el-table-column
                    align="center"
                    label="可供搜索字段"
                    prop="id">
                  </el-table-column>
                </el-table>
              </div>
              <div style="margin-left: 10px; margin-right: 10px">
                <el-button circle icon="el-icon-back" style="margin-right: 10px"
                           @click="searchLeftTransferClick"></el-button>
                <el-button circle icon="el-icon-right" @click="searchRightTransferClick"></el-button>
              </div>
              <div style="height: 260px; width: 160px; border: 1px solid #bdbbbb;overflow-y: auto">
                <el-table
                  :data="form.itemKeyFieldList"
                  :highlight-current-row="true"
                  style="width: 100%"
                  @row-click="searchRightRowClick">
                  <el-table-column
                    align="center"
                    label="需搜索字段"
                    prop="id">
                  </el-table-column>
                </el-table>
              </div>
            </div>
          </el-form-item>
        </el-col>

        <el-col :span="12">
          <el-form-item label="列">
            <el-select v-model="form.itemFileWidthSelect" placeholder="请选择列" size="mini" @change="itemFileWidthChange">
              <el-option v-for="(item,index) in form.itemFieldWidthList" :key="index" :label="item.key"
                         :value="item.key"></el-option>
        <el-col :span="24">
          <el-form-item label="显示字段" prop="showLabel">
            <el-select v-model="form.itemOutFieldList" multiple placeholder="请选择" style="width: 100%"
                       @change="outFileChange">
              <el-option
                v-for="(item,index) in form.itemSelectOutFieldList"
                :key="index"
                :label="item.id"
                :value="item.id">
              </el-option>
            </el-select>
          </el-form-item>
        </el-col>

        <el-col :span="12">
          <el-form-item label="宽度">
            <div style="display: flex;align-items: center;">
              <el-input v-model="form.itemWidth" placeholder="请输入宽度" size="mini" style="width: 193px"
                        type="number"></el-input>
              <el-button plain size="mini" style="margin-left: 3px" type="success" @click="widthSetUpClickHandler">设置
              </el-button>
            </div>
        <el-col :span="24">
          <el-form-item label="搜索字段">
            <el-select v-model="form.itemKeyFieldList" multiple placeholder="请选择" style="width: 100%">
              <el-option
                v-for="(item,index) in form.itemSearchFieldList"
                :key="index"
                :label="item.id"
                :value="item.id">
              </el-option>
            </el-select>
          </el-form-item>
        </el-col>

      </el-row>

      <el-col :span="24">
        <el-form-item label="设置列宽">
          <div style="height: 150px; width: 100%; border: 1px solid #bdbbbb;overflow-y: auto">
            <el-table
              :data="form.itemFieldWidthList"
              :highlight-current-row="true"
              border
              stripe
              style="width: 100%"
              @row-click="itemFileWidthRowClick">
              <el-table-column
                align="center"
                label="列名"
                prop="key">
                <template slot-scope="scope">
                  <el-tag size="medium">{{ scope.row.key }}</el-tag>
                </template>
              </el-table-column>
              <el-table-column
                align="center"
                label="列宽"
                prop="value">
                <template slot-scope="scope">
                  <el-tag size="medium">{{ scope.row.value }}</el-tag>
                </template>
              </el-table-column>
            </el-table>
          </div>
          <avue-crud
            :data="form.itemFieldWidthList"
            :option="fileWidthOption">
          </avue-crud>

        </el-form-item>
      </el-col>

@@ -295,29 +206,6 @@
         <el-button @click="closeDialog">取 æ¶ˆ</el-button>
         <el-button type="primary" @click="dialogSaveClickHandler">ç¡® å®š</el-button>
    </span>

    <el-dialog
      v-dialogDrag
      v-loading="selectFormLoading"
      :visible.sync="selectFormVisible"
      append-to-body="true"
      class="avue-dialog"
      title="表单选择"
      width="50%">
      <avue-crud
        ref="crud"
        :data="selectFormData"
        :option="selectFormOption"
        @selection-change="selectionChange"
        @row-click="rowClick">

      </avue-crud>

      <span slot="footer" class="dialog-footer">
         <el-button @click="selectFormVisible = false">取 æ¶ˆ</el-button>
         <el-button type="primary" @click="selectFormAddClickHandler">ç¡® å®š</el-button>
    </span>
    </el-dialog>
  </el-dialog>

</template>
@@ -345,6 +233,35 @@
  },
  data() {
    return {
      fileWidthOption: {
        ...basicOption,
        addBtn: false,
        editBtn: false,
        delBtn: false,
        refreshBtn: false,
        highlightCurrentRow: true,
        height: 200,
        menu: false,
        selection: false,
        column: [
          {
            label: '列名',
            prop: 'key',
          },
          {
            label: '列宽',
            prop: 'value',
            cell: true,
            rules: [
              {
                required: true,
                message: '请输入列宽',
                trigger: 'blur'
              }
            ]
          }
        ]
      },
      searchQtNameList: [],
      formLoading: false,
      itemImgHeight: '',
@@ -376,7 +293,23 @@
      selectFormData: [],
      selectFormLoading: false,
      selectFormVisible: false,
      rules: {},
      rules: {
        viName: [{
          required: true,
          message: '请输入名称',
          trigger: 'blur'
        }],
        itemInObj: [{
          required: true,
          message: '请选择绑定表单',
          trigger: 'change'
        }],
        showLabel: [{
          required: true,
          message: '请选择显示字段',
          trigger: 'submit'
        }],
      },
      form: {
        viName: '', // åç§°
        itemPageSize: '', // æ¯é¡µå¯æ˜¾ç¤ºè¡Œæ•°
@@ -391,7 +324,6 @@
        itemKeyFieldList: [], // éœ€è¦æœç´¢å­—段
        itemWidth: '250', // å®½åº¦
        itemFieldWidthList: [], // è®¾ç½®åˆ—宽数组 ä¸Ž itemOutFieldList ç›¸åŒ¹é…
        itemFileWidthSelect: '', // åˆ—下拉框
        searchLabel: '', // æŸ¥è¯¢å­—段
        searchNumber: '1', // æŸ¥è¯¢æ¬¡æ•°
        searchSql: '', // æŸ¥è¯¢sql
@@ -416,7 +348,6 @@
        itemKeyFieldList: [], // éœ€è¦æœç´¢å­—段
        itemWidth: '250', // å®½åº¦
        itemFieldWidthList: [], // è®¾ç½®åˆ—宽数组 ä¸Ž itemOutFieldList ç›¸åŒ¹é…
        itemFileWidthSelect: '', // åˆ—下拉框
        searchLabel: '', // æŸ¥è¯¢å­—段
        searchNumber: '1', // æŸ¥è¯¢æ¬¡æ•°
        searchSql: '', // æŸ¥è¯¢sql
@@ -440,33 +371,6 @@
    }
  },
  methods: {
    // å…³é—­å¯¹è¯æ¡†
    closeDialog() {
      this.visible = false;
      this.form = {...this.defaultForm};
    },

    // é€‰æ‹©è¡¨å•å…³é—­å¯¹è¯æ¡†
    closeSelectFormDialog() {

    },

    // é€‰æ‹©ç»‘定表单
    formSelectClickHandler() {
      this.selectFormVisible = true;
      const params = {
        'conditionMap[typeName]': this.treeRadio === '0' ? this.TreeNodeRow.id : this.TreeNodeRow.name,
        'conditionMap[viType]': 'Form',
        'conditionMap[viTypeFlag]': this.treeRadio === '0' ? 'BtmType' : this.treeRadio === '1' ? 'LinkType' : '',
      }
      gridPortalVIDatas(1, -1, params).then(res => {
        if (res.data.code === 200) {
          const data = res.data.data;
          this.selectFormData = data;
        }
      });
    },

    // èŽ·å–初始化表格里需要的默认数据
    getFormSelectList() {
      this.formLoading = true;
@@ -502,53 +406,45 @@
          const list = data.filter(item =>
            !this.form.itemOutFieldList.some(outItem => outItem.id === item.id)
          );
          this.getSearchSelectList();
          this.getSearchSelectList(); // é€‰æ‹©è¡¨å•ä¸‹æ‹‰æŽ¥å£
          this.getFormSelect(); // æŸ¥è¯¢æ¨¡æ¿ä¸‹æ‹‰æŽ¥å£
          this.getDbList(); // åŒå‡»æ“ä½œä¸‹æ‹‰æŽ¥å£
          this.$set(this.form, 'itemSelectOutFieldList', list);
          this.formLoading = false;
        }
      })
    },

    // æŸ¥è¯¢æ¨¡æ¿ä¸‹æ‹‰æŽ¥å£æŸ¥è¯¢
    getSearchSelectList() {
      getObjTypeQTs({btName: this.treeRadio === '0' ? this.TreeNodeRow.id : this.TreeNodeRow.name}).then(res => {
        this.searchQtNameList = res.data.data;
      })
    // å…³é—­å¯¹è¯æ¡†
    closeDialog() {
      this.visible = false;
      this.$refs.form.clearValidate();
      this.form = {...this.defaultForm};
    },

    // è¡¨æ ¼å¤šé€‰
    selectionChange(list) {
      this.selectList = list;
    },

    // è¡Œç‚¹å‡»
    rowClick(row) {
      func.rowClickHandler(
        row,
        this.$refs.crud,
        this.lastIndex,
        (newIndex) => {
          this.lastIndex = newIndex;
        },
        () => {
          this.selectList = [];
        }
      );
    },

    // è¡¨å•é€‰æ‹©ç¡®å®š
    selectFormAddClickHandler() {
      if (this.selectList.length <= 0) {
        this.$message.error('请至少选择一条数据');
        return;
      }

      if (this.selectList.length > 1) {
        this.$message.error('只能选择一条数据');
        return;
      }
    // èŽ·å–选择表单数据
    getFormSelect() {
      const params = {
        id: this.selectList[0].id,
        'conditionMap[typeName]': this.treeRadio === '0' ? this.TreeNodeRow.id : this.TreeNodeRow.name,
        'conditionMap[viType]': 'Form',
        'conditionMap[viTypeFlag]': this.treeRadio === '0' ? 'BtmType' : this.treeRadio === '1' ? 'LinkType' : '',
      }
      gridPortalVIDatas(1, -1, params).then(res => {
        if (res.data.code === 200) {
          const data = res.data.data;
          this.selectList = data;
        }
      });
    },

    // è¡¨å•é€‰æ‹©change事件
    formSelectChange(val) {
      // console.log(val);
      this.form.itemOutFieldList = [];
      this.form.itemKeyFieldList = [];
      this.form.itemFieldWidthList = [];

      const params = {
        id: val,
        viType: '1'
      }
      getPortalVIById(params).then(res => {
@@ -559,120 +455,32 @@
            }
          });
          this.form.itemSelectOutFieldList = data;
          this.selectFormVisible = false;
        }
      })
      this.form.itemInObj = this.selectList[0].id;
    },

    // æ˜¾ç¤ºå­—段左侧表格行点击
    showLabelLeftRowClick(row) {
      this.showLabelLeftRow = row;
    // æ˜¾ç¤ºå­—段change
    outFileChange(val) {
      this.form.itemSearchFieldList = this.form.itemOutFieldList.map(item => {
        return {
          id: item
        }
      })
      this.form.itemFieldWidthList = this.form.itemOutFieldList.map(item => {
        return {
          $cellEdit: true,
          key: item,
          value: '250',

        }
      })
    },

    // æ˜¾ç¤ºå­—段右侧表格行点击
    showLabelRightRowClick(row) {
      this.showLabelRightRow = row;
    },

    // æœç´¢å­—段左侧表格行点击
    searchLeftRowClick(row) {
      this.searchLeftRow = row;
    },

    // æœç´¢å­—段右侧表格行点击
    searchRightRowClick(row) {
      this.searchRightRow = row;
    },

    // æ˜¾ç¤ºå­—段穿梭框左移
    showLeftTransferClick() {
      if (func.isEmptyObject(this.showLabelRightRow)) {
        this.$message.error('请选择一条数据');
        return;
      }
      this.form.itemSelectOutFieldList.unshift(this.showLabelRightRow);
      this.form.itemOutFieldList = this.form.itemOutFieldList.filter(item => item.id !== this.showLabelRightRow.id);
      this.form.itemSearchFieldList = this.form.itemOutFieldList;
      this.form.itemFieldWidthList = this.form.itemFieldWidthList.filter(item => item.key !== this.showLabelRightRow.id);
      this.form.itemFileWidthSelect = this.form.itemFieldWidthList.length >= 1 ? this.form.itemFieldWidthList[0].key : '';
      this.showLabelRightRow = {};
    },

    // æ˜¾ç¤ºå­—段穿梭框右移
    showRightTransferClick() {
      if (func.isEmptyObject(this.showLabelLeftRow)) {
        this.$message.error('请选择一条数据');
        return;
      }


      const onlyFlag = this.form.itemOutFieldList.some(item => item.id === this.showLabelLeftRow.id);

      if (onlyFlag) {
        this.$message.error('请检查是否有重复项');
        this.form.itemSelectOutFieldList = this.form.itemSelectOutFieldList.filter(selectItem =>
          !this.form.itemOutFieldList.some(outItem => outItem.id === selectItem.id)
      )
        return;
      }

      this.form.itemOutFieldList.push(this.showLabelLeftRow);
      this.form.itemSearchFieldList = this.form.itemOutFieldList;

      // è¿‡æ»¤ itemSelectOutFieldList，移除 id ä¸Ž showLabelLeftRow.id ç›¸åŒçš„对象
      this.form.itemSelectOutFieldList = this.form.itemSelectOutFieldList.filter(item => item.id !== this.showLabelLeftRow.id);
      this.form.itemFieldWidthList.push({
        key: this.showLabelLeftRow.id,
        value: this.form.itemWidth
      });
      this.form.itemFileWidthSelect = this.form.itemFieldWidthList[0].key;
      this.showLabelLeftRow = {};

    },

    // æœç´¢å­—段穿梭框左移
    searchLeftTransferClick() {
      if (func.isEmptyObject(this.searchRightRow)) {
        this.$message.error('请选择一条数据');
        return;
      }
      this.form.itemSearchFieldList.unshift(this.searchRightRow);
      this.form.itemKeyFieldList = this.form.itemKeyFieldList.filter(item => item.id !== this.searchRightRow.id)
      this.searchRightRow = {};
    },

    // æœç´¢è‡ªåŠ¨ç©¿æ¢­æ¡†å³ç§»
    searchRightTransferClick() {
      if (func.isEmptyObject(this.searchLeftRow)) {
        this.$message.error('请选择一条数据');
        return;
      }

      this.form.itemKeyFieldList.push(this.searchLeftRow);

      this.form.itemSearchFieldList = this.form.itemSearchFieldList.filter(item => item.id !== this.searchLeftRow.id);
      this.searchLeftRow = {};
    },

    // è®¾ç½®åˆ—宽行点击
    itemFileWidthRowClick(row) {
      this.itemFileWidthRow = row;
      this.form.itemFileWidthSelect = row.key;
      this.form.itemWidth = row.value;
    },

    // åˆ—下拉change
    itemFileWidthChange(val) {
      this.itemFileWidthChangeVal = val;
    },

    // è®¾ç½®å®½åº¦
    widthSetUpClickHandler() {
      if (this.form.itemFileWidthSelect) {
        const item = this.form.itemFieldWidthList.find(item => item.key === this.form.itemFileWidthSelect);
        item.value = this.form.itemWidth;
      }
    // æŸ¥è¯¢æ¨¡æ¿ä¸‹æ‹‰æŽ¥å£æŸ¥è¯¢
    getSearchSelectList() {
      getObjTypeQTs({btName: this.treeRadio === '0' ? this.TreeNodeRow.id : this.TreeNodeRow.name}).then(res => {
        this.searchQtNameList = res.data.data;
      })
    },

    // èŽ·å–双击操作数据
@@ -715,36 +523,43 @@

    // è¡¨æ ¼å¯¹è¯æ¡†ä¿å­˜
    dialogSaveClickHandler() {
      const paramsForm = {...this.form};
      paramsForm.itemSelectOutFieldList = this.form.itemSelectOutFieldList.map(item => item.id); // å¯ä½¿ç”¨å­—段
      paramsForm.itemOutFieldList = this.form.itemOutFieldList.map(item => item.id); // éœ€è¦ä½¿ç”¨å­—段
      paramsForm.itemSearchFieldList = this.form.itemSearchFieldList.map(item => item.id); // å¯ä¾›æœç´¢å­—段
      paramsForm.itemKeyFieldList = this.form.itemKeyFieldList.map(item => item.id); // éœ€è¦ä½¿ç”¨å­—段
      paramsForm.itemImgWH = `${this.itemImgWidth},${this.itemImgHeight}`;
      const params = {
        id: this.form.editNodeId,
        prm: {
          formQtName: '',
          prmItemList: [
            paramsForm
          ],
        },
        typeFlag: this.treeRadio,
        typeFlagText: this.treeRadio === '0' ? "业务类型的表单" : '链接类型的表单',
        typeName: this.treeRadio === '0' ? this.TreeNodeRow.id : this.TreeNodeRow.name, // ä¸šåŠ¡ç±»åž‹å or é“¾æŽ¥ç±»åž‹å
        viName: this.form.viName,
        viType: 0,
        viTypeText: "表格"
      }
      savePortalVI(params).then(res => {
        // console.log(params);
        if (res.data.code === 200) {
          this.$message.success(res.data.obj);
          // this.closeDialog();
          this.$emit('updataTable');
          this.visible = false;
      this.$refs.form.validate((valid) => {
        if (valid) {
          const paramsForm = {...this.form};
          paramsForm.itemSelectOutFieldList = this.form.itemSelectOutFieldList.map(item => item.id); // å¯ä½¿ç”¨å­—段
          paramsForm.itemOutFieldList = this.form.itemOutFieldList; // éœ€è¦ä½¿ç”¨å­—段
          paramsForm.itemSearchFieldList = this.form.itemSearchFieldList.map(item => item.id); // å¯ä¾›æœç´¢å­—段
          paramsForm.itemKeyFieldList = this.form.itemKeyFieldList; // éœ€è¦ä½¿ç”¨å­—段
          paramsForm.itemImgWH = `${this.itemImgWidth},${this.itemImgHeight}`;
          const params = {
            id: this.form.editNodeId,
            prm: {
              formQtName: '',
              prmItemList: [
                paramsForm
              ],
            },
            typeFlag: this.treeRadio,
            typeFlagText: this.treeRadio === '0' ? "业务类型的表单" : '链接类型的表单',
            typeName: this.treeRadio === '0' ? this.TreeNodeRow.id : this.TreeNodeRow.name, // ä¸šåŠ¡ç±»åž‹å or é“¾æŽ¥ç±»åž‹å
            viName: this.form.viName,
            viType: 0,
            viTypeText: "表格"
          }
          savePortalVI(params).then(res => {
            // console.log(params);
            if (res.data.code === 200) {
              this.$message.success(res.data.obj);
              // this.closeDialog();
              this.$emit('updataTable');
              // this.$refs.form.clearValidate();
              this.visible = false;
            }
          })
        } else {
          return false;
        }
      })
      });
    }
  }
}

 Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/index.vue

@@ -204,8 +204,9 @@
        this.$refs.formDialog.getTreeList();
      } else {
        this.$refs.tableDialog.visible = true;
        this.$refs.tableDialog.getDbList();
        this.$refs.tableDialog.getSearchSelectList();
        this.$refs.tableDialog.getDbList(); // åŒå‡»æ“ä½œä¸‹æ‹‰æŽ¥å£
        this.$refs.tableDialog.getSearchSelectList(); // é€‰æ‹©è¡¨å•ä¸‹æ‹‰æŽ¥å£
        this.$refs.tableDialog.getFormSelect(); // æŸ¥è¯¢æ¨¡æ¿ä¸‹æ‹‰æŽ¥å£
      }
    },

@@ -329,14 +330,18 @@
            // æ›´æ–°è¡¨å•
            this.$refs.tableDialog.form = {
              ...prmItem,
              itemFieldWidthList:prmItem.itemFieldWidthList.map(item => {
                return{
                  ...item,
                  $cellEdit: true,
                }
              }),
              viName: res.data.obj.viName,
              editNodeId: row.id,
              itemOutFieldList: (prmItem.itemOutFieldList || []).map(item => ({id: item})),
              itemOutFieldList: (prmItem.itemOutFieldList || []),
              itemSearchFieldList: (prmItem.itemSearchFieldList || []).map(item => ({id: item})),
              itemKeyFieldList: (prmItem.itemKeyFieldList || []).map(item => ({id: item})),
              searchLabel: prmItem.itemSeniorQueryCols || '',
              searchNumber: prmItem.itemSeniorQueryColsCounts || '1',
              searchSql: prmItem.itemQuerySql || '',
              itemKeyFieldList: (prmItem.itemKeyFieldList || []),
              searchNumber: '1',
              itemFileWidthSelect: (prmItem.itemFieldWidthList && prmItem.itemFieldWidthList.length > 0) ? prmItem.itemFieldWidthList[0].key : '',
              itemWidth: (prmItem.itemFieldWidthList && prmItem.itemFieldWidthList.length > 0) ? prmItem.itemFieldWidthList[0].value : '250'
            };
@@ -345,9 +350,6 @@
            const [width = '0', height = '0'] = (prmItem.itemImgWH || '0,0').split(',');
            this.$refs.tableDialog.itemImgWidth = width;
            this.$refs.tableDialog.itemImgHeight = height;

            // åŒå‡»æ“ä½œèŽ·å–数据方法
            this.$refs.tableDialog.getDbList();

            // æ˜¾ç¤ºå¯¹è¯æ¡†
            this.$refs.tableDialog.visible = true;

 Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue

@@ -996,6 +996,7 @@
        this.$message.error('请选择一条数据');
        return;
      }
      console.log(this.selectList);
      this.btnDesignVisible = true;
      this.formBtnOid = this.selectList[0].id;
      this.getTabBtnTree();
@@ -1121,7 +1122,8 @@
      const params = this.saveType === 'add' ? {
        ...this.basicForm,
        parentId: this.nodeTreeRow.oId === 'parentNode' ? '' : this.nodeTreeRow.parentId,
        buttonParams: bottomParams
        buttonParams: bottomParams,
        tableOId:this.selectList[0].id
      } : {
        ...this.basicForm,
        buttonParams: bottomParams

 Source/plt-web/plt-web-ui/src/views/system/fileCab/index.vue

@@ -3,6 +3,7 @@
  <basic-container>
    <avue-crud
      ref="logCrud"
      v-model="form"
      :data="tableData"
      :option="option"
      :table-loading="tableLoading"
@@ -14,9 +15,9 @@
      <template slot="menuLeft" slot-scope="scope">
        <el-button icon="el-icon-download" plain size="small" type="primary" @click="exportClickHandler">导出</el-button>
      </template>
      <template #menu="{row,index,size}">
      <!--<template #menu="{row,index,size}">
        <el-button icon="el-icon-user" type="text" size="small" @click="userHandler(row,index)">分配成员</el-button>
      </template>
      </template>-->
    </avue-crud>
    <!-- åˆ†é…æˆå‘˜ç©¿æ¢­æ¡†   -->
    <transfer ref="transfer" :left-role-data="leftRoleData" :right-role-data="rightRoleData"
@@ -27,16 +28,16 @@
</template>

<script>
import {exportLog, getLogListByContion} from "@/api/system/log/logBasic";
import {exportPvolumes, getPvolumesPage,savePvolume,updatePvolume,deletePvolume} from "@/api/system/fileCab/api";
import func from "@/util/func";
import basicOption from "@/util/basic-option";
import {addUser, deleteUser, updateUser} from "@/api/system/user/api";
import {listUserByRoleOid, listUserUnInRoleOid, saveRight} from "@/api/system/role/api";

export default {
  name: "index",
  data: function () {
    return {
      form:{},
      tableLoading: false,
      tableData: [],
      option: {
@@ -44,53 +45,64 @@
        calcHeight: -60,
        align:'left',
        headerAlign:'center',
        menuWidth:260,
        menuWidth:160,
        dialogMenuPosition: 'right',
        dialogWidth:600,
        column: [
          {
            label: '卷名',
            prop: 'truename',
            prop: 'name',
            width: 200,
            span: 24,
            rules: [{ required: true, message: '请输入卷名', trigger: 'blur' }]
          },{
            label: '服务器',
            prop: 'type',
            prop: 'host',
            span: 24,
            rules: [{ required: true, message: '请输入服务器', trigger: 'blur' }]
          },{
            label: '卷服务',
            prop: 'date',
            prop: 'service',
            span: 24,
            rules: [{ required: true, message: '请输入卷服务', trigger: 'blur' }]
          }, {
            label: '机器类型',
            prop: 'username',
            prop: 'type',
            width: 120,
            span: 24,
            type:'radio',
            dicData:[{
              label:'Unix',
              value:'Unix'
              value:0
            },{
              label:'Win NT',
              value:'Win NT'
              value:1
            }],
            value:'Win NT'
            value:1
          },{
            label: '路径名称',
            prop: 'userIp',
            prop: 'path',
            span: 24,
            overHidden: true,
            rules: [{ required: true, message: '请输入路径名称', trigger: 'blur' }]
          },{
            label: '首选路径',
            prop: 'loc',
            prop: 'isvalid',
            width: 120,
            span: 24,
            type: 'switch',
            value:false
            value:false,
            beforeChange: (done) => {debugger;
              this.$confirm('您确实要修改卷的首选路径吗？', '提示', {
                confirmButtonText: '确定',
                cancelButtonText: '取消',
                type: 'warning'
              }).then(() => {
                done(true);
              }).catch(() => {
                done(false);
              });
            },
          }]
      },
      currentRow:null,
@@ -103,7 +115,7 @@
    // è¡¨æ ¼è¯·æ±‚
    getTableList() {
      this.tableLoading = true;
      getLogListByContion(1, 50, {}).then(res => {
      getPvolumesPage().then(res => {
        this.tableData = res.data.data;
        this.tableLoading = false;
      })
@@ -111,7 +123,7 @@

    // æ–°å¢ž
    rowSaveHandler(row, done,loading) {
      addUser(row).then(res => {
      savePvolume(row).then(res => {
        if (res.data.code === 200) {
          this.$message.success(res.data.obj);
          this.getTableList();
@@ -124,7 +136,7 @@

    // ç¼–辑
    rowUpdateHandler(row, index, done,loading) {
      updateUser(row).then(res => {
      updatePvolume(row).then(res => {
        if (res.data.code === 200) {
          this.$message.success(res.data.obj);
          this.getTableList();
@@ -146,7 +158,7 @@
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        deleteUser(params).then(res => {
        deletePvolume(params).then(res => {
          if (res.data.code === 200) {
            this.$message.success(res.data.obj);
            this.getTableList();
@@ -162,7 +174,7 @@
    // å¯¼å‡º
    exportClickHandler() {
      const loading = this.$loading({});
      exportLog().then(res => {
      exportPvolumes().then(res => {
        func.downloadFileByBlobHandler(res);
        this.createdLoading = false
        this.$message.success('导出成功');