整合代码，修改表单定义按钮排列方式

 Document/training/UIÅäÖÃʵÀý.doc

Binary files differ

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

@@ -17,7 +17,7 @@
import 'nprogress/nprogress.css';

//默认超时时间
axios.defaults.timeout = 10000;
axios.defaults.timeout = 30000;
//返回其他状态码
axios.defaults.validateStatus = function (status) {
  return status >= 200 && status <= 500;

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

@@ -23,8 +23,13 @@
        <h3 style="margin: 0 0 10px 0">UI权限配置</h3>
        <div>
          <el-button icon="el-icon-place" plain size="small" type="primary" @click="saveHandler">授权</el-button>
          <el-button icon="el-icon-close" plain size="small" type="primary" @click="clearValue" style="margin-right: 40px;">重置</el-button>
          ä¸šåŠ¡ç±»åž‹ï¼š<el-select v-model="type" placeholder="请选择" size="small" :clearable="true" @change="typeChange" style="width: 300px;margin-right: 20px;">
          <el-button icon="el-icon-close" plain size="small" style="margin-right: 40px;" type="primary"
                     @click="clearValue">重置
          </el-button>
          ä¸šåŠ¡ç±»åž‹ï¼š
          <el-select v-model="type" :clearable="true" placeholder="请选择" size="small"
                     style="width: 300px;margin-right: 20px;"
                     @change="typeChange">
            <el-option
              v-for="item in typeData"
              :key="item.oid"
@@ -32,7 +37,9 @@
              :value="item.attributes.name">
            </el-option>
          </el-select>
          UI上下文：<el-select v-model="context" placeholder="请选择" size="small" :clearable="true" @change="contextChange" style="width: 350px;">
          UI上下文：
          <el-select v-model="context" :clearable="true" placeholder="请选择" size="small" style="width: 350px;"
                     @change="contextChange">
          <el-option
            v-for="item in contextData"
            :key="item.oid"
@@ -122,7 +129,8 @@
        const params = {
          'conditionMap[roleId]': this.nodeRow.oid,
          'conditionMap[type]': this.type,
          'conditionMap[context]': this.context
          'conditionMap[context]': this.context,
          'conditionMap[showCheckbox]': true
        }
        this.defaultExpandKeys=['root'];
        getUIAuthor(params).then(res => {
@@ -149,7 +157,8 @@
    processChildren(item) {
      if (item.children && item.children.length > 0) {
        item.children = item.children.map(child => {
          if(child.level<4){
          if (child.level < 2) {
            // é»˜è®¤æ ‘节点展开两层效果
            this.defaultExpandKeys.push(child.oid)
          }
          if(child.level==1){
@@ -217,7 +226,7 @@
      });
    },
    clearValue(){
      this.$refs.uiTree.setCheckedNodes([])
      this.$refs.uiTree.setCheckedNodes([]);
    }
  }
}
@@ -228,6 +237,7 @@
  .el-scrollbar__wrap {
    overflow: auto !important;
  }

  .headerCon{
    .el-button{
      width: 82px;

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

@@ -1287,7 +1287,7 @@

    // æ–°å¢žç¼–辑保存
    addDialogSavaHandler() {
      if (!this.form.inputRevisionFlag && (!this.form.revisionRuleId || this.form.revisionRuleId === "")) {
      if (this.form.revLevel !== '0' &&!this.form.inputRevisionFlag && (!this.form.revisionRuleId || this.form.revisionRuleId === "")) {
        this.$message.error('请检查版本号规则不能为空');
        return;
      }

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

@@ -25,6 +25,14 @@

    <el-main>
      <basic-container>
        <div v-if="!tableStatus" style="display: flex;justify-content: left;margin-top: 15px">
          <el-button icon="el-icon-plus" plain size="small" type="primary" @click="addClickHandler">增加</el-button>
          <el-button icon="el-icon-delete" plain size="small" type="danger" @click="deleteClickHandler">删除</el-button>
          <el-button icon="el-icon-document-add" plain size="small" type="primary">克隆</el-button>
          <el-button icon="el-icon-upload2" plain size="small" type="primary" @click="upLoadClickHandler">导入</el-button>
          <el-button icon="el-icon-download" plain size="small" type="primary" @click="exportClickHandler">导出
          </el-button>
        </div>
        <avue-crud
          v-if="!tableStatus"
          ref="crud"
@@ -61,14 +69,6 @@
            </el-button>
          </template>
        </avue-crud>
        <div v-if="!tableStatus" style="display: flex;justify-content: center;margin-top: 15px">
          <el-button icon="el-icon-plus" plain size="small" type="primary" @click="addClickHandler">增加</el-button>
          <el-button icon="el-icon-delete" plain size="small" type="danger" @click="deleteClickHandler">删除</el-button>
          <el-button icon="el-icon-document-add" plain size="small" type="primary">克隆</el-button>
          <el-button icon="el-icon-upload2" plain size="small" type="primary" @click="upLoadClickHandler">导入</el-button>
          <el-button icon="el-icon-download" plain size="small" type="primary" @click="exportClickHandler">导出
          </el-button>
        </div>
      </basic-container>
    </el-main>
    <form-dialog ref="formDialog" :TreeNodeRow="this.nodeRow" :treeRadio="treeRadio"></form-dialog>
@@ -117,6 +117,7 @@
        addBtn: false,
        editBtn: false,
        delBtn: false,
        calcHeight:-60,
        column: [
          {
            label: '业务名称',

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

@@ -36,8 +36,10 @@
            <el-button icon="el-icon-plus" size="small" type="primary" @click="addHandler">创建</el-button>
            <!--<el-button icon="el-icon-edit" plain size="small" type="primary" @click="editHandler">修改</el-button>
            <el-button icon="el-icon-delete" plain size="small" type="danger" @click="delHandler">删除</el-button>-->
            <el-button icon="el-icon-download" plain size="small" type="primary" @click="exportClickHandler">导出</el-button>
            <el-button icon="el-icon-upload2" plain size="small" type="primary" @click="upLoadClickHandler">导入</el-button>
            <el-button icon="el-icon-download" plain size="small" type="primary" @click="exportClickHandler">导出
            </el-button>
            <el-button icon="el-icon-upload2" plain size="small" type="primary" @click="upLoadClickHandler">导入
            </el-button>
            <el-button icon="el-icon-place" plain size="small" type="primary" @click="uiAuthorHandler">授权</el-button>
          </template>
          <template slot="menu" slot-scope="scope">
@@ -45,7 +47,8 @@
            </el-button>
            <el-button icon="el-icon-delete" size="small" type="text" @click="rowDeleteHandler(scope.row)">删除
            </el-button>
            <el-button icon="el-icon-document-copy" size="small" type="text" @click="rowCloneHandler(scope.row)">克隆</el-button>
            <el-button icon="el-icon-document-copy" size="small" type="text" @click="rowCloneHandler(scope.row)">克隆
            </el-button>
          </template>
          <template slot="plName" slot-scope="{row}">
            <el-link type="primary" @click="linkClickHandler(row)">{{ row.plName }}</el-link>
@@ -55,11 +58,11 @@
        <el-dialog
          v-dialogDrag
          v-loading="dialogLoading"
          :close-on-click-modal="false"
          :title="dialogType === 'add' ? ' åˆ›å»º ä¸Šä¸‹æ–‡' : '编辑 ä¸Šä¸‹æ–‡'"
          :visible.sync="dialogVisible"
          append-to-body="true"
          class="avue-dialog"
          :close-on-click-modal="false"
          width="500px"
          @close="dialogClose"
        >
@@ -78,7 +81,7 @@
              </el-checkbox-group>
            </el-form-item>
            <el-form-item label="描述：" prop="plDesc">
              <el-input type="textarea" :rows="5" v-model="form.plDesc"></el-input>
              <el-input v-model="form.plDesc" :rows="5" type="textarea"></el-input>
            </el-form-item>
          </el-form>
          <span slot="footer" class="dialog-footer">
@@ -90,14 +93,14 @@
        <el-dialog
          key="cloneDialog"
          v-dialogDrag
          title="克隆"
          :visible.sync="cloneDialogVisible"
          append-to-body="true"
          class="avue-dialog"
          title="克隆"
          width="500px"
          @close="cloneDialogClose"
        >
          <avue-form ref="cloneForm" :option="cloneOption" v-model="cloneForm"></avue-form>
          <avue-form ref="cloneForm" v-model="cloneForm" :option="cloneOption"></avue-form>
          <span slot="footer" class="dialog-footer">
            <el-button @click="cloneDialogClose">取 æ¶ˆ</el-button>
            <el-button type="primary" @click="cloneSaveHandler">ç¡® å®š</el-button>
@@ -107,10 +110,10 @@
        <el-dialog
          key="cloneDialog"
          v-dialogDrag
          title="导出"
          :visible.sync="expDialogVisible"
          append-to-body="true"
          class="avue-dialog"
          title="导出"
          width="500px"
          @close="expDialogVisible=false"
        >
@@ -124,17 +127,18 @@
        </el-dialog>
      </basic-container>
      <!-- å¯¼å…¥ -->
      <upload-file ref="upload" :fileType="upFileType" :fileUrl="fileUrl" :tipList="tipList" :fileData="fileData" title="导入"
      <upload-file ref="upload" :fileData="fileData" :fileType="upFileType" :fileUrl="fileUrl" :tipList="tipList"
                   title="导入"
                   @updata="getTableList" @upfaildata="upFail"></upload-file>
      <!--页签窗口-->
      <el-dialog v-dialogDrag
                 :append-to-body="true"
                 :close-on-click-modal="false"
                 :destroy-on-close="true"
                 :fullscreen="true"
                 :title="dialog.title"
                 :visible.sync="dialog.showDialog"
                 :fullscreen="true"
                 :append-to-body="true"
                 class="avue-dialog"
                 :destroy-on-close="true"
                 :close-on-click-modal="false"
                 @close="dialog.showDialog=false">
          <pl-show :uiDefineData="dialog.uiDefineData"></pl-show>
      </el-dialog>
@@ -146,11 +150,21 @@
</template>

<script>
import {getBizTree,gridUIContextData,saveUIContextData,updateUIContextData,delUIContextData, cloneUIContextData ,getExpContextTree,expUIContextData} from "@/api/UI/uiDefine";
import {
  getBizTree,
  gridUIContextData,
  saveUIContextData,
  updateUIContextData,
  delUIContextData,
  cloneUIContextData,
  getExpContextTree,
  expUIContextData
} from "@/api/UI/uiDefine";
import basicOption from "@/util/basic-option";
import func from "@/util/func";
import plShow from "@/views/modelingMenu/ui/uiDefine/rightRegion/plShow";
import uiAuthor from "@/views/authority/ui/uiAuthorization/UIDialog"

export default {
  name: "index",
  components:{plShow,uiAuthor},
@@ -194,7 +208,7 @@
      selectList: [],
      option: {
        ...basicOption,
        calcHeight: -40,
        calcHeight: -50,
        addBtn: false,
        editBtn: false,
        delBtn: false,
@@ -675,6 +689,7 @@
  .el-scrollbar__wrap {
    overflow: auto !important;
  }

  .headerCon{
    .el-button{
      width: 82px;

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

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

@@ -136,7 +136,7 @@
                  </el-form-item>

                  <el-col :span="12">
                    <el-form-item label="是否授权：" prop="resource">
                    <el-form-item label="是否授权：" prop="authorization">
                      <el-radio v-model="basicForm.authorization" :disabled="disabledBtn" label="0">是</el-radio>
                      <el-radio v-model="basicForm.authorization" :disabled="disabledBtn" label="1">否</el-radio>
                    </el-form-item>
@@ -198,8 +198,10 @@
      </el-container>
    </el-dialog>
    <action-dialog ref="actionDialog" @updataAction="actionSaveHandler"></action-dialog>
    <clone-dialog ref="cloneDialog" :fromOid="fromOid" :sourceOId="sourceOId" type="pageDef" paramsType="tab"></clone-dialog>
    <clone-dialog ref="cloneBtnDialog" :fromOid="formBtnOid" :sourceOId="sourceBtnOid" type="tabButton" paramsType="pageDef"></clone-dialog>
    <clone-dialog ref="cloneDialog" :fromOid="fromOid" :sourceOId="sourceOId" paramsType="tab"
                  type="pageDef"></clone-dialog>
    <clone-dialog ref="cloneBtnDialog" :fromOid="formBtnOid" :sourceOId="sourceBtnOid" paramsType="pageDef"
                  type="tabButton"></clone-dialog>
  </div>
</template>

@@ -207,14 +209,14 @@
import basicOption from "@/util/basic-option";
import func from "@/util/func";
import {
  getPLPageDefinations,
  getBtmDatasByPage,
  getPortalVIDatasByPage,
  getQTInfoDatasByPage,
  getLinkDatasByPage,
  getPLPageDefinations,
  getTabButtons,
  addTapButton,
  updateTapButton,
  getLinkDatasByPage,
  addPageDefination,
  deleteTabButton,
  delPageDefination,
@@ -722,7 +724,7 @@
    sourceData: {
      handler(val) {
        if (val && val.plOId) {
          this.getTableList()
          this.getTableList();
        } else {
          this.data = [];
        }
@@ -869,7 +871,8 @@
        console.log(res);
        if (res.data.code === 200) {
          this.$message.success(res.data.obj);
          done()
          this.getTableList();
          done();
        }
      }).catch(err => {
        loading();