Merge remote-tracking branch 'origin/master'

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

@@ -1,7 +1,7 @@
<template>
  <div>
    <el-input :width="width" :class="inputClass" :style="inputStyle" :clearable="true" :value="value"
              :disabled="disabled" :placeholder="placeholder" type="text" :size="size" @clear="clearValue" @focus="handleFocus">
                :disabled="disabled" :placeholder="placeholder" :read-only="true" type="text" :size="size" @clear="clearValue">
      <span slot="append" v-html="svgHtml" style="font-size: 18px;padding:3px 10px;width:18px;height:18px;display: block" @click="handleFocus"></span>
    </el-input>
    <el-dialog v-dialogDrag

 Source/plt-web/plt-web-ui/src/styles/ui.scss

@@ -409,13 +409,24 @@
  min-height: 26px;
}
.avue-crud .avue-crud__menu .el-button{
  margin-bottom: 5px;

}
.avue-crud .avue-crud__menu .el-button--text{
  padding: 2px 6px;
}
.avue-crud table td{
  line-height: 22px;
}
/**左侧操作栏**/
.avue-crud__left{
  display: flex;
  align-items: center;
}
/**表内操作栏**/
.avue-crud .avue-crud__menu{
  min-height: 22px;
  display: flex;
  justify-content: space-around;
}
.el-table--small, .el-table__expand-icon{
  font-size: 14px;
@@ -454,12 +465,29 @@
  bottom: 0;
}
/****处理固定列错行问题****/
.el-table th.el-table__cell .cell{
  display: flex;
  justify-content:flex-start;
}
.el-table th.el-table__cell.is-center .cell{
  justify-content:center;
}

