修改密码新密码重新登录&&属性池、表单定义表格、版本管理三个模块表单样式修改

 Source/plt-web/plt-web-ui/src/page/login/userlogin.vue

@@ -71,7 +71,7 @@
  name: "userlogin",
  data() {
    return {
      userName:'',
      userName: '',
      passwordVisible: false,
      passwordForm: {},
      passwordOption: {
@@ -256,7 +256,8 @@
                });
                return false;
              }
            };
            }
            ;
            this.$router.push({path: this.tagWel.value});
            loading.close();
          }).catch((err) => {
@@ -293,7 +294,7 @@
          this.$message.success('修改成功，即将跳转到首页');
          this.passwordVisible = false;
          this.$refs.changeForm.resetFields();
          this.$store.dispatch("LoginByUsername",{...this.loginForm,password:form.confirmPassword}).then(data => {
          this.$store.dispatch("LoginByUsername", {...this.loginForm, password: form.confirmPassword}).then(data => {
            if (data.obj.failCode !== 'loginSuccess') {
              this.$message.error(data.msg);
            }

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

@@ -229,103 +229,104 @@
      width="65%"
      @close="addEscHandler"
    >
      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
        <el-row>
          <div class="addDialog">
            <div>
              <h3>属性项</h3>
              <el-col :span="12">
                <el-form-item label="名称：" prop="id">
                  <el-input v-model="form.id"></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="标签：" prop="name">
                  <el-input v-model="form.name"></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="属性类型：" prop="attributeDataType">
                  <el-select v-model="form.attributeDataType" placeholder="请选择属性类型" @change="attributeDataTypeChange">
                    <el-option v-for="item in typeSelectList" :label="item" :value="item"></el-option>
                  </el-select>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="描述：" prop="description">
                  <el-input v-model="form.description" :rows="2" type="textarea"></el-input>
                </el-form-item>
              </el-col>

            </div>
            <div v-if="!hideType" class="addDialogBottom">
              <div class="left">
                <h3>{{ form.attributeDataType }}</h3>

                <el-form-item
                  v-if="form.attributeDataType !== 'VTInteger' && form.attributeDataType !== 'VTLong'
                  && form.attributeDataType !== 'VTDouble' && form.attributeDataType !== 'VTBoolean'"
                  label="长度：" prop="attrLength">
                  <el-input v-model="form.attrLength"></el-input>
                </el-form-item>

                <el-form-item v-if="form.attributeDataType === 'VTDouble'" label="精度：" prop="precisionLength">
                  <el-input v-model="form.precisionLength"></el-input>
                </el-form-item>

                <el-form-item v-if="form.attributeDataType === 'VTDouble'" label="长度：" prop="scaleLength">
                  <el-input v-model="form.scaleLength"></el-input>
                </el-form-item>


                <el-form-item v-if="form.attributeDataType !== 'VTBoolean' && !form.enumSwitch" label="默认值："
                              prop="defaultValue">
                  <el-input v-model="form.defaultValue"></el-input>
                </el-form-item>

                <el-form-item v-if="form.attributeDataType === 'VTBoolean'" label="默认值：" prop="defaultValue">
                  <el-select v-model="form.defaultValue">
                    <el-option label="false" value="false"></el-option>
                    <el-option label="true" value="true"></el-option>
                  </el-select>
                </el-form-item>
                <el-form-item v-if="form.attributeDataType !== 'VTBoolean' && form.enumSwitch" label="默认值："
                              prop="defaultValue">
                  <el-select v-model="form.defaultValue">
                    <el-option v-for="(item,index) in rangeOptionValue" :key="index" :label="item"
                               :value="item"></el-option>
                  </el-select>
                </el-form-item>

                <el-form-item label="允许为空：" prop="nullableFlag">
                  <el-switch v-model="form.nullableFlag"></el-switch>
                </el-form-item>
      <div style="height: 650px">
        <el-form ref="form" :model="form" :rules="rules" label-width="120px" size="small">
          <el-row>
            <div class="addDialog">
              <div>
                <h3>属性项</h3>
                <el-col :span="12">
                  <el-form-item label="名称：" prop="id">
                    <el-input v-model="form.id"></el-input>
                  </el-form-item>
                </el-col>
                <el-col :span="12">
                  <el-form-item label="标签：" prop="name">
                    <el-input v-model="form.name"></el-input>
                  </el-form-item>
                </el-col>
                <el-col :span="12">
                  <el-form-item label="属性类型：" prop="attributeDataType">
                    <el-select v-model="form.attributeDataType" placeholder="请选择属性类型" @change="attributeDataTypeChange">
                      <el-option v-for="item in typeSelectList" :label="item" :value="item"></el-option>
                    </el-select>
                  </el-form-item>
                </el-col>
                <el-col :span="12">
                  <el-form-item label="描述：" prop="description">
                    <el-input v-model="form.description" :rows="2" type="textarea"></el-input>
                  </el-form-item>
                </el-col>

              </div>
              <el-divider direction="vertical"></el-divider>
              <!--  VTString   -->
              <div v-if="form.attributeDataType === 'VTString'" class="right">
                <h3>值域</h3>
                <el-form-item label="当前值域类型：" prop="attributeSelectType">
                  <el-select v-model="form.attributeSelectType" placeholder="请选择属性类型"
                             @change="attributeSelectTypeChange">
                    <el-option label="业务类型" value="business"></el-option>
                    <el-option label="链接类型" value="link"></el-option>
                  </el-select>
                </el-form-item>
              <div v-if="!hideType" class="addDialogBottom">
                <div class="left">
                  <h3>{{ form.attributeDataType }}</h3>

                <el-form-item v-if="form.attributeSelectType === 'link'" label="版本次：" prop="version">
                  <el-select v-model="form.version" placeholder="请选择版本次">
                    <el-option :value="1" label="当前版本次"></el-option>
                    <el-option :value="3" label="最新版本次"></el-option>
                  </el-select>
                </el-form-item>
                  <el-form-item
                    v-if="form.attributeDataType !== 'VTInteger' && form.attributeDataType !== 'VTLong'
                  && form.attributeDataType !== 'VTDouble' && form.attributeDataType !== 'VTBoolean'"
                    label="长度：" prop="attrLength">
                    <el-input v-model="form.attrLength"></el-input>
                  </el-form-item>

                <el-form-item label="选择参照类型：" prop="referValue">
                  <el-input v-model="form.referValue" @focus="referFormFocusHandler"></el-input>
                </el-form-item>
                  <el-form-item v-if="form.attributeDataType === 'VTDouble'" label="精度：" prop="precisionLength">
                    <el-input v-model="form.precisionLength"></el-input>
                  </el-form-item>

                <span v-if="!form.referValue">
                  <el-form-item v-if="form.attributeDataType === 'VTDouble'" label="长度：" prop="scaleLength">
                    <el-input v-model="form.scaleLength"></el-input>
                  </el-form-item>


                  <el-form-item v-if="form.attributeDataType !== 'VTBoolean' && !form.enumSwitch" label="默认值："
                                prop="defaultValue">
                    <el-input v-model="form.defaultValue"></el-input>
                  </el-form-item>

                  <el-form-item v-if="form.attributeDataType === 'VTBoolean'" label="默认值：" prop="defaultValue">
                    <el-select v-model="form.defaultValue">
                      <el-option label="false" value="false"></el-option>
                      <el-option label="true" value="true"></el-option>
                    </el-select>
                  </el-form-item>
                  <el-form-item v-if="form.attributeDataType !== 'VTBoolean' && form.enumSwitch" label="默认值："
                                prop="defaultValue">
                    <el-select v-model="form.defaultValue">
                      <el-option v-for="(item,index) in rangeOptionValue" :key="index" :label="item"
                                 :value="item"></el-option>
                    </el-select>
                  </el-form-item>

                  <el-form-item label="允许为空：" prop="nullableFlag">
                    <el-switch v-model="form.nullableFlag"></el-switch>
                  </el-form-item>

                </div>
                <el-divider direction="vertical"></el-divider>
                <!--  VTString   -->
                <div v-if="form.attributeDataType === 'VTString'" class="right">
                  <h3>值域</h3>
                  <el-form-item label="当前值域类型：" prop="attributeSelectType">
                    <el-select v-model="form.attributeSelectType" placeholder="请选择属性类型"
                               @change="attributeSelectTypeChange">
                      <el-option label="业务类型" value="business"></el-option>
                      <el-option label="链接类型" value="link"></el-option>
                    </el-select>
                  </el-form-item>

                  <el-form-item v-if="form.attributeSelectType === 'link'" label="版本次：" prop="version">
                    <el-select v-model="form.version" placeholder="请选择版本次">
                      <el-option :value="1" label="当前版本次"></el-option>
                      <el-option :value="3" label="最新版本次"></el-option>
                    </el-select>
                  </el-form-item>

                  <el-form-item label="选择参照类型：" prop="referValue">
                    <el-input v-model="form.referValue" @focus="referFormFocusHandler"></el-input>
                  </el-form-item>

                  <span v-if="!form.referValue">
                <el-form-item label="使用枚举：" prop="enumSwitch">
                  <el-switch v-model="form.enumSwitch" @change="switchEnumChange"></el-switch>
                </el-form-item>
@@ -351,122 +352,124 @@
                  </textarea>
                </el-form-item>
                </span>
              </div>
              <!--  VTInteger VTLong   -->
              <div v-if="form.attributeDataType === 'VTInteger' || form.attributeDataType === 'VTLong' " class="right">
                <h3>值域</h3>
                </div>
                <!--  VTInteger VTLong   -->
                <div v-if="form.attributeDataType === 'VTInteger' || form.attributeDataType === 'VTLong' "
                     class="right">
                  <h3>值域</h3>

                <el-form-item label="使用枚举：" prop="enumSwitch">
                  <el-switch v-model="form.enumSwitch" @change="switchEnumChange"></el-switch>
                </el-form-item>
                  <el-form-item label="使用枚举：" prop="enumSwitch">
                    <el-switch v-model="form.enumSwitch" @change="switchEnumChange"></el-switch>
                  </el-form-item>


                <el-form-item :label="form.enumSwitch ? '枚举选择：' : '添加值域：'" prop="enumSwitch">
                  <el-select v-if="form.enumSwitch" v-model="form.enumId" placeholder="请选择枚举类型"
                             @change="enumSelectChange">
                    <el-option v-for="(item,index) in attributeDataTypePickList" :key="index" :label="item.key"
                               :value="item.key"></el-option>
                  </el-select>
                  <el-input v-if="!form.enumSwitch" v-model="form.enumAddValue">
                  </el-input>
                </el-form-item>
                <el-form-item v-if="!form.enumSwitch" label="运算符：">
                  <div>
                    <el-button size="mini" @click="operationHandler('>')"> ></el-button>
                    <el-button size="mini" @click="operationHandler('<')"> <</el-button>
                    <el-button size="mini" @click="operationHandler('>=')"> >=</el-button>
                    <el-button size="mini" @click="operationHandler('<=')"> <=</el-button>
                    <el-button size="mini" @click="operationHandler('=')"> =</el-button>
                    <el-button size="mini" @click="operationHandler('!=')"> !=</el-button>
                    <el-button size="mini" @click="operationHandler('()')"> ([])</el-button>
                  </div>
                </el-form-item>
                <el-form-item :label="form.enumSwitch ? '当前枚举值：' : '当前值域：'" prop="rangeValue">
                  <el-form-item :label="form.enumSwitch ? '枚举选择：' : '添加值域：'" prop="enumSwitch">
                    <el-select v-if="form.enumSwitch" v-model="form.enumId" placeholder="请选择枚举类型"
                               @change="enumSelectChange">
                      <el-option v-for="(item,index) in attributeDataTypePickList" :key="index" :label="item.key"
                                 :value="item.key"></el-option>
                    </el-select>
                    <el-input v-if="!form.enumSwitch" v-model="form.enumAddValue">
                    </el-input>
                  </el-form-item>
                  <el-form-item v-if="!form.enumSwitch" label="运算符：">
                    <div>
                      <el-button size="mini" @click="operationHandler('>')"> ></el-button>
                      <el-button size="mini" @click="operationHandler('<')"> <</el-button>
                      <el-button size="mini" @click="operationHandler('>=')"> >=</el-button>
                      <el-button size="mini" @click="operationHandler('<=')"> <=</el-button>
                      <el-button size="mini" @click="operationHandler('=')"> =</el-button>
                      <el-button size="mini" @click="operationHandler('!=')"> !=</el-button>
                      <el-button size="mini" @click="operationHandler('()')"> ([])</el-button>
                    </div>
                  </el-form-item>
                  <el-form-item :label="form.enumSwitch ? '当前枚举值：' : '当前值域：'" prop="rangeValue">
                  <textarea v-model="form.rangeValue" :readonly="form.enumSwitch"
                            style="width: 330px; height: 80px; border: 1px solid #DCDFE6; overflow: auto; text-align: left;resize: none;">
                  </textarea>
                </el-form-item>
              </div>
              <!--   VTDouble    -->
              <div v-if="form.attributeDataType === 'VTDouble'" class="right">
                <h3>值域</h3>
                <el-form-item :label="form.enumSwitch ? '枚举选择：' : '添加值域：'" prop="enumAddValue">
                  <el-input v-model="form.enumAddValue">
                  </el-input>
                </el-form-item>
                <el-form-item label="运算符：">
                  <div>
                    <el-button size="mini" @click="operationHandler('>')"> ></el-button>
                    <el-button size="mini" @click="operationHandler('<')"> <</el-button>
                    <el-button size="mini" @click="operationHandler('>=')"> >=</el-button>
                    <el-button size="mini" @click="operationHandler('<=')"> <=</el-button>
                    <el-button size="mini" @click="operationHandler('=')"> =</el-button>
                    <el-button size="mini" @click="operationHandler('!=')"> !=</el-button>
                    <el-button size="mini" @click="operationHandler('()')">([])</el-button>
                  </div>
                </el-form-item>
                <el-form-item :label="form.enumSwitch ? '当前枚举值：' : '当前值域：'" prop="rangeValue">
                  </el-form-item>
                </div>
                <!--   VTDouble    -->
                <div v-if="form.attributeDataType === 'VTDouble'" class="right">
                  <h3>值域</h3>
                  <el-form-item :label="form.enumSwitch ? '枚举选择：' : '添加值域：'" prop="enumAddValue">
                    <el-input v-model="form.enumAddValue">
                    </el-input>
                  </el-form-item>
                  <el-form-item label="运算符：">
                    <div>
                      <el-button size="mini" @click="operationHandler('>')"> ></el-button>
                      <el-button size="mini" @click="operationHandler('<')"> <</el-button>
                      <el-button size="mini" @click="operationHandler('>=')"> >=</el-button>
                      <el-button size="mini" @click="operationHandler('<=')"> <=</el-button>
                      <el-button size="mini" @click="operationHandler('=')"> =</el-button>
                      <el-button size="mini" @click="operationHandler('!=')"> !=</el-button>
                      <el-button size="mini" @click="operationHandler('()')">([])</el-button>
                    </div>
                  </el-form-item>
                  <el-form-item :label="form.enumSwitch ? '当前枚举值：' : '当前值域：'" prop="rangeValue">
                  <textarea v-model="form.rangeValue"
                            style="width: 330px; height: 80px; border: 1px solid #DCDFE6; overflow: auto; text-align: left;resize: none;">
                  </textarea>
                </el-form-item>
                  </el-form-item>
                </div>
              </div>
            </div>
          </div>
        </el-row>
      </el-form>
          </el-row>
        </el-form>

      <!-- 业务类型对话框      -->
      <el-dialog
        v-dialogDrag
        :visible.sync="businessVisible"
        append-to-body="true"
        class="avue-dialog"
        title="业务类型选择"
        width="70%"
      >
        <avue-crud
          ref="businessCrud"
          :data="businessData"
          :option="businessOption"
          :table-loading="businessLoading"
          @search-change="businessHandleSearch"
          @search-reset="businessHandleReset"
          @row-click="businessRowClick"
        <!-- 业务类型对话框      -->
        <el-dialog
          v-dialogDrag
          :visible.sync="businessVisible"
          append-to-body="true"
          class="avue-dialog"
          title="业务类型选择"
          width="70%"
        >
        </avue-crud>
        <span slot="footer" class="dialog-footer">
          <avue-crud
            ref="businessCrud"
            :data="businessData"
            :option="businessOption"
            :table-loading="businessLoading"
            @search-change="businessHandleSearch"
            @search-reset="businessHandleReset"
            @row-click="businessRowClick"
          >
          </avue-crud>
          <span slot="footer" class="dialog-footer">
          <el-button @click="businessEmpty">清 空</el-button>
         <el-button @click="businessVisible = false">取 消</el-button>
         <el-button type="primary" @click="businessSaveHandler">确 定</el-button>
        </span>
      </el-dialog>
        </el-dialog>

      <!-- 链接类型对话框      -->
      <el-dialog
        v-dialogDrag
        :visible.sync="linkTypeVisible"
        append-to-body="true"
        class="avue-dialog"
        title="链接类型选择"
        width="70%"
      >
        <avue-crud
          ref="linkTypeCrud"
          :data="linkTypeData"
          :option="linkTypeOption"
          :table-loading="linkTypeLoading"
          @search-change="linkHandleSearch"
          @search-reset="linkHandleReset"
          @row-click="linkRowClick"
        <!-- 链接类型对话框      -->
        <el-dialog
          v-dialogDrag
          :visible.sync="linkTypeVisible"
          append-to-body="true"
          class="avue-dialog"
          title="链接类型选择"
          width="70%"
        >
        </avue-crud>
        <span slot="footer" class="dialog-footer">
          <avue-crud
            ref="linkTypeCrud"
            :data="linkTypeData"
            :option="linkTypeOption"
            :table-loading="linkTypeLoading"
            @search-change="linkHandleSearch"
            @search-reset="linkHandleReset"
            @row-click="linkRowClick"
          >
          </avue-crud>
          <span slot="footer" class="dialog-footer">
          <el-button @click="linkEmpty">清 空</el-button>
         <el-button @click="linkTypeVisible = false">取 消</el-button>
         <el-button type="primary" @click="linkSaveHandler">确 定</el-button>
        </span>
      </el-dialog>
        </el-dialog>
      </div>
      <span slot="footer" class="dialog-footer">
        <el-button @click="addEscHandler">取 消</el-button>
        <el-button type="primary" @click="addSaveHandler">确 定</el-button>
@@ -718,6 +721,7 @@
      });
    }
  },
  watch: {},
  methods: {
    //表格查询请求
    getTableList() {
@@ -907,8 +911,13 @@
        this.form.attributeSelectType = 'link'
        this.form.referValue = row.linkTypeName;
      }
      if (!row.btmTypeId && !row.linkTypeName) {
        this.form.attributeSelectType = 'business'
        this.form.referValue = row.btmTypeId;
      }
      // console.log(row);

      this.getEnumMapByTypeHandler(this.form.attributeDataType)
      this.getEnumMapByTypeHandler(this.form.attributeDataType);
      this.addVisible = true;

    },
@@ -1072,9 +1081,6 @@

    // 选择参照
    referFormFocusHandler() {
      this.form.enumSwitch = false;
      this.form.rangeValue = "";
      this.form.enumId = "";
      const handlers = {
        business: () => {
          this.businessVisible = true;
@@ -1169,6 +1175,7 @@

      this.form.referValue = this.businessRow.name;
      this.businessVisible = false;

    },

    // 业务类型清空

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

@@ -35,7 +35,7 @@
      width="40%"
      @close="visibleCloseHandler"
    >
      <el-form ref="form" :model="form" :rules="rules" label-width="95px">
      <el-form ref="form" size="small" :model="form" :rules="rules" label-width="95px">
        <el-row>
          <el-col :span="12">
            <el-form-item label="名称：" prop="id">

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

@@ -9,30 +9,30 @@
    width="60%"
    @close="closeDialog"
  >
    <el-form ref="form" v-loading="formLoading" :model="form" :rules="rules" label-position="right" label-width="100px">
    <el-form ref="form" size="small" v-loading="formLoading" :model="form" :rules="rules" label-position="right" label-width="100px">
      <el-row>
        <el-col :span="12">
          <el-form-item label="名称" prop="viName">
            <el-input v-model="form.viName" placeholder="请输入名称" size="mini"></el-input>
            <el-input v-model="form.viName" placeholder="请输入名称" ></el-input>
          </el-form-item>
        </el-col>

        <el-col :span="12">
          <el-form-item label="每页行数">
            <el-input v-model="form.itemPageSize" placeholder="请输入每页行数" size="mini" type="number"></el-input>
            <el-input v-model="form.itemPageSize" placeholder="请输入每页行数"  type="number"></el-input>
          </el-form-item>
        </el-col>

        <el-col :span="24">
          <el-form-item label="附加查询条件">
            <el-input v-model="form.itemAddFilter" placeholder="请输入查询条件" size="mini"></el-input>
            <el-input v-model="form.itemAddFilter" placeholder="请输入查询条件"></el-input>
          </el-form-item>
        </el-col>

        <el-col :span="12">
          <el-form-item label="绑定表单" prop="itemInObj">
            <div style="display: flex;align-items: center;">
              <el-select v-model="form.itemInObj" clearable placeholder="请选择绑定表单" size="mini"
              <el-select v-model="form.itemInObj" clearable placeholder="请选择绑定表单"
                         @change="formSelectChange">
                <el-option v-for="(item,index) in selectList" :key="index" :label="item.viName"
                           :value="item.id"></el-option>
@@ -45,7 +45,7 @@
        <el-col :span="12">
          <el-form-item label="父名称">
            <div style="display: flex;align-items: center;">
              <el-input v-model="form.itemParentFolderName" placeholder="请输入父名称" size="mini"></el-input>
              <el-input v-model="form.itemParentFolderName" placeholder="请输入父名称" ></el-input>
              <el-checkbox v-model="form.itemIsNavigatorExpand" style="margin-left: 5px; margin-right: 5px">显示查询区域
              </el-checkbox>
              <el-checkbox v-model="form.itemIsShowFolder" style="margin-left: 5px;margin-right: 0px">显示文件夹
@@ -94,7 +94,7 @@
      </el-col>

      <el-col :span="8">
        <el-form-item label="查询字段">
        <el-form-item label="查询字段"  >
          <el-input v-model="form.searchLabel" placeholder="请输入查询字段" size="mini"></el-input>
        </el-form-item>
      </el-col>
@@ -158,7 +158,7 @@

      <el-col :span="24">
        <el-form-item label="双击操作">
          <el-select v-model="form.itemDbl" placeholder="请选择双击操作" size="mini">
          <el-select v-model="form.itemDbl" placeholder="请选择双击操作" >
            <el-option v-for="(item,index) in itemDblList" :key="index" :label="item.value"
                       :value="item.key"></el-option>
          </el-select>
@@ -170,11 +170,11 @@
          <div style="display: flex;align-items: center">
            <div style="display: flex;align-items: center;width: 100%;">
              <span>长：</span>
              <el-input v-model="itemImgHeight" placeholder="请输入长度" size="mini"></el-input>
              <el-input v-model="itemImgHeight" placeholder="请输入长度" ></el-input>
            </div>
            <div style="display: flex;align-items: center;width: 100%;margin-left: 30px">
              <span>宽：</span>
              <el-input v-model="itemImgWidth" placeholder="请输入宽度" size="mini"></el-input>
              <el-input v-model="itemImgWidth" placeholder="请输入宽度"></el-input>
            </div>
          </div>
        </el-form-item>
@@ -194,7 +194,7 @@

      <el-col :span="24">
        <el-form-item label="查询模板">
          <el-select v-model="form.itemQtName" placeholder="请选择查询模板" size="mini">
          <el-select v-model="form.itemQtName" placeholder="请选择查询模板" >
            <el-option v-for="(item,index) in searchQtNameList" :key="index" :label="item.qtName"
                       :value="item.qtName"></el-option>
          </el-select>