Merge remote-tracking branch 'origin/master'

 Source/plt-web/plt-web-ui/public/index.html

@@ -27,6 +27,34 @@
  <!-- 引入阿里巴巴的图表库iconfont和svg图标后，直接使用图标名即可，记得加前缀 -->
  <link rel="stylesheet" href="https://at.alicdn.com/t/font_567566_pwc3oottzol.css">
  <script src="//at.alicdn.com/t/font_2621503_zcbiqy2g1i.js"></script>
  <script>
    //将引入的图标库添加到项目图标库中
    let fontIconList=[{
      label: '自定义引入的svg图标',
      list: [ {
        label: '机构',
        value: '#icon-jigou'
      },
        {
          label: '短信管理',
          value: '#icon-duanxinguanli'
        },
        {
          label: '发票管理系统',
          value: '#icon-fapiaoguanlixitong'
        },
        {
          label: '角色',
          value: '#icon-jiaose'
        }]
    }, {
      label: "自定义引入的字体图标",
      list: [
        "iconfont icon-huanyingye",
      "icon-weixin1"]
    }
    ];
  </script>

  <title>PLTWEB平台</title>
  <style>
@@ -120,29 +148,6 @@
<!--<script charset="utf-8" src="<%= BASE_URL %>cdn/avue/2.12.4/avue.min.js"></script>-->
<script charset="utf-8" src="<%= BASE_URL %>cdn/avue/2.13.1/avue.min.js"></script>
<script charset="utf-8" src="<%= BASE_URL %>cdn/nutflow/wf-design-base/index.umd.min.js"></script>

<script>
  //将引入的图标库添加到项目图标库中
  let fontIconList=[{
      label: '阿里图标-Symbol图标',
      list: [ {
        label: '机构',
        value: '#icon-jigou'
      },
        {
          label: '短信管理',
          value: '#icon-duanxinguanli'
        },
        {
          label: '发票管理系统',
          value: '#icon-fapiaoguanlixitong'
        },
        {
          label: '角色',
          value: '#icon-jiaose'
        }]
  }];
</script>
</body>

</html>

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

@@ -250,6 +250,11 @@
        }
      } else {
        delete params.queryRoot;
        if(this.paramVOS.querytemplate){
          //说明是通过按钮点击打开的，Action参数中配置有this.paramVOS.querytemplate
          delete params.queryTemplate;
          delete params.linkTypeFlag;
        }
      }
      getTree(parentOid, parentBtmName, params,url).then(res => {
        resolve(res.data.treeData )

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

@@ -613,7 +613,8 @@
                  :show-header="false"
                  border
                  stripe
                  style="width: 100%">
                  style="width: 100%"
                  @row-click="customOptionTableClick">
                  <el-table-column
                    align="center"
                    label="名称"
@@ -636,7 +637,9 @@
                <el-button plain size="mini" style="margin-right: 5px" type="success"
                           @click="optionAddClickHandler('dialog')">添加
                </el-button>
                <el-button plain size="mini" style="margin-left: 5px" type="danger">删除</el-button>
                <el-button plain size="mini" style="margin-left: 5px" type="danger"
                           @click="optionDeleteClickHandler('dialog')">删除
                </el-button>
              </div>
            </el-form-item>
          </el-col>
@@ -1050,7 +1053,11 @@
          children: 'children',
        },
      },
      treeData: []
      treeData: [],
      optionRow: {},
      customOptionRow: {},
      optionCurrentIndex: 0,
      customOptionCurrentIndex: 0
    }
  },
  computed: {
@@ -1117,10 +1124,9 @@
        itemType: 'text',
        itemName: data.data.name,
        itemCols: "1",
        itemIsEditable:"0",
        itemIsRequired:"0",
        itemIsEditable: "0",
        itemIsRequired: "0",
      }
      console.log(data);
      const isDuplicate = this.formList.some(item => item.text === data.text);

      if (isDuplicate) {
@@ -1137,7 +1143,6 @@
      this.form = {...item};
      this.topForm.position = index += 1;
      // this.$forceUpdate();
      console.log(this.form);
    },

    // 设置显示行数
@@ -1239,7 +1244,12 @@

    // 选项表格行点击
    optionTableClick(row) {
      this.optionRow = row;
      console.log(row);
    },

    customOptionTableClick(row) {
      this.customOptionRow = row;
    },

    // 选项添加
@@ -1270,15 +1280,21 @@

      const params = {
        key: optionObj.optionName,
        value: optionObj.optionValue
        value: optionObj.optionValue,
        index: val === 'dialog' ? this.customOptionCurrentIndex++ : this.optionCurrentIndex++
      };

      itemKeyValueList.push(params);
    },

    // 选项删除
    optionDeleteClickHandler() {

    optionDeleteClickHandler(val) {
      // console.log(this.optionRow);
      if (val === 'dialog') {
        this.customForm.itemKeyValueList.splice(this.customOptionRow.index,1);
      } else {
        this.form.itemKeyValueList.splice(this.optionRow.index,1);
      }
    },

    // 添加自定义组件

 Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue

@@ -6,7 +6,7 @@
          <avue-tree :key="refresh" node-key="id" ref="tree" :data="treeData" :option="treeOption" @node-click="nodeClick">
          <span slot-scope="{ node, data }" class="el-tree-node__label">
           <span style="font-size: 15px">
              <i class="el-icon-s-promotion"></i>
              <i :class="data.icon"></i>
                {{ (node || {}).label }}
            </span>
          </span>
@@ -249,7 +249,8 @@
                ...item,
                id: item.id,
                name: item.name,
                leaf: !item.hasChildren
                leaf: !item.hasChildren,
                icon: item.source || 'iconfont iconicon_work'
              }
            }))
          })

 Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue

@@ -7,7 +7,7 @@
                     @node-click="nodeClick">
          <span slot-scope="{ node, data }" class="el-tree-node__label">
           <span style="font-size: 15px">
              <i class="el-icon-s-promotion"></i>
              <i :class="data.icon"></i>
                {{ (node || {}).label }}
            </span>
          </span>
@@ -252,7 +252,8 @@
                ...item,
                id: item.id,
                name: item.name,
                leaf: !item.hasChildren
                leaf: !item.hasChildren,
                icon: item.source || 'iconfont iconicon_work'
              }
            }))
          })