整合代码

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

@@ -108,7 +108,7 @@
                <template slot="label">
                  版本号规则
                </template>
                <el-tag v-if="nodeRow.revRuleName">{{ nodeRow.revRuleName }}</el-tag>
                <el-tag v-if="nodeRow.revisionRuleId">{{ nodeRow.revisionRuleId }}</el-tag>
              </el-descriptions-item>
              <el-descriptions-item v-if="nodeRow.revLevel !== '0'" :contentStyle="descriptionOption.contentStyle"
                                    :labelStyle="descriptionOption.labelStyle">
@@ -123,12 +123,12 @@
                <template slot="label">
                  版次号规则
                </template>
                <el-tag v-if="nodeRow.verRuleName"
                        :type="nodeRow.verRuleName === '0' ? 'warning' : nodeRow.revLevel === '1' ? '' : 'success'">
                <el-tag v-if="nodeRow.revisionRuleId"
                        :type="nodeRow.revisionRuleId === '0' ? 'warning' : nodeRow.revisionRuleId === '1' ? '' : 'success'">
                  {{
                    nodeRow.verRuleName === '0'
                    nodeRow.versionRule === '0'
                      ? '1.2.3...'
                      : nodeRow.revLevel === '1'
                      : nodeRow.versionRule === '1'
                      ? 'a.b.c...'
                      : '0.1.2...'
                  }}
@@ -144,7 +144,7 @@
                <template slot="label">
                  生命周期
                </template>
                <el-tag v-if="nodeRow.lifeCycle">{{ nodeRow.lifeCycle }}</el-tag>
                <el-tag v-if="nodeRow.lifeCycleId">{{ nodeRow.lifeCycleId }}</el-tag>
              </el-descriptions-item>
            </el-descriptions>
          </div>
@@ -178,7 +178,7 @@
              <el-input v-model="form.name"></el-input>
            </el-form-item>
            <el-form-item label="继承自：">
              <el-input v-model="form.name" :readOnly="title === 'edit'"></el-input>
              <el-input v-model="form.fName" :readOnly="title === 'edit'"></el-input>
            </el-form-item>
            <el-form-item label="实现类：">
              <el-input v-model="form.implClass"></el-input>
@@ -195,13 +195,18 @@
                <el-option label="采用二级版本管理" value="2"></el-option>
              </el-select>
            </el-form-item>
            <el-form-item v-if="form.revLevel !== '0'" label="版本号规则：" label-width="100px" prop="revLevel">
            <el-form-item v-if="form.revLevel !== '0'" label="版本号规则：" label-width="100px" prop="revisionRuleName">
              <div style="display: flex;gap: 5px;align-items: center">
                <el-input v-model="form.revRuleName" :readOnly="true"></el-input>
                <el-input v-model="form.revisionRuleId" :readOnly="true"></el-input>
                <el-button plain size="small" style="margin-left: 5px;height: 30px" type="success" @click="versionAddHandler">添加</el-button>
                <el-switch
                  style="width: 300px"
                  v-model="form.inputRevisionFlag"
                  active-text="手工输入">
                </el-switch>
              </div>
            </el-form-item>
            <el-form-item v-if="form.revLevel !== '0'" label="分隔符：" label-width="100px" prop="revLevel">
            <el-form-item v-if="form.revLevel !== '0'" label="分隔符：" label-width="100px" prop="delimiter">
              <el-select v-model="form.delimiter" clearable>
                <el-option label="." value="."></el-option>
                <el-option label="-" value="-"></el-option>
@@ -209,7 +214,7 @@
            </el-form-item>
            <el-form-item v-if="form.revLevel !== '0' && form.revLevel !== '1'" label="版次号规则：" label-width="100px"
                          prop="revLevel">
              <el-select v-model="form.verRuleName" clearable>
              <el-select v-model="form.versionRule" clearable>
                <el-option label="1.2.3..." value="1.2.3..."></el-option>
                <el-option label="a.b.c..." value="a.b.c..."></el-option>
                <el-option label="0.1.2..." value="0.1.2..."></el-option>
@@ -219,8 +224,8 @@
          <div class="rightForm">
            <el-form-item label="生命周期：" label-width="138px" prop="revLevel">
              <div style="display: flex;gap: 5px;align-items: center">
                <el-input v-model="form.lifeCycle" :readOnly="true"></el-input>
                <el-button plain size="small" style="margin-left: 5px;height: 30px" type="success">添加</el-button>
                <el-input v-model="form.lifeCycleId" :readOnly="true"></el-input>
                <el-button plain size="small" style="margin-left: 5px;height: 30px" type="success" @click="lifeAddHandler('input')">添加</el-button>
              </div>
            </el-form-item>

@@ -229,12 +234,12 @@
                <div style="height: 200px; width: 280px; border: 1px solid #bdbbbb;overflow-y: auto">
                  <!-- 内容 -->
                  <el-table
                    :data="bizFormData"
                    :data="dialogLifeTable"
                    :show-header="false"
                    style="width: 100%">
                    <el-table-column
                      align="center"
                      prop="name">
                      prop="id">
                    </el-table-column>
                    <el-table-column
                      fixed="right"
