Merge remote-tracking branch 'origin/master'

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

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

@@ -13,7 +13,8 @@
      @selection-change="selectChangeHandler"
      @row-click="rowClickHandler">
      <template slot="menuLeft" slot-scope="scope">
        <el-button v-if="permissionChildrenList.UiPageLayoutAddBtn" class="button-custom-icon" plain size="small" type="primary"
        <el-button v-if="permissionChildrenList.UiPageLayoutAddBtn" class="button-custom-icon" plain size="small"
                   type="primary"
                   @click="addClickHandler">
          <icon-show :name="permissionChildrenList.UiPageLayoutAddBtn.source"></icon-show>
          增加
@@ -26,15 +27,18 @@
          <icon-show :name="permissionChildrenList.UiPageLayoutDesignBtn.source"></icon-show>
          按钮设计
        </el-button>
        <el-button v-if="permissionChildrenList.UiPageLayoutEditBtn" size="small" type="text" @click="editBtnClick(scope.row)">
        <el-button v-if="permissionChildrenList.UiPageLayoutEditBtn" size="small" type="text"
                   @click="editBtnClick(scope.row)">
          <icon-show :name="permissionChildrenList.UiPageLayoutEditBtn.source"></icon-show>
          编辑
        </el-button>
        <el-button v-if="permissionChildrenList.UiPageLayoutDelBtn" size="small" type="text" @click="rowDeleteHandler(scope.row)">
        <el-button v-if="permissionChildrenList.UiPageLayoutDelBtn" size="small" type="text"
                   @click="rowDeleteHandler(scope.row)">
          <icon-show :name="permissionChildrenList.UiPageLayoutDelBtn.source"></icon-show>
          删除
        </el-button>
        <el-button v-if="permissionChildrenList.UiPageLayoutCloneBtn" size="small" type="text" @click="rowCloneHandler(scope.row)">
        <el-button v-if="permissionChildrenList.UiPageLayoutCloneBtn" size="small" type="text"
                   @click="rowCloneHandler(scope.row)">
          <icon-show :name="permissionChildrenList.UiPageLayoutCloneBtn.source"></icon-show>
          克隆
        </el-button>
@@ -124,19 +128,27 @@
      <el-container v-loading="dialogLoading">
        <el-header style="height: 40px !important;padding-left: 5px;">
          <div style="display: flex">
            <el-button v-show="disabledBtn" :disabled="!disabledBtn" plain size="mini" type="primary" @click="addClickBtnHandler">添加
            <el-button v-show="disabledBtn" :disabled="!disabledBtn" plain size="mini" type="primary"
                       @click="addClickBtnHandler">添加
            </el-button>
            <el-button v-show="disabledBtn" :disabled="!disabledBtn" plain size="mini" type="primary" @click="editClickBtnHandler">修改
            <el-button v-show="disabledBtn" :disabled="!disabledBtn" plain size="mini" type="primary"
                       @click="editClickBtnHandler">修改
            </el-button>
            <el-button v-show="disabledBtn" :disabled="!disabledBtn" plain size="mini" type="danger" @click="delClickBtnHandler">删除
            <el-button v-show="disabledBtn" :disabled="!disabledBtn" plain size="mini" type="danger"
                       @click="delClickBtnHandler">删除
            </el-button>
            <el-button v-show="!disabledBtn" :disabled="disabledBtn" plain size="mini" icon="el-icon-check" type="success" @click="saveClickBtnHandler">保存
            <el-button v-show="!disabledBtn" :disabled="disabledBtn" icon="el-icon-check" plain size="mini"
                       type="success" @click="saveClickBtnHandler">保存
            </el-button>
            <el-button v-show="!disabledBtn" :disabled="disabledBtn" plain size="mini" icon="el-icon-close" type="danger" @click="escClickBtnHandler">取消
            <el-button v-show="!disabledBtn" :disabled="disabledBtn" icon="el-icon-close" plain size="mini"
                       type="danger" @click="escClickBtnHandler">取消
            </el-button>
            <el-button v-show="disabledBtn"  plain size="mini" type="primary" @click="changeBottomBtnHandler">调整为下级按钮</el-button>
            <el-button v-show="disabledBtn"  plain size="mini" type="primary" @click="changeTopBtnHandler">调整为上级按钮</el-button>
            <el-button v-show="disabledBtn"  plain size="mini" type="primary" @click="cloneClickBtnHandler">复制到其他组件</el-button>
            <el-button v-show="disabledBtn" plain size="mini" type="primary" @click="changeBottomBtnHandler">调整为下级按钮
            </el-button>
            <el-button v-show="disabledBtn" plain size="mini" type="primary" @click="changeTopBtnHandler">调整为上级按钮
            </el-button>
            <el-button v-show="disabledBtn" plain size="mini" type="primary" @click="cloneClickBtnHandler">复制到其他组件
            </el-button>
          </div>
        </el-header>
        <el-container>