.el-table th.el-table__cell.is-right .cell{
  justify-content: flex-end;
}
.el-table th.el-table__cell .cell span:first-child{
  white-space: nowrap;
  overflow: hidden;
  text-overflow: ellipsis;
}
.el-table .el-table__fixed,.el-table .el-table__fixed-right{
  height: 100% !important;
}
.el-table__fixed .el-table__fixed-body-wrapper,.el-table__fixed-right .el-table__fixed-body-wrapper{
  height: calc(100% - 37px) !important;
  top:37px !important;
  height: calc(100% - 47px) !important;
  top:35px !important;
  padding-bottom: 12px !important;
}
/*
分页
@@ -624,19 +652,6 @@
  content: '';
}

.avue-crud .avue-crud__menu .el-button{
  margin-top: 5px;
}

.avue-crud__left{
  display: flex;
  align-items: center;
}

.avue-crud__menu{
  display: flex;
  justify-content: space-around;
}

.font14{font-size: 14px;width: 12px;height: 12px;display: inline-block;}
.font16{font-size: 16px;width: 14px;height: 14px;display: inline-block;}

 Source/plt-web/plt-web-ui/src/util/basic-option.js

@@ -4,7 +4,6 @@
  index:true,
  indexFixed:false,//固定列
  dialogDrag:true,
  searchShow:true,
  searchIcon:true,
  selection:true, //是否有选择框
  selectionFixed:false,
@@ -13,6 +12,7 @@
  align: 'center',
  emptyText: '暂无内容',
  tip:false,
  searchShow:false,//搜索栏默认隐藏
  // menu:false, 是否有操作栏
  // menuTitle:xxx, 操作栏标题
}

 Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue

@@ -8,7 +8,7 @@
            <avue-tree :data="treeData" :option="treeOption" @node-click="nodeClick">
              <span slot-scope="{ node, data }" class="el-tree-node__label">
               <span>
                  <i class="el-icon-s-promotion"></i>
                <icon-show :name="data.icon"></icon-show>
                    {{ (node || {}).label }}
                </span>
              </span>

 Source/plt-web/plt-web-ui/src/views/authority/ui/typeAction/index.vue

@@ -9,7 +9,7 @@
            <avue-tree :data="treeData" :option="treeOption" @node-click="nodeClick">
              <span slot-scope="{ node, data }" class="el-tree-node__label">
               <span>
                  <i class="el-icon-s-promotion"></i>
                 <icon-show :name="data.icon"></icon-show>
                    {{ (node || {}).label }}
                </span>
              </span>

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

@@ -205,8 +205,8 @@
                使用枚举
              </template>
              <div>
                <el-tag :type="lastItem.enumFlag ? 'success' : 'danger'">
                  {{ lastItem.enumFlag ? '是' : '否' }}
                <el-tag :type="lastItem.enumId ? 'success' : 'danger'">
                  {{ lastItem.enumId ? '是' : '否' }}
                </el-tag>
              </div>
            </el-descriptions-item>
@@ -215,7 +215,7 @@
                枚举类型
              </template>
              <div>
                {{ lastItem.enumFlag }}
                {{ lastItem.enumId }}
              </div>
            </el-descriptions-item>
            <el-descriptions-item>
@@ -320,18 +320,19 @@
              </el-col>
              <el-col :span="8">
                <el-form-item label="选择参照类型：" prop="referValue">
                  <el-input v-model="form.referValue" :clearable="true" @focus="referFormFocusHandler"></el-input>
                  <avue-input-tree key="businessReferValue" v-if="form.attributeSelectType === 'business'" default-expand-all :clearable="true" v-model="form.referValue" placeholder="请选择内容" :dic="businessData" @change="referValueChange"></avue-input-tree>
                  <avue-input-tree key="linkReferValue" v-else default-expand-all v-model="form.referValue" placeholder="请选择内容" :clearable="true" :dic="linkTypeData" @change="referValueChange"></avue-input-tree>
                </el-form-item>
              </el-col>
              <el-col :span="8">
                <el-form-item v-if="form.attributeSelectType === 'link'" label="版本次：" prop="version">
                <el-form-item v-show="form.attributeSelectType === 'link'" label="版本次：" prop="version">
                  <el-select v-model="form.version" placeholder="请选择版本次">
                    <el-option :value="1" label="当前版本次"></el-option>
                    <el-option :value="3" label="最新版本次"></el-option>
                  </el-select>
                </el-form-item>
              </el-col>
              <div v-if="!form.referValue" style="clear: both">
              <div v-show="showEnumSwitch" style="clear: both">
                <el-col :span="8">
                  <el-form-item label="使用枚举：" prop="enumSwitch">
                    <el-switch v-model="form.enumSwitch" @change="switchEnumChange"></el-switch>
@@ -513,58 +514,6 @@
            </div>
          </div>
        </el-form>

        <!-- 业务类型对话框 -->
        <el-dialog
          v-dialogDrag
          :visible.sync="businessVisible"
          append-to-body="true"
          class="avue-dialog"
          title="业务类型选择"
          width="70%"
        >
          <avue-crud
            ref="businessCrud"
            :data="businessData"
            :option="businessOption"
            :table-loading="businessLoading"
            @search-change="businessHandleSearch"
            @search-reset="businessHandleReset"
            @row-click="businessRowClick"
          >
          </avue-crud>
          <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="businessSaveHandler">确 定</el-button>
          <el-button @click="businessEmpty">清 空</el-button>
         <el-button @click="businessVisible = false">取 消</el-button>
        </span>
        </el-dialog>

        <!-- 链接类型对话框 -->
        <el-dialog
          v-dialogDrag
          :visible.sync="linkTypeVisible"
          append-to-body="true"
          class="avue-dialog"
          title="链接类型选择"
          width="70%"
        >
          <avue-crud
            ref="linkTypeCrud"
            :data="linkTypeData"
            :option="linkTypeOption"
            :table-loading="linkTypeLoading"
            @search-change="linkHandleSearch"
            @search-reset="linkHandleReset"
            @row-click="linkRowClick"
          >
          </avue-crud>
          <span slot="footer" class="dialog-footer">
          <el-button @click="linkEmpty">清 空</el-button>
         <el-button @click="linkTypeVisible = false">取 消</el-button>
         <el-button type="primary" @click="linkSaveHandler">确 定</el-button>
        </span>
        </el-dialog>
      </div>
      <span slot="footer" class="dialog-footer">
        <el-button type="primary" @click="addSaveHandler">确 定</el-button>
@@ -625,73 +574,8 @@
        ]
      },
      dialogTitle: "",
      businessRow: {},
      linkRow: {},
      linkDataSearch: [],
      businessSearchParams: {},
      linkTypeSearchParams: {},
      businessLoading: false,
      linkTypeLoading: false,
      businessVisible: false,
      linkTypeVisible: false,
      businessData: [],
      linkTypeData: [],
      businessOption: {
        ...basicOption,
        addBtn: false,
        menu: false,
        searchMenuSpan: 8,
        selection: false,
        refreshBtn: false,
        searchLabelWidth: 100,
        highlightCurrentRow: true,
        column: [
          {
            label: '业务类型名',
            prop: 'name',
            sortable: true,
            search: true
          },
          {
            label: '标签',
            prop: 'label',
            sortable: true,
          },
          {
            label: '父类',
            prop: 'fName',
            sortable: true,
          },
          {
            label: '版本规则',
            prop: 'revRuleName',
            sortable: true,
          },
          {
            label: '生命周期',
            prop: 'lifeCycle',
            sortable: true,
          },
        ]
      },
      linkTypeOption: {
        ...basicOption,
        addBtn: false,
        menu: false,
        searchMenuSpan: 8,
        selection: false,
        refreshBtn: false,
        searchLabelWidth: 100,
        highlightCurrentRow: true,
        column: [
          {
            label: '链接类型名',
            prop: 'name',
            sortable: true,
            search: true
          },
        ]
      },
      tableData: [],
      option: {
        ...basicOption,
@@ -744,6 +628,8 @@
      },
      addVisible: false,
      addLoading: false,
      referValueDic:[],
      showEnumSwitch:false,
      form: {
        id: "",
        name: "",
@@ -833,9 +719,24 @@
        this.tableData = data;
        this.page.total = res.data.total;
        this.tableLoading = false;
      }).catch(err => {
        this.$message.error(err)
      });
      //获取业务类型数据
      getBizTypes().then(res => {
        const data = res.data.data.map(item => ({
          label: item.name,
          value:item.name,
          desc:item.label
        }));
        this.businessData = data;
      })
      //获取链接类型数据
      getAllLtName().then(res => {
        const data = res.data.data.map(item => ({
          label: item,
          value:item
        }));
        this.linkTypeData = data;
      })
    },

    // 表格头部刷新
@@ -844,7 +745,7 @@
    },

    // 搜索
    handleSearch(params, done) {
    handleSearch(params, done) {debugger;
      this.searchParams = {
        "conditionMap[id]": "*" + params.id + "*"
      };
@@ -1184,136 +1085,13 @@
    },
    // 值域类型切换
    attributeSelectTypeChange() {
      this.form.referValue = ''; // 切换值域类型 清空当前参照
      this.$forceUpdate(); // 强制更新form组件
      this.form.referValue = null; // 切换值域类型 清空当前参照
    },

    // 选择参照
    referFormFocusHandler() {
      const handlers = {
        business: () => {
          this.businessVisible = true;
          this.businessLoading = true;
          this.businessGetTable();
        },
        link: () => {
          this.linkTypeVisible = true;
          this.linkTypeLoading = true;
          this.linkGetTable();
        }
      };

      const {attributeSelectType} = this.form;
      const handler = handlers[attributeSelectType];

      if (handler) {
        handler();
      }
      ;
    //参照类型数据变化
    referValueChange(data){
      this.showEnumSwitch=!data.value;
    },

    // 业务类型表格数据请求
    businessGetTable() {
      getBizTypes(this.businessSearchParams).then(res => {
        const data = res.data.data;
        this.businessData = data;
        this.businessLoading = false;
      })
    },

    // 业务类型参照搜索
    businessHandleSearch(val, done) {
      this.businessSearchParams = {
        btmName: val.name
      }
      this.businessGetTable();
      done()
    },

    // 业务类型参照清空搜索
    businessHandleReset() {
      this.businessSearchParams = {};
      this.businessGetTable();
    },

    // 链接类型表格数据请求
    linkGetTable() {
      getAllLtName(this.linkTypeSearchParams).then(res => {
        const data = res.data.data.map(item => ({name: item}));
        ;
        this.linkTypeData = data;
        this.linkDataSearch = data;
        this.linkTypeLoading = false;
      })
    },

    // 链接类型参照搜索
    linkHandleSearch(params, done) {
      const {name} = params;

      if (!params.name) {
        this.linkTypeData = this.linkDataSearch;
        return done();
      }
      ;

      this.linkTypeData = this.linkDataSearch.filter(item => {
        console.log(item)
        return item.name && item.name.includes(name);
      });

      done();
    },

    // 链接类型参照清空搜索
    linkHandleReset() {
      this.linkTypeData = this.linkDataSearch;
    },

    // 业务类型表格行点击
    businessRowClick(row) {
      this.businessRow = row;
    },

    // 业务类型确定保存
    businessSaveHandler() {
      if (func.isEmptyObject(this.businessRow)) {
        this.$message.error('请选择一条数据！')
        return;
      }

      this.form.referValue = this.businessRow.name;
      this.businessVisible = false;
    },

    // 业务类型清空
    businessEmpty() {
      this.form.referValue = null;
      this.businessVisible = false;
    },

    // 链接类型确定保存
    linkRowClick(row) {
      this.linkRow = row;
    },

    // 业务类型确定保存
    linkSaveHandler() {
      if (func.isEmptyObject(this.linkRow)) {
        this.$message.error('请选择一条数据！')
        return;
      }

      this.form.referValue = this.linkRow.name;
      this.linkTypeVisible = false;
    },

    // 链接类型清空
    linkEmpty() {
      this.form.referValue = null;
      this.linkTypeVisible = false;
    },

    // 关闭新增对话框
    addEscHandler() {
      this.addVisible = false;
@@ -1334,7 +1112,7 @@
        attributeSelectType: "business",
        version: 1,
        defaultValue: "",//默认值
        referValue: "",
        referValue: null,
        btmTypeId: "",
        linkTypeName: "",
        rangeValue: ""
@@ -1347,6 +1125,16 @@
    addSaveHandler() {
      this.$refs.form.validate((valid) => {
        if (valid) {
          if(this.form.attributeDataType === 'VTString'){
            if(!this.form.referValue){
              //参照类型没有值

            }else {
              this.form.enumSwitch=false;
              this.form.rangeValue=''
            }
          }

          this.form.range = this.form.rangeValue ? this.form.rangeValue.replace(/\n/g, ';') : '';
          if (this.form.attributeSelectType === 'business') {
            this.form.btmTypeId = this.form.referValue;

 Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/option.js

@@ -4,6 +4,18 @@
    prop: 'id',
    search: true,
    sortable: true,
    type:'select',
    allowCreate:true,
    filterable:true,
    props:{
      label:'id',
      value:'id'
    },
    dicUrl:"/api/attributeController/gridAttribute",
    dicQuery:{
      page:1,
      limit:-1
    }
  },
  {
    label: '标签',

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

@@ -12,7 +12,7 @@
            @node-click="nodeClick">
          <span slot-scope="{ node, data }" class="el-tree-node__label">
            <span style="display: flex">
              <icon-show :name="data.icon"></icon-show>
              <icon-show v-if="data.icon" :name="data.icon"></icon-show>
                {{ (node || {}).label }}
            </span>
          </span>
@@ -354,7 +354,7 @@
              {
                required: true,
                message: '请选择图标',
                trigger: 'blur'
                trigger: 'submit'
              }
            ]
          },

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

@@ -29,7 +29,7 @@

          <el-tabs v-model="activeName" @tab-click="handleClick">
            <el-tab-pane v-for="item in iconList" :label="item.lable" :name="item.lable" style="height: calc(100vh - 270px);overflow: auto ">
              <div class="iconList">
              <div class="iconList" :key="key">
                <div class="iconItem" v-for="svg in item.list"
                     :data-value="svg.name" v-right-click="{action:checkSvg,data:svg}">
                  <div class="svgContent" v-html="svg.content"></div>
@@ -110,6 +110,7 @@
  },
  data() {
    return {
      key:1,
      types: [],
      checkedTypes:[],
      searchText:'',
@@ -264,6 +265,7 @@
            if (this.iconList.length > 0) {
              this.activeName = this.iconList[0].lable;
            }
            this.key++;
          } else {
            this.$message.error(res.data.msg);
          }

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

@@ -240,12 +240,14 @@
        column: [{
          label: '名称',
          prop: 'plName',
          search: true
          search: true,
          overHidden:true
        }, {
          label: 'UI上下文',
          prop: 'plCode',
          search: true,
          sortable: true,
          overHidden:true
        }, {
          label: '导航区',
          prop: 'plIsShowNavigator',

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

@@ -412,13 +412,11 @@
          {required: true, message: '请输入名称', trigger: 'blur'},
        ],
        actionName: [
          {required: true, message: '请选择Action', trigger: 'blur'},
          {required: true, message: '请选择Action', trigger: 'change'},
        ],
      },
      // 按钮设计 基础信息
      basicForm: {
        seq: 1
      },
      basicForm: {},
      treeData: [],
      treeOption: {
        menu: false,
@@ -866,6 +864,7 @@
      lastIndex: null,
      selectList: [],
      formDataRow: {},
      defaultForm:{},
    }
  },
  computed:{
@@ -1176,13 +1175,14 @@
    // 按钮设计行点击
    nodeTreeClick(row) {
      this.nodeTreeRow = row;
      this.defaultForm = {...row};
      this.basicForm = {...row};
      this.paramsData = row.buttonParams ? Object.entries(row.buttonParams).map(([key, value]) => ({
        name: key,
        value: value
      })) : [];
      this.disabledBtn = true;
      this.$refs.form.clearValidate()
      this.$refs.form.clearValidate();
    },

    // 按钮设计参数信息删除
@@ -1255,6 +1255,9 @@
      this.disabledBtn = true;
      if (this.saveType === 'add') {
        this.$refs.Tree.setCurrentKey(null);
        this.$refs.form.resetFields();
      }else {
        this.basicForm = {...this.defaultForm};
      }
    },

@@ -1300,6 +1303,7 @@
          return false;
        }
        done();
        this.$refs.form.resetFields();
      });
    },


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

@@ -16,6 +16,7 @@
            <avue-tree ref="tree" :data="treeData" :option="treeOption" @node-click="nodeClick">
              <span slot-scope="{ node, data }" class="el-tree-node__label">
               <span>
                 <icon-show :name="data.icon"></icon-show>
                    {{ (node || {}).label }}
                </span>
              </span>
@@ -149,11 +150,9 @@
        level: this.paramsType
      }
      this.defaultExpandKeys = ['root'];
      console.log(row);
      getAllLevelTreeByBtm(params).then(res => {
        this.uiTreeOption.defaultExpandedKeys = [res.data.obj.oid];
        this.uiTreeData = [res.data.obj];
        console.log(res);
        this.rightLoading = false;
      }).catch(error => {
        this.rightLoading = false;

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

@@ -26,11 +26,6 @@
          <icon-show :name="permissionList.delBtn.source"></icon-show>
          删除
        </el-button>
        <el-button v-if="permissionList.assignMembersBtn" class="button-custom-icon" plain size="small" type="primary"
                   @click="assignMembersHandler">
          <icon-show :name="permissionList.assignMembersBtn.source"></icon-show>
          分配成员
        </el-button>
        <el-button v-if="permissionList.statisticsBtn" class="button-custom-icon" plain size="small" type="primary"
                   @click="statisticsHandler">
          <icon-show :name="permissionList.statisticsBtn.source"></icon-show>
@@ -48,6 +43,15 @@
      </template>

      <template slot="menu" slot-scope="{ row, index }">
        <el-button
          v-if="permissionList.assignMembersBtn"
          size="small"
          type="text"
          @click="assignMembersHandler(row, index)"
        >
          <icon-show :name="permissionList.assignMembersBtn.source"></icon-show>
          分配成员
        </el-button>
        <el-button
          v-if="permissionList.editBtn"
          size="small"
@@ -341,19 +345,19 @@
    },

    // 分配成员
    assignMembersHandler() {
      if (this.selectList.length <= 0) {
        this.$message.warning('请选择角色进行成员分配！');
        return;
      }

      if (this.selectList.length > 1) {
        this.$message.warning('一次只能对一个角色进行分配成员操作！');
        return;
      }
    assignMembersHandler(row,index) {
      // if (this.selectList.length <= 0) {
      //   this.$message.warning('请选择角色进行成员分配！');
      //   return;
      // }
      //
      // if (this.selectList.length > 1) {
      //   this.$message.warning('一次只能对一个角色进行分配成员操作！');
      //   return;
      // }
      Promise.all([
        listUserUnInRoleOid({pkRole: this.selectList[0].oid}),
        listUserByRoleOid({pkRole: this.selectList[0].oid})
        listUserUnInRoleOid({pkRole: row.oid}),
        listUserByRoleOid({pkRole: row.oid})
      ]).then(([unInRoleRes, byRoleRes]) => {
        this.leftRoleData = [];
        this.rightRoleData = [];