@@ -245,7 +250,7 @@
                          size="small"
                          style="color:#F56C6C;"
                          type="text"
                          @click.native.prevent="bizTypeDeleteRow('form',scope.$index)">
                          @click.native.prevent="dialogDeleteLifeTable(scope.$index)">
                          移除
                        </el-button>
                      </template>
@@ -253,7 +258,7 @@
                  </el-table>
                </div>
                <el-button plain size="mini" style="margin-left: 5px" type="success"
                           @click="FormItemReferChange('form')">添加
                           @click="lifeAddHandler('table')">添加
                </el-button>

              </div>
@@ -276,6 +281,8 @@
         <el-button type="primary" @click="addDialogSavaHandler">确 定</el-button>
        </span>
    </el-dialog>

    <!-- 属性池添加 -->
    <el-dialog
      v-dialogDrag
      :visible.sync="attrPollDialogVisible"
@@ -306,6 +313,61 @@
        </span>
    </el-dialog>

    <el-dialog
      v-dialogDrag
      :visible.sync="dialogVersionVisible"
      append-to-body="true"
      class="avue-dialog"
      title="版本号规则"
      width="60%"
    >

      <avue-crud
        :key="dialogVersionKey"
        ref="dialogAttrCrud"
        :data="dialogVersionData"
        :option="dialogVersionOption"
        :table-loading="dialogVersionLoading"
        @row-click="dialogVersionRowClick"
        @search-change="versionHandleSearch"
        @search-reset="versionHandleReset"
      >
      </avue-crud>

      <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVersionVisible = false">取 消</el-button>
         <el-button type="primary" @click="dialogVersionAddClickHandler">确 定</el-button>
        </span>

    </el-dialog>

    <!-- 生命周期 -->
    <el-dialog
      v-dialogDrag
      :visible.sync="dialogLfeVisible"
      append-to-body="true"
      class="avue-dialog"
      title="生命周期模板"
      width="60%"
    >
      <avue-crud
        :key="dialogLifeKey"
        ref="dialogAttrCrud"
        :data="dialogLifeData"
        :option="dialogLifeOption"
        :table-loading="dialogLifeLoading"
        @row-click="dialogLifeRowClick"
        @search-change="lifeHandleSearch"
        @search-reset="lifeHandleReset"
      >
      </avue-crud>
      <span slot="footer" class="dialog-footer">
         <el-button @click="dialogLfeVisible = false">取 消</el-button>
         <el-button type="primary" @click="dialogLifeAddClickHandler">确 定</el-button>
        </span>

    </el-dialog>

  </el-container>
</template>

@@ -314,11 +376,65 @@
import {getBizTypes} from "@/api/modeling/businessType/api"
import {gridAttribute} from "@/api/modeling/attributePool/api";
import func from "@/util/func";
import {getVersionRuleAllList} from "@/api/modeling/version/api";
import {gridLifeCycle} from "@/api/modeling/lifeCycle/api";