@@ -183,8 +195,10 @@

                  <el-col :span="12">
                    <el-form-item label="Action：" prop="actionName">
                      <el-input v-model="basicForm.actionName" :disabled="disabledBtn" :clearable="true" @focus="actionFoucus" @clear="clearActionValue">
                        <i slot="suffix" class="el-input__icon el-icon-search" style="cursor: pointer" @click="actionFoucus"></i>
                      <el-input v-model="basicForm.actionName" :clearable="true" :disabled="disabledBtn"
                                @clear="clearActionValue" @focus="actionFoucus">
                        <i slot="suffix" class="el-input__icon el-icon-search" style="cursor: pointer"
                           @click="actionFoucus"></i>
                      </el-input>
                    </el-form-item>
                  </el-col>
@@ -204,13 +218,17 @@
                    </el-form-item>
                  </el-col>

                  <el-col :span="12" v-show="basicForm.show=='0'">
                  <el-col v-show="basicForm.show=='0'" :span="12">
                    <el-form-item label="显示方式：" prop="showType">
                      <el-radio v-model="basicForm.displayMode" :disabled="disabledBtn" label="text">文字</el-radio>
                      <el-radio v-model="basicForm.displayMode" :disabled="disabledBtn" label="image">图标</el-radio>
                      <el-radio v-model="basicForm.displayMode" :disabled="disabledBtn" label="textandimage">文字和图标</el-radio>
                      <el-radio v-model="basicForm.displayMode" :disabled="disabledBtn" label="textandimage">文字和图标
                      </el-radio>
                    </el-form-item>
                  </el-col>
                  <el-col v-show="basicForm.show=='0' && (basicForm.displayMode=='image'||basicForm.displayMode=='textandimage')"
                          :span="24">
                    <el-form-item label="图标：" prop="iconPath">
                  <el-col :span="24" v-show="basicForm.show=='0' && (basicForm.displayMode=='image'||basicForm.displayMode=='textandimage')">
                    <el-form-item :class="basicForm.displayMode==='image'?'is-required':''" label="图标：" prop="iconPath">
                      <input-icon v-model="basicForm.iconPath" :disabled="disabledBtn"></input-icon>
@@ -256,7 +274,8 @@
        </el-container>
      </el-container>
    </el-dialog>
    <action-dialog ref="actionDialog" @cancelAction="actionCancelHandler" @updataAction="actionSaveHandler"></action-dialog>
    <action-dialog ref="actionDialog" @cancelAction="actionCancelHandler"
                   @updataAction="actionSaveHandler"></action-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"

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

 Source/plt-web/plt-web-ui/src/views/wel/adminIndex.vue

@@ -163,21 +163,21 @@
          logName: "登录日志统计",
          text: "当前登录日志总记录数",
          color: 'rgb(230, 71, 88)',
          router: '/LogInfoMain?logType=1&roleType=2'
          router: '/C41AF7C4-1D19-00DF-1974-2542CDD49FFB?logType=1&roleType=1&id=C41AF7C4-1D19-00DF-1974-2542CDD49FFB&name=登录日志查询（管理员）'
        },
        {
          logType: "3",
          logName: "授权日志统计",
          text: "当前授权日志总记录数",
          color: 'rgb(178, 159, 255)',
          router: '/LogAuthorizeMain?logType=3&roleType=2'
          router: '/EBA630BC-71DF-AF03-F9CB-2F4DF14459AF?logType=3&roleType=1&id=EBA630BC-71DF-AF03-F9CB-2F4DF14459AF&name=授权日志查询（管理员）'
        },
        {
          logType: "4",
          logName: "操作日志统计",
          text: "当前操作日志总记录数",
          color: 'rgb(27, 201, 142)',
          router: '/LogOperateMain?logType=4&roleType=2'
          router: '/674C5E77-501F-AE85-2B61-191711BDA57A?logType=4&roleType=1&id=674C5E77-501F-AE85-2B61-191711BDA57A&name=操作日志查询（管理员）'
        },
      ];