Merge remote-tracking branch 'origin/master'

 Source/plt-web/plt-web-ui/src/api/UI/uiDefine.js

@@ -257,6 +257,15 @@
  });
}

// ä¿®æ”¹æŽ¥å£
export function updatePageDefination(params) {
  return request({
    url: "/api/uiManagerController/updatePageDefination",
    method: "put",
    data: params
  });
}


// å…‹éš†æ ‘查询接口
export function getAllLevelTreeByBtm(params) {

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

@@ -1,6 +1,6 @@
<template>
  <!--动态模板-->
  <avue-form ref="form" :option="option" v-model="form">
  <avue-form ref="form" :option="option" v-model="form" v-loading="loading">
    <template v-for="item in allColumn" :slot="item.prop+ ''">
      <vciWebRefer
        v-if="item.type === 'refer'"
@@ -83,6 +83,7 @@
  },
  data() {
    return {
      loading:false,
      form: this.formData,
      option: {
        menuBtn:false,

 Source/plt-web/plt-web-ui/src/components/actions/base/AddEditDialog.vue

@@ -1,44 +1,45 @@
<template>
  <el-dialog v-dialogDrag
             :append-to-body="true"
             :close-on-click-modal="false"
             :destroy-on-close="true"
             :fullscreen="fullscreen"
             :title="title"
             :visible.sync="visible"
             :width="width"
             :fullscreen="fullscreen"
             :append-to-body="true"
             top="0"
             class="avue-dialog"
             :destroy-on-close="true"
             :close-on-click-modal="false"
             top="0"
             @close="dialogClose">
    <basic-form ref="formRef" v-if="paramVOS.form"
                :key="'dialog-'+paramVOS.form"
    <basic-form v-if="paramVOS.form" :key="'dialog-'+paramVOS.form"
                ref="formRef"
                v-loading="loading"
                :formData="form"
                :formItems="formItems"
                :initValue="paramVOS.initvalue"
                :isEdit="true"
                :span="span"
                :style="fullscreen?'':'height:'+height"
                :isEdit="true"
                :formItems="formItems"
                :formData="form"
                :initValue="paramVOS.initvalue"
                :uploadattachment="paramVOS.uploadattachment || false"
                @getFormData="getFormData">
    </basic-form>
    <ui-view ref="uiViewRef" v-else-if="paramVOS.context"
             :key="'AddEditDialog-'+type"
             :style="fullscreen?'':'height:'+height"
             :btmType="paramVOS.type"
             :context="paramVOS.context"
             :inDialog="true"
             :canEdit="true"
    <ui-view v-else-if="paramVOS.context" :key="'AddEditDialog-'+type"
             ref="uiViewRef"
             :actionType="type"
             :sourceData="sourceData"
             :btmType="paramVOS.type"
             :canEdit="true"
             :context="paramVOS.context"
             :dataStore="dataStore"
             :inDialog="true"
             :paramVOS="paramVOS"
             :sourceData="sourceData"
             :style="fullscreen?'':'height:'+height"
             @getFormData="getFormData"
    ></ui-view>
    <div v-if="showSave" class="dialog-footer avue-dialog__footer">
      <el-button type="primary" plain size="small" @click="formSave" v-if="paramVOS.form">保 å­˜</el-button>
      <el-button type="primary" plain size="small" @click="contextSave" v-else>保 å­˜</el-button>
      <el-button v-if="paramVOS.form" plain size="small" type="primary" @click="formSave">保 å­˜</el-button>
      <el-button v-else plain size="small" type="primary" @click="contextSave">保 å­˜</el-button>
      <el-button size="small" @click="dialogClose">取 æ¶ˆ</el-button>
      <el-button size="small" @click="resetValue" v-if="paramVOS.form">重 ç½®</el-button>
      <el-button v-if="paramVOS.form" size="small" @click="resetValue">重 ç½®</el-button>
    </div>
  </el-dialog>
</template>
@@ -46,13 +47,13 @@
<script>
import uiView from "@/views/base/UIContentViewerInDialog"
import {parseEventByUrl} from "@/components/actions/BaseAction"
import {getFormDefineById,dataForm} from "@/api/base/ui";
import {addSave,editSave} from "@/api/base/actions"
import {getFormDefineById, dataForm} from "@/api/base/ui";
import {addSave, editSave} from "@/api/base/actions"
import {validatenull} from "@/util/validate"

export default {
  name: "AddEditDialog",
  components:{uiView},
  components: {uiView},
  props: {
    sourceData: {
      //所属区域的上一区域选中数据
@@ -69,22 +70,23 @@
      default: {}
    }
  },
  data(){
  data() {
    return {
      type:"add",
      visible:false,
      showSave:this.paramVOS.customBtn || true,
      span:12,
      formItems:[],
      form:{},
      btmDefaultKeys : ['oid', 'id', 'name', 'description', 'revisionoid', 'nameoid', 'btmname', 'lastr', 'firstr', 'lastv', 'firstv', 'creator', 'createtime', 'lastModifier', 'lastmodifytime', 'revisionrule', 'revisionseq', 'revisionvalue', 'versionrule', 'versionseq', 'versionvalue', 'lcstatus', 'ts', 'owner', 'checkinby', 'checkintime', 'checkoutby', 'checkouttime', 'copyfromversion', 'secretgrade'],
      linkDefaultKeys :['oid','creator','createtime','lastmodifier','lastmodifytime','f_oid','foid','f_revisionoid','frevisionoid','f_nameoid','fnameoid','f_btmname','fbtmname','t_oid','toid','t_revisionoid','trevisionoid','t_nameoid','tnameoid','t_btmname','tbtmname','ts']
      loading: false,
      type: "add",
      visible: false,
      showSave: this.paramVOS.customBtn || true,
      span: 12,
      formItems: [],
      form: {},
      btmDefaultKeys: ['oid', 'id', 'name', 'description', 'revisionoid', 'nameoid', 'btmname', 'lastr', 'firstr', 'lastv', 'firstv', 'creator', 'createtime', 'lastModifier', 'lastmodifytime', 'revisionrule', 'revisionseq', 'revisionvalue', 'versionrule', 'versionseq', 'versionvalue', 'lcstatus', 'ts', 'owner', 'checkinby', 'checkintime', 'checkoutby', 'checkouttime', 'copyfromversion', 'secretgrade'],
      linkDefaultKeys: ['oid', 'creator', 'createtime', 'lastmodifier', 'lastmodifytime', 'f_oid', 'foid', 'f_revisionoid', 'frevisionoid', 'f_nameoid', 'fnameoid', 'f_btmname', 'fbtmname', 't_oid', 'toid', 't_revisionoid', 'trevisionoid', 't_nameoid', 'tnameoid', 't_btmname', 'tbtmname', 'ts']

    }
  },
  computed:{
    title(){
      return this.paramVOS.title || (this.type=='add'?'添加':'修改')
  computed: {
    title() {
      return this.paramVOS.title || (this.type == 'add' ? '添加' : '修改')
    },
    width() {
      if (!validatenull(this.paramVOS.width)) {
@@ -97,7 +99,7 @@
        return "60%";
      }
    },
    height(){
    height() {
      if (!validatenull(this.paramVOS.height)) {
        if (this.paramVOS.height.includes("px") || this.paramVOS.height.includes("%")) {
          return this.paramVOS.height;
@@ -108,10 +110,10 @@
        return "auto"
      }
    },
    fullscreen(){
      if(this.paramVOS.width || this.paramVOS.height){
    fullscreen() {
      if (this.paramVOS.width || this.paramVOS.height) {
        return false;
      }else if(this.paramVOS.form){
      } else if (this.paramVOS.form) {
        return false;
      }
      return true;
@@ -137,13 +139,13 @@
    onLoad: function () {
      if (Object.keys(this.sourceData).length > 0) {
        this.loading = true;
        getFormDefineById(this.paramVOS.type,this.paramVOS.form).then(result => {
          this.formItems=result.data.obj.items;
          this.span=result.data.obj.columnOneRow?(24/result.data.obj.columnOneRow) : 12;
        getFormDefineById(this.paramVOS.type, this.paramVOS.form).then(result => {
          this.formItems = result.data.obj.items;
          this.span = result.data.obj.columnOneRow ? (24 / result.data.obj.columnOneRow) : 12;
          if (this.paramVOS.initvalue) {
            this.form=this.paramVOS.initvalue;
            this.form = this.paramVOS.initvalue;
          }
          if(this.type=="edit") {
          if (this.type == "edit") {
            //加载表单数据
            let sourceDataMap = {};
            for (let i in this.sourceData) {
@@ -156,13 +158,14 @@
              formDefineId: this.paramVOS.form,
              oid: this.dataStore[0].oid
            }, sourceDataMap), this.paramVOS.getdataurl, this.paramVOS.getdatamethod).then(res => {
              this.form=res.data.obj;
              this.form = res.data.obj.data;
              this.loading = false;
            }).catch(error => {
              this.$message.error(error);
              this.loading = false;
            })
          }
          this.loading = false;
        }).catch(error => {
          this.$message.error(error);
          this.loading = false;
@@ -170,27 +173,27 @@

      }
    },
    contextSave(){
      const useDataType=this.paramVOS["useDataType"] || "form";//使用ui上下文中的哪个类型数据，默认form。值：form、tree、table、TreeTable
      for(let key in this.$refs.uiViewRef.data){
        if(this.$refs.uiViewRef.data[key].type== useDataType){
          this.form=this.$refs.uiViewRef.data[key].data;
          this.formDefineId=this.$refs.uiViewRef.data[key].DefineVO.id;
    contextSave() {
      const useDataType = this.paramVOS["useDataType"] || "form";//使用ui上下文中的哪个类型数据，默认form。值：form、tree、table、TreeTable
      for (let key in this.$refs.uiViewRef.data) {
        if (this.$refs.uiViewRef.data[key].type == useDataType) {
          this.form = this.$refs.uiViewRef.data[key].data;
          this.formDefineId = this.$refs.uiViewRef.data[key].DefineVO.id;
          if (this.paramVOS.savebeforeevent) {
            var urlobj = parseEventByUrl(this.paramVOS.savebeforeevent,null,null,'doAction');
            if(urlobj.params){
              Object.assign(this.paramVOS,urlobj.params);
            var urlobj = parseEventByUrl(this.paramVOS.savebeforeevent, null, null, 'doAction');
            if (urlobj.params) {
              Object.assign(this.paramVOS, urlobj.params);
            }
            if(validatenull(urlobj.jsPath)){
            if (validatenull(urlobj.jsPath)) {
              this.saveBforeHandle(this.paramVOS);
            }else{
            } else {
              try {
                import(`./${urlobj.jsPath}.js`).then(module => {
                  module[urlobj.methodName]({
                    paramVOS: this.paramVOS,
                    dataStore: this.dataStore,
                    sourceData:this.sourceData
                  },this.formSaveHandle);
                    sourceData: this.sourceData
                  }, this.formSaveHandle);
                })
              } catch (error) {
                this.$message.error('未找到保存前置事件执行js');
@@ -204,18 +207,18 @@
      }
    },
    formSave() {
      let that=this;
      let that = this;
      this.$refs.formRef.validate((valid, done) => {
        if (valid) {
          this.formDefineId=this.paramVOS.form;
          this.formDefineId = this.paramVOS.form;
          if (this.paramVOS.savebeforeevent) {
            var urlobj = parseEventByUrl(this.paramVOS.savebeforeevent,null,null,'doAction');
            if(urlobj.params){
              Object.assign(this.paramVOS,urlobj.params);
            var urlobj = parseEventByUrl(this.paramVOS.savebeforeevent, null, null, 'doAction');
            if (urlobj.params) {
              Object.assign(this.paramVOS, urlobj.params);
            }
            if(validatenull(urlobj.jsPath)){
            if (validatenull(urlobj.jsPath)) {
              this.saveBforeHandle(this.paramVOS);
            }else{
            } else {
              try {
                import(`./${urlobj.jsPath}.js`).then(module => {
                  module[urlobj.methodName]({
@@ -236,11 +239,11 @@
        }
      });
    },
    formSaveHandle(){
      let that=this;
    formSaveHandle() {
      let that = this;
      let formValues = this.getValues();
      if(formValues.otherValue.releaseFileOids){
        formValues.otherValue.releaseFileOids=formValues.otherValue.releaseFileOids.split(',');
      if (formValues.otherValue.releaseFileOids) {
        formValues.otherValue.releaseFileOids = formValues.otherValue.releaseFileOids.split(',');
      }
      if (!formValues.defaultValues.btmname) {
        formValues.defaultValues.btmname = this.paramVOS.type;
@@ -251,33 +254,33 @@
        afterEvent: this.paramVOS.afterevent,
        beforeServerEvent: this.paramVOS.beforeserverevent,
        afterServerEvent: this.paramVOS.afterserverevent,
        releaseFileOids: formValues.otherValue.releaseFileOids||[],
        releaseFileOids: formValues.otherValue.releaseFileOids || [],
        data: formValues.otherValue
      }
      Object.assign(datas, formValues.defaultValues);
      if(that.type=="add"){
        addSave(datas,that.paramVOS.url,that.paramVOS.method).then(() => {
      if (that.type == "add") {
        addSave(datas, that.paramVOS.url, that.paramVOS.method).then(() => {
          that.$message({
            type: "success",
            message: that.paramVOS.successmsg||"保存成功!"
            message: that.paramVOS.successmsg || "保存成功!"
          });
          if(that.saveCallback){
            that.saveCallback(that.type,that.form);
          if (that.saveCallback) {
            that.saveCallback(that.type, that.form);
          }
          if (this.paramVOS.saveafterevent) {
            let urlobj = parseEventByUrl(this.paramVOS.saveafterevent,null,null,'doAction');
            if(urlobj.params){
              Object.assign(this.paramVOS,urlobj.params);
            let urlobj = parseEventByUrl(this.paramVOS.saveafterevent, null, null, 'doAction');
            if (urlobj.params) {
              Object.assign(this.paramVOS, urlobj.params);
            }
            if(validatenull(urlobj.jsPath)){
            if (validatenull(urlobj.jsPath)) {
              this.saveAfterHandle(this.paramVOS);
            }else{
            } else {
              try {
                import(`./${urlobj.jsPath}.js`).then(module => {
                  module[urlobj.methodName]({
                    paramVOS: this.paramVOS,
                    dataStore: this.dataStore,
                    sourceData:this.sourceData
                    sourceData: this.sourceData
                  });
                })
              } catch (error) {
@@ -287,29 +290,29 @@
          }
          that.dialogClose();
        });
      }else{
        editSave(datas,that.paramVOS.url,that.paramVOS.method).then(() => {
      } else {
        editSave(datas, that.paramVOS.url, that.paramVOS.method).then(() => {
          that.$message({
            type: "success",
            message: that.paramVOS.successmsg||"修改成功!"
            message: that.paramVOS.successmsg || "修改成功!"
          });
          if(that.saveCallback){
            that.saveCallback(that.type,that.form);
          if (that.saveCallback) {
            that.saveCallback(that.type, that.form);
          }
          if (this.paramVOS.saveafterevent) {
            let urlobj = parseEventByUrl(this.paramVOS.saveafterevent,null,null,'doAction');
            if(urlobj.params){
              Object.assign(this.paramVOS,urlobj.params);
            let urlobj = parseEventByUrl(this.paramVOS.saveafterevent, null, null, 'doAction');
            if (urlobj.params) {
              Object.assign(this.paramVOS, urlobj.params);
            }
            if(validatenull(urlobj.jsPath)){
            if (validatenull(urlobj.jsPath)) {
              this.saveAfterHandle(this.paramVOS);
            }else{
            } else {
              try {
                import(`./${urlobj.jsPath}.js`).then(module => {
                  module[urlobj.methodName]({
                    paramVOS: this.paramVOS,
                    dataStore: this.dataStore,
                    sourceData:this.sourceData
                    sourceData: this.sourceData
                  });
                })
              } catch (error) {
@@ -321,7 +324,7 @@
        });
      }
    },
    getValues(){
    getValues() {
      let defaultValues = {}, otherValue = {};
      for (var key in this.form) {
        if (this.btmDefaultKeys.indexOf(key.toLowerCase()) > -1) {
@@ -331,8 +334,8 @@
        }
      }
      return {
        defaultValues:defaultValues,
        otherValue:otherValue
        defaultValues: defaultValues,
        otherValue: otherValue
      }
    },
    resetValue() {
@@ -344,11 +347,11 @@
      this.form = form;
    },
    //保存前置事件
    saveBforeHandle(params){
    saveBforeHandle(params) {
      this.$message.info('执行保存前置事件');
    },
    //保存后置事件
    saveAfterHandle(params){
    saveAfterHandle(params) {
      this.$message.info('保存后置事件执行');
    },
  }

 Source/plt-web/plt-web-ui/src/components/actions/base/DeleteAction.js

@@ -9,7 +9,7 @@
export const doAction = (options,callback) => {
  options.paramVOS = paramLow(options.paramVOS)
  const paramVOS = Object.assign({
    url: 'uiDataController/deleteData',
    url: 'api/uiDataController/deleteData',
    method: 'delete'
  }, options.paramVOS)
  options.paramVOS = paramVOS;

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

@@ -230,7 +230,7 @@
        if(newval) {
          this.sourceDataMapParams=this.sourceDataMap();
          this.getParams();
          this.handleRefresh();
          // this.handleRefresh();
        }
      },
      deep: true,
@@ -327,6 +327,7 @@
    },
    onLoad(page, params = {}) {
      if (Object.keys(this.sourceData).length>0 && this.isShow) {
        this.tableList = [];
        this.loading = true;
        getList(page.currentPage, page.pageSize, Object.assign({},this.params,this.query,params)).then(res => {
          let data = [];
@@ -400,6 +401,7 @@
      this.onLoad(this.page,parms);
    },
    searchReset() {
      console.log('searchReset')
      this.query = {};
      this.onLoad(this.page);
    },
@@ -412,6 +414,7 @@
      }
    },
    handleRefresh(type) {
      console.log('handleRefresh')
      this.onLoad(this.page);
    },
    rowExcel() {

 Source/plt-web/plt-web-ui/src/router/avue-router.js

@@ -57,6 +57,7 @@
    },
    //处理路由
    getPath: function (params) {
      console.log('params',params)
      let {src} = params;
      let result = src || '/';
      if (isURL(src)) {

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

@@ -41,52 +41,82 @@

  </el-container>
</template>

<script>
export default {
  name: "index"
}
  data() {
    return {
      form: {},
      data: [
        {
          name: "张三",
          sex: "男",
          showType:'Ludc'
        },
      ],
      option: {
        column: [
          {
            label: "姓名",
            prop: "name",
          },
          {
            label: "性别",
            prop: "sex",
            type: "select",
            dicData: [
              {
                label: "男",
                value: 0,
              },
              {
                label: "女",
                value: 1,
              },
            ],
          },
          {
            label: '源对象',
            prop: 'showType',
            type: 'select',
            cascader: ['linkType', 'templateId', 'SubUILayout', 'searchObjType', 'queryTemplateName'],
            placeholder: "请输入内容",
            dicUrl: '/api/uiManagerController/getBtmDatasByPage?page=1&limit=-1',
            filterable: true,
            props: {
              label: 'name',
              value: 'name',
              desc: 'label'
            },
            rules: [
              {
                required: true,
                message: '请选择内容',
                trigger: 'change'
              }
            ],
          },
        ],
      },
    };
  },
  methods: {
    beforeOpen(done, type) {
      this.$alert(`我是${type}`, {
        confirmButtonText: "确定",
        callback: (action) => {
          if (["view", "edit"].includes(type)) {
            // æŸ¥çœ‹å’Œç¼–辑逻辑
            this.form.showType = 'Ludc';
          } else {
            //新增逻辑
            this.form.name = "初始化赋值";
            this.form.sex = 0;
            this.form.showType = 'Ludc';
          }
          done();
        },
      });
    },
  },
};
</script>

<style lang="scss" scoped>
::v-deep {
  .el-scrollbar__wrap {
    overflow: auto !important;
  }
  .headerCon{
    .el-button{
      width: 82px;
    }
  }
}

.headerCon {
  display: flex;
  flex-wrap: wrap;
  margin-bottom: 5px;

  .el-button + .el-button {
    margin-left: 5px;
  }

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

.headerCon > .el-button:nth-child(4) {
  margin-left: 0;
}

.headerCon > .el-button:nth-child(7) {
  margin-left: 0;
}


.smallBtn {
  width: 82px;
  text-align: center;
  padding-left: 4.5px;
}

</style>

 Source/plt-web/plt-web-ui/src/views/base/UIContentViewer.vue

@@ -117,7 +117,7 @@
    }
  },
  created() {
    console.log(this.$route);
    console.log('route',this.$route);
    if (verifyNull(this.$route.query.type) || (verifyNull(this.$route.query.context) && verifyNull(this.$route.query.content))) {
      this.$message.error("配置的信息错误，请参考“?type=xxx&context=yyy&param=zzz”这种形式。其中type是业务类型（或链接类型），context是UI上下文的名称");
      return false;

 Source/plt-web/plt-web-ui/src/views/custom-ui/product.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
<template>
  <p>产品自定义页面</p>
</template>

<script>
export default {
  name: "product"
}
</script>

<style scoped>

</style>

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

@@ -390,9 +390,10 @@

    // å³ä¾§è¡¨æ ¼ä¿¡æ¯
    getRightTableList(row) {
      console.log(row);
      this.tableLoading = true;
      const params = {
        plactioncls: row.id
        plactioncls: row.id ? row.id : ''
      }
      getActionTableData(params).then(res => {
        const data = res.data.data;
@@ -433,7 +434,7 @@
      }
      this.tableLoading = true;
      const apiParams = {
        plactioncls: this.treeNodeRow.id === 'root' ? '' : this.treeNodeRow.id,
        plactioncls: this.treeNodeRow.id === 'root' ? '' : this.treeNodeRow.id ? this.treeNodeRow.id : '',
        ...params
      }


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

@@ -140,6 +140,7 @@
          <basic-container>
            <div style="height: 660px; overflow-y: auto;padding-right: 10px">
              <h3>设置</h3>
              <h4 style="color: red">属性设置信息后需单击右下角应用按钮进行应用</h4>
              <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="85px">
                <el-row style="border-bottom: 1px solid #878585;padding-bottom: 10px">
                  <el-col :span="24">
@@ -1305,7 +1306,7 @@
        viType: 1, // è§†å›¾ç±»åž‹
        viTypeText: "表单", // è§†å›¾ä¸­æ–‡åç§°
        prm: {
          formQtName: '', // æŸ¥è¯¢æ¨¡æ¿åç§°
          formQtName: this.form.qtName, // æŸ¥è¯¢æ¨¡æ¿åç§°
          showCols: this.topForm.showColumn,
          prmItemList: this.formList
        },
@@ -1315,6 +1316,7 @@
          this.$message.success(res.data.obj);
          this.visible = false;
          this.closeDialog();
          this.$emit('updataTable');
        }
      })
      // this.visible = false;

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

@@ -304,11 +304,11 @@
          message: '请选择绑定表单',
          trigger: 'change'
        }],
        showLabel: [{
          required: true,
          message: '请选择显示字段',
          trigger: 'submit'
        }],
        // showLabel: [{
        //   required: true,
        //   message: '请选择显示字段',
        //   trigger: 'submit'
        // }],
      },
      form: {
        viName: '', // åç§°
@@ -525,6 +525,10 @@
    dialogSaveClickHandler() {
      this.$refs.form.validate((valid) => {
        if (valid) {
          if(this.form.itemOutFieldList.length <= 0){
            this.$message.error('请选择显示字段');
            return;
          }
          const paramsForm = {...this.form};
          paramsForm.itemSelectOutFieldList = this.form.itemSelectOutFieldList.map(item => item.id); // å¯ä½¿ç”¨å­—段
          paramsForm.itemOutFieldList = this.form.itemOutFieldList; // éœ€è¦ä½¿ç”¨å­—段

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

@@ -66,7 +66,7 @@
        </avue-crud>
      </basic-container>
    </el-main>
    <form-dialog ref="formDialog" :TreeNodeRow="this.nodeRow" :editRow="editRow" :treeRadio="treeRadio"></form-dialog>
    <form-dialog ref="formDialog" :TreeNodeRow="this.nodeRow" :editRow="editRow" :treeRadio="treeRadio"  @updataTable="getRightPortalVIDatas"></form-dialog>
    <table-dialog ref="tableDialog" :TreeNodeRow="this.nodeRow" :treeRadio="treeRadio"
                  @updataTable="getRightPortalVIDatas"></table-dialog>
    <!-- å¯¼å…¥ -->

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

@@ -217,7 +217,8 @@
  deleteTabButton,
  delPageDefination,
  joinBtn,
  exitBtn
  exitBtn,
  updatePageDefination
} from "@/api/UI/uiDefine";
import actionDialog from '@/views/modelingMenu/ui/Aciton/components/dialog';
import cloneDialog from "@/views/modelingMenu/ui/uiDefine/rightRegion/cloneDialog";
@@ -587,9 +588,8 @@
                filterable: true,
                display: false,
                props: {
                  label: 'qtName',
                  value: 'qtName',
                  desc: 'btmName'
                  label: 'plName',
                  value: 'plCode',
                },
                dicUrl: '/api/uiManagerController/getUILayoutDatasByPage?page=1&limit=-1&conditionMap[selectBtmType]={{key}}',
              },
@@ -871,6 +871,28 @@
      })
    },

    rowUpdateHandler(row,index,done,loading){
      if (row.templateType === '6') {
        row.SubUIObjType = row.showType;
        row.showType = "";
      }
      console.log(this.sourceData);
      const params = {
        ...row,
        tabPageOId: this.sourceData.plOId
      }
      updatePageDefination(params).then(res => {
        console.log(res);
        if (res.data.code === 200) {
          this.$message.success(res.data.obj);
          this.getTableList();
          done();
        }
      }).catch(err => {
        loading();
      })
    },

    // å¯¹è¯æ¡†è¡¨æ ¼è¡Œç‚¹å‡»
    formDataRowClick(row) {
      this.formDataRow = row;

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

@@ -17,8 +17,8 @@

    <el-main>
      <basic-container>
        <div v-if="form.childType && form.childType !== 0 && !addStatus && !editStatus" class="btnBox">
          <el-button :disabled="mangeShowBtn ? false : !childTypeBtn" icon="el-icon-plus" plain
        <div v-if="(form.childType || form.childType === 0) && !addStatus && !editStatus && form.category !== 1" class="btnBox">
          <el-button :disabled="(mangeShowBtn || form.childType === 0) ? false : !childTypeBtn" icon="el-icon-plus" plain
                     size="small"
                     type="primary" @click="addClickHandler">增加
          </el-button>
@@ -32,11 +32,11 @@
                     size="small"
                     type="primary" @click="addMethodsClickHandler">增加操作类型
          </el-button>
          <el-button v-if="this.form.childType ? mangeShowBtn :true" icon="el-icon-circle-close" plain size="small"
          <el-button v-if=" mangeShowBtn" icon="el-icon-circle-close" plain size="small"
                     type="danger"
                     @click="addClickHandler">删除非系统模块
          </el-button>
          <el-button v-if="this.form.childType ? mangeShowBtn :true" icon="el-icon-circle-close" plain size="small"
          <el-button v-if="mangeShowBtn " icon="el-icon-circle-close" plain size="small"
                     type="danger"
                     @click="addClickHandler">删除业务模块
          </el-button>
@@ -49,7 +49,7 @@
          <el-button icon="el-icon-upload2" plain size="small" type="primary" @click="sqlClickExportClick">导出sql
          </el-button>
        </div>
        <div v-else-if="form.childType && form.childType !== 0 &&(addStatus || editStatus)" class="btnBox">
        <div v-else-if="(form.childType || form.childType === 0) && (addStatus || editStatus)" class="btnBox">
          <el-button v-if="addStatus" icon="el-icon-check" plain size="small"
                     type="success" @click="addSaveClickHandler">保存
          </el-button>
@@ -60,14 +60,14 @@
                      type="danger" @click="addStatus=false;editStatus=false;">取消
          </el-button>
        </div>
        <div v-if="form.childType === 0" class="btnBox">
        <div v-if="form.category === 1" class="btnBox">
          <el-button icon="el-icon-edit" plain size="small" type="primary" @click="updataAliasClickHandler">修改别名
          </el-button>
          <el-button icon="el-icon-close" plain size="small" type="danger" @click="deleteOperationClickHandler">删除
          </el-button>
        </div>
        <el-form ref="form" :model="form" label-width="85px" style="max-height: calc(100vh - 200px);overflow: auto;">
          <span v-if="form.childType !== 0">
          <span v-if="form.category !== 1">
            <el-form-item label="模块名：">
            <el-input v-model="form.name" :disabled="!editStatus && !addStatus" placeholder="请输入模块名"></el-input>
          </el-form-item>
@@ -106,21 +106,21 @@
            <el-link :underline="false" style="margin-left: 20px" type="danger">不生效（不选择）时，该模块在功能模块授权里不显示</el-link>
          </el-form-item>
          </span>
          <span v-if="form.childType === 0">
          <span v-if="form.category === 1">
            <el-form-item label="名称：">
            <el-input v-model="form.name" :disabled="form.childType === 0" placeholder="请输入名称"></el-input>
            <el-input v-model="form.name" :disabled="form.category === 1" placeholder="请输入名称"></el-input>
            </el-form-item>
            <el-form-item label="标识：">
            <el-input v-model="form.code" :disabled="form.childType === 0" placeholder="请输入标识"></el-input>
            <el-input v-model="form.code" :disabled="form.category === 1" placeholder="请输入标识"></el-input>
            </el-form-item>
            <el-form-item label="别名：">
            <el-input v-model="form.alias" placeholder="请输入别名"></el-input>
            </el-form-item>
            <el-form-item label="编号：">
            <el-input v-model="form.sort" :disabled="form.childType === 0" placeholder="请输入编号"></el-input>
            <el-input v-model="form.sort" :disabled="form.category === 1" placeholder="请输入编号"></el-input>
            </el-form-item>
            <el-form-item label="描述：">
            <el-input v-model="form.remark" :disabled="form.childType === 0" placeholder="请输入描述"></el-input>
            <el-input v-model="form.remark" :disabled="form.category === 1" placeholder="请输入描述"></el-input>
            </el-form-item>
            <el-form-item label="是否有效：">
            <el-switch
@@ -249,6 +249,7 @@
  computed: {
    /**
     * childType
     * ä¸º0 å…¨éƒ¨æŒ‰é’®å±•ç¤º
     * ä¸º-1   å…¨éƒ¨æŒ‰é’®å±•ç¤º ç¦ç”¨ä¿®æ”¹ åˆ é™¤ å¢žåŠ æ“ä½œç±»åž‹
     * ä¸ä¸º-1 éšè— åˆ é™¤éžç³»ç»Ÿæ¨¡å— åˆ é™¤ä¸šåŠ¡æ¨¡å—
     * ä¸º1时 ç¦ç”¨æ“ä½œç±»åž‹ã€å¯¼å…¥ã€å¯¼å‡º
@@ -360,7 +361,6 @@
        this.$message.error('Mobile标识长度不能255！');
        return
      }

      updateModel(this.form).then(res => {
        if (res.data.code === 200) {
          this.$message.success(res.data.msg);

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

@@ -18,8 +18,8 @@

    <el-main>
      <basic-container>
        <div v-if="form.childType && form.childType !== 0 && !addStatus && !editStatus" class="btnBox">
          <el-button :disabled="mangeShowBtn ? false : !childTypeBtn" icon="el-icon-plus" plain
        <div v-if="(form.childType || form.childType === 0) && !addStatus && !editStatus && form.category !== 1" class="btnBox">
          <el-button :disabled="(mangeShowBtn || form.childType === 0) ? false : !childTypeBtn" icon="el-icon-plus" plain
                     size="small"
                     type="primary" @click="addClickHandler">增加
          </el-button>
@@ -33,11 +33,11 @@
                     size="small"
                     type="primary" @click="addMethodsClickHandler">增加操作类型
          </el-button>
          <el-button v-if="this.form.childType ? mangeShowBtn :true" icon="el-icon-circle-close" plain size="small"
          <el-button v-if=" mangeShowBtn" icon="el-icon-circle-close" plain size="small"
                     type="danger"
                     @click="addClickHandler">删除非系统模块
          </el-button>
          <el-button v-if="this.form.childType ? mangeShowBtn :true" icon="el-icon-circle-close" plain size="small"
          <el-button v-if="mangeShowBtn " icon="el-icon-circle-close" plain size="small"
                     type="danger"
                     @click="addClickHandler">删除业务模块
          </el-button>
@@ -50,59 +50,52 @@
          <el-button icon="el-icon-upload2" plain size="small" type="primary" @click="sqlClickExportClick">导出sql
          </el-button>
        </div>
        <div v-else-if="form.childType && form.childType !== 0 &&(addStatus || editStatus)" class="btnBox">
        <div v-else-if="(form.childType || form.childType === 0) && (addStatus || editStatus)" class="btnBox">
          <el-button v-if="addStatus" icon="el-icon-check" plain size="small"
                     type="success" @click="addSaveClickHandler">保存
          </el-button>
          <el-button v-if="editStatus" icon="el-icon-check" plain size="small"
                     type="success" @click="editSaveClickHandler">保存
          </el-button>
          <el-button icon="el-icon-close" plain size="small"
                     type="danger" @click="addStatus=false;editStatus=false;">取消
          <el-button  icon="el-icon-close" plain size="small"
                      type="danger" @click="addStatus=false;editStatus=false;">取消
          </el-button>
        </div>
        <div v-if="form.childType === 0" class="btnBox">
        <div v-if="form.category === 1" class="btnBox">
          <el-button icon="el-icon-edit" plain size="small" type="primary" @click="updataAliasClickHandler">修改别名
          </el-button>
          <el-button icon="el-icon-close" plain size="small" type="danger" @click="deleteOperationClickHandler">删除
          </el-button>
        </div>
        <el-form ref="form" :model="form" label-width="85px" style="max-height: calc(100vh - 200px);overflow: auto;">
          <span v-if="form.childType !== 0">
          <span v-if="form.category !== 1">
            <el-form-item label="模块名：">
            <el-input v-model="form.name" :disabled="!editStatus && !addStatus" placeholder="请输入模块名"></el-input>
          </el-form-item>
          <el-form-item label="模块别名：">
            <el-input v-model="form.alias" :disabled="!editStatus && !addStatus" placeholder="模块别名用来记录日志使用"></el-input>
          </el-form-item>
            <el-form-item label="C/S：">
            <el-input v-model="form.pathC" :disabled="!editStatus && !addStatus" :rows="2" placeholder="请输入C/S路径"
                      type="textarea"></el-input>
                <el-form-item label="C/S：">
            <el-input v-model="form.pathC" :disabled="!editStatus && !addStatus" :rows="2" placeholder="请输入C/S路径" type="textarea"></el-input>
          </el-form-item>
          <el-form-item label="B/S：">
            <el-input v-model="form.path" :disabled="!editStatus && !addStatus" :rows="2" placeholder="请输入B/S路径"
                      type="textarea"></el-input>
            <el-input v-model="form.path" :disabled="!editStatus && !addStatus" :rows="2" placeholder="请输入B/S路径" type="textarea"></el-input>
          </el-form-item>
          <el-form-item label=".NET：">
            <el-input v-model="form.resourceDotNet" :disabled="!editStatus && !addStatus" :rows="2"
                      placeholder="请输入.NET" type="textarea"></el-input>
            <el-input v-model="form.resourceDotNet" :disabled="!editStatus && !addStatus" :rows="2" placeholder="请输入.NET" type="textarea"></el-input>
          </el-form-item>
          <el-form-item label="Mobile：">
            <el-input v-model="form.resourceMobile" :disabled="!editStatus && !addStatus" :rows="2"
                      placeholder="请输入Mobile" type="textarea"></el-input>
            <el-input v-model="form.resourceMobile" :disabled="!editStatus && !addStatus" :rows="2" placeholder="请输入Mobile" type="textarea"></el-input>
          </el-form-item>
          <el-form-item label="序号：">
            <el-input v-model="form.sort" :disabled="!editStatus && !addStatus"
                      placeholder="数字，描述该模块在其父模块下的显示顺序"></el-input>
            <el-input v-model="form.sort" :disabled="!editStatus && !addStatus" placeholder="数字，描述该模块在其父模块下的显示顺序"></el-input>
          </el-form-item>
          <el-form-item label="图标：">
<!--            <el-input v-model="form.source" :disabled="!editStatus && !addStatus"></el-input>-->
             <avue-input-icon v-model="form.source" :disabled="!editStatus && !addStatus" :icon-list="iconList" placeholder="请选择图标">
             </avue-input-icon>
              <avue-input-icon v-model="form.source" :disabled="!editStatus && !addStatus" :icon-list="iconList" placeholder="请选择图标">
              </avue-input-icon>
          </el-form-item>
          <el-form-item label="描述：">
            <el-input v-model="form.remark" :disabled="!editStatus && !addStatus" :rows="3" placeholder="请输入描述"
                      type="textarea"></el-input>
            <el-input v-model="form.remark" :disabled="!editStatus && !addStatus" :rows="3" placeholder="请输入描述" type="textarea"></el-input>
          </el-form-item>
          <el-form-item label="是否有效：">
            <el-switch
@@ -114,21 +107,21 @@
            <el-link :underline="false" style="margin-left: 20px" type="danger">不生效（不选择）时，该模块在功能模块授权里不显示</el-link>
          </el-form-item>
          </span>
          <span v-if="form.childType === 0">
          <span v-if="form.category === 1">
            <el-form-item label="名称：">
            <el-input v-model="form.name" :disabled="form.childType === 0" placeholder="请输入名称"></el-input>
            <el-input v-model="form.name" :disabled="form.category === 1" placeholder="请输入名称"></el-input>
            </el-form-item>
            <el-form-item label="标识：">
            <el-input v-model="form.code" :disabled="form.childType === 0" placeholder="请输入标识"></el-input>
            <el-input v-model="form.code" :disabled="form.category === 1" placeholder="请输入标识"></el-input>
            </el-form-item>
            <el-form-item label="别名：">
            <el-input v-model="form.alias" placeholder="请输入别名"></el-input>
            </el-form-item>
            <el-form-item label="编号：">
            <el-input v-model="form.sort" :disabled="form.childType === 0" placeholder="请输入编号"></el-input>
            <el-input v-model="form.sort" :disabled="form.category === 1" placeholder="请输入编号"></el-input>
            </el-form-item>
            <el-form-item label="描述：">
            <el-input v-model="form.remark" :disabled="form.childType === 0" placeholder="请输入描述"></el-input>
            <el-input v-model="form.remark" :disabled="form.category === 1" placeholder="请输入描述"></el-input>
            </el-form-item>
            <el-form-item label="是否有效：">
            <el-switch