export default {
  name: "index",
  data() {
    return {
      dialogLifeDefalutData:[], // 查询重置默认数据
      lifeType:'',
      dialogLifeTable:[],
      dialogLifeSaveRow:{},
      dialogLifeKey:Math.random(),
      dialogLifeData:[],
      dialogLifeOption:{
        ...basicOption,
        addBtn:false,
        selection:false,
        refreshBtn:false,
        menu:false,
        height:450,
        searchMenuSpan: 8,
        highlightCurrentRow:true,
        column:[
          {
            label:'生命周期模板名',
            prop:'id',
            searchLabelWidth:120,
            search:true
          }
        ]
      },
      dialogLifeLoading:false,
      dialogLfeVisible:false,
      dialogVersionDefalutData:[], // 查询重置默认数据
      dialogSwitchValue:false,
      dialogVersionSaveRow:{},
      dialogVersionVisible:false,
      dialogVersionKey:Math.random(),
      dialogVersionData:[],
      dialogVersionOption:{
        ...basicOption,
        addBtn:false,
        selection:false,
        refreshBtn:false,
        menu:false,
        height:450,
        searchMenuSpan: 8,
        highlightCurrentRow:true,
        // calcHeight: 100,
        column:[
          {
            label:'版本号规则',
            prop:'id',
            searchLabelWidth:110,
            search:true
          }
        ]
      },
      dialogVersionLoading:false,
      dialogAttrSelectList: [],
      searchAttrParams: {},
      dialogAttrLoading: false,
@@ -331,7 +447,6 @@
      },
      dialogAttrSaveOption: {
        ...basicOption,
        calcHeight: -60,
        addBtn: false,
        menu: false,
        refreshBtn: false,
@@ -438,7 +553,19 @@
          }
        ]
      },
      form: {},
      form: {
        id:'', // 类型名称
        name:'', // 标签
        fName:'', // 继承自
        implClass:'', // 实现类
        description:'', // 描述
        revLevel:'', // 版本规则
        revisionRuleId:'',// 版本号规则
        inputRevisionFlag:'', // 手工输入
        versionRule:'', // 版次号规则
        lifeCycleId:'', // 生命周期
        subLifeCycleId:'', // 生命周期备选列表
      },
      nodeRow: {},
      treeOption: {
        height: 'auto',
@@ -603,8 +730,139 @@

    // 版本规则管理添加
    versionAddHandler(){
      this.dialogVersionVisible = true;
      this.dialogVersionKey = Math.random(); // 打开时刷新表格避免表格错行
      this.dialogVersionLoading = true;
      getVersionRuleAllList().then(res => {
        const data = res.data.data.map(item => {
          return {
            id:item.id
          }
        });
        this.dialogVersionData = data;
        this.dialogVersionDefalutData = data;
        this.dialogVersionLoading = false;
      }).catch(err => {
        this.$message.error(err)
      });
    },

    // 版本规则行点击
    dialogVersionRowClick(row){
      this.dialogVersionSaveRow = row;
    },

    // 版本规则搜索
    versionHandleSearch(params,done){
      const {id} = params;

      if (!params.id) {
        this.dialogVersionData = this.dialogVersionDefalutData;
        return done();
      }
      ;

      this.dialogVersionData = this.dialogVersionDefalutData.filter(item => {
        return item.id && item.id.includes(id);
      });

      done();

    },

    // 版本管理置空
    versionHandleReset(){
      this.dialogVersionData = this.dialogVersionDefalutData;
    },

    // 版本规则保存
    dialogVersionAddClickHandler(){
      if(func.isEmptyObject(this.dialogVersionSaveRow)){
        this.$message.error('请至少选择一条数据');
        return;
      }
      this.form.revRuleName = this.dialogVersionSaveRow.id;
      this.dialogVersionVisible = false;
    },

    // 生命周期新增
    lifeAddHandler(val){
      this.dialogLfeVisible = true;
      this.dialogLifeKey = Math.random(); // 打开时刷新表格避免表格错行
      this.dialogLifeLoading = true;
      this.lifeType = val;
      gridLifeCycle().then(res => {
        const data = res.data.data.map(item => {
          return {
            id:item.id
          }
        });
        this.dialogLifeData = data;
        this.dialogLifeDefalutData = data;
        this.dialogLifeLoading = false
      }).catch(err => {
        this.$message.error(err)
      });
    },

    // 生命周期行点击
    dialogLifeRowClick(row){
      this.dialogLifeSaveRow = row;
    },

    // 生命周期保存
    dialogLifeAddClickHandler(){
      if(func.isEmptyObject(this.dialogLifeSaveRow)){
        this.$message.error('请至少选择一条数据');
        return;
      }
      if(this.lifeType === 'input'){
        this.form.lifeCycle = this.dialogLifeSaveRow.id;
      }else {
        const flag = this.dialogLifeTable.some(item => item.id === this.dialogLifeSaveRow.id);

        if (flag) {
          this.$message.error('已存在相同的数据，请添加其他数据');
          return;
        }
        this.dialogLifeTable.push(this.dialogLifeSaveRow);
      }
      this.dialogLfeVisible = false;
    },

    // 生命周期备选列表移除
    dialogDeleteLifeTable(index){
      this.dialogLifeTable.splice(index,1)
    },

    // 生命周期搜索
    lifeHandleSearch(params,done){
      const {id} = params;

      if (!params.id) {
        this.dialogLifeData = this.dialogLifeDefalutData;
        return done();
      }
      ;

      this.dialogLifeData = this.dialogLifeDefalutData.filter(item => {
        return item.id && item.id.includes(id);
      });

      done();

    },

    // 生命周期重置
    lifeHandleReset(){
      this.dialogLifeData = this.dialogLifeDefalutData;
    },

    // 新增编辑保存
    addDialogSavaHandler(){
      console.log(this.form)
    }

  }
}
</script>

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

@@ -243,6 +243,7 @@
      dialogData: [],
      dialogOption: {
        ...basicOption,
        calcHeight:50,
        refreshBtn: false,
        selection: false,
        column: [

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

@@ -445,6 +445,7 @@
        highlightCurrentRow: true,
        searchMenuSpan: 8,
        searchLabelWidth: 100,
        calcHeight:30,
        column: [
          {
            label: '业务类型名',
@@ -575,7 +576,7 @@
        editBtn: false,
        refreshBtn: false,
        selection: false,
        height: 300,
        height: 200,
        addBtn: false,
        // index:false,
        column: [

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

@@ -441,7 +441,7 @@
      }
      ;

      this.checkViewData = this.checkViewData.filter(item => {
      this.checkViewData = this.checkViewDataSearch.filter(item => {
        return item.source && item.source.includes(source);
      });


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

@@ -115,6 +115,7 @@
        refreshBtn: false,
        addBtn: false,
        menu: false,
        calcHeight:80,
        column: [
          {
            label: '部门',