修改表单定义样式&&修改ui上下文btmName&&添加登录密码即将过期进入首页并提醒

 Source/plt-web/plt-web-ui/src/App.vue

@@ -180,6 +180,11 @@
  margin-bottom: 10px;
}

.avue-group__header{
  height: 20px;
  line-height: 20px;
}

.font14{font-size: 14px;width: 12px;height: 12px;display: inline-block;}
.font16{font-size: 16px;width: 14px;height: 14px;display: inline-block;}
</style>

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

@@ -39,9 +39,12 @@
  let data = new FormData();
  data.append('fileOid',oids);
  download(data).then(res => {
    if (res) {
    console.log('res',res);
    if (res.data.code == 200) {
      func.downloadFileByBlobHandler(res);
      Vue.prototype.$message.success("下载成功");
    }else {
      Vue.prototype.$message.error("下载失败，请检查网络请求！");
    }
  }).catch(err => {
    console.log(err);

 Source/plt-web/plt-web-ui/src/components/actions/handlers.js

@@ -43,6 +43,10 @@
    downloadfile: () => {import("@/components/actions/base/downloadFileAction").then(module => {
      module.doAction(options,callback);
    })},
    //下载文件
    downloadfiles: () => {import("@/components/actions/base/downloadFileAction").then(module => {
      module.doAction(options,callback);
    })},
    uprevision: () => {import("@/components/actions/base/upRevisionAction").then(module => {
      module.doAction(options,callback);
    })}

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

@@ -242,7 +242,13 @@
      if (parentOid != 0 && parentOid.indexOf('@vcitreesep@') > -1) {
        parentOid = parentOid.split('@vcitreesep@')[1];
      }
      const parentBtmName = (node.level === 0) ? '' : (node.data.attributes.part.btmName || node.data.attributes.btmName);

      const parentBtmName = (node.level === 0)
        ? ''
        : (node.data.attributes.part && node.data.attributes.part.btmname)
        || (node.data.attributes.folder && node.data.attributes.folder.btmname)
        || (node.data.attributes && node.data.attributes.btmname)
        || '';
      const params = this.params;
      let url='';debugger;
      if(this.componentVO.bsCustQueryCLsOrUrl && this.componentVO.bsCustQueryCLsOrUrl.indexOf('/')!=-1){

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

@@ -230,13 +230,20 @@
          });
          this.$store.dispatch("LoginByUsername", this.loginForm).then((data) => {
            if (data.obj.failCode !== 'loginSuccess') {
              // console.log('data', data);
              if (data.obj.failCode === 'passwordRemainDay') {
                this.$message.warning(data.obj.passwordInfo);
                this.$router.push({path: this.tagWel.value});
                loading.close();
                return;
              }

              if (data.obj.failCode === 'userIsLocked') {
                this.$message.error(`登录错误次数过多，账号被锁定【${data.obj.failMsgArray[0]}】分钟`);
                loading.close();
                return;
              }
              this.$message.error(data.msg);

              if (data.obj.mustChangePassword) {
                this.passwordVisible = true;
              }
@@ -294,7 +301,7 @@
          this.passwordVisible = false;
          this.$refs.changeForm.resetFields();
          this.$store.dispatch("LoginByUsername", {...this.loginForm, password: form.confirmPassword}).then(data => {
            if (data.obj.failCode !== 'loginSuccess') {
            if (data.obj.failCode !== 'loginSuccess' && data.obj.failCode !== 'passwordRemainDay') {
              this.$message.error(data.msg);
            }
            this.$router.push({path: this.tagWel.value});

 Source/plt-web/plt-web-ui/src/store/modules/user.js

@@ -66,7 +66,7 @@
        let passwordDes = func.encryptData(userInfo.password, 'daliantan0v0vcip')
        loginByUsername(userInfo.deptId, userInfo.roleId, userInfo.username, passwordDes, userInfo.type, userInfo.key,).then(res => {
          const data = res.data;
          if (data.obj.failCode === 'loginSuccess') {
          if (data.obj.failCode === 'loginSuccess' || data.obj.failCode === 'passwordRemainDay') {
            commit('SET_TOKEN', data.obj.tokenVO.accessToken);
            commit('SET_REFRESH_TOKEN', data.obj.tokenVO.accessToken);
            commit('DEL_ALL_TAG');

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

@@ -852,7 +852,6 @@
          children: 'childNodes',
        },
        treeLoad: (node, resolve) => {
          // console.log(node);
          const params = {
            'conditionMap[dataType]': node.data.data,
            'conditionMap[parentId]': node.data.data,
@@ -1244,7 +1243,6 @@
    // 选项表格行点击
    optionTableClick(row) {
      this.optionRow = row;
      console.log(row);
    },

    customOptionTableClick(row) {
@@ -1288,7 +1286,6 @@

    // 选项删除
    optionDeleteClickHandler(val) {
      // console.log(this.optionRow);
      if (val === 'dialog') {
        this.customForm.itemKeyValueList.splice(this.customOptionRow.index,1);
      } else {
@@ -1426,7 +1423,6 @@
        this.$message.error('请选择一条数据进行保存');
        return;
      }
      // console.log(this.customAttrRow)
      this.customForm.text = this.customAttrRow.id;
      this.customAttrVisible = false;
    },
@@ -1438,11 +1434,9 @@
        return;
      }


      this.formList = this.formList.map(item =>
        item.text === this.form.text ? this.form : item
      );
      console.log(this.formList);

      this.$message.success('应用成功');
    },
@@ -1500,13 +1494,11 @@
        return `${key}=${oids.join(',')}`; // 用 , 连接同一类型的 oid
      }).join('&&'); // 最后用 && 连接不同类型

      // console.log(resultString);
      if (this.authType === 'attr') {
        this.customForm.itemRight = resultString;
      } else {
        this.form.itemRight = resultString;
      }
      // this.form.itemRight = resultString;
      this.authDialogClose();
    }


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

@@ -438,7 +438,6 @@

    // 表单选择change事件
    formSelectChange(val) {
      // console.log(val);
      this.form.itemOutFieldList = [];
      this.form.itemKeyFieldList = [];
      this.form.itemFieldWidthList = [];
@@ -551,7 +550,6 @@
            viTypeText: "表格"
          }
          savePortalVI(params).then(res => {
            // console.log(params);
            if (res.data.code === 200) {
              this.$message.success(res.data.obj);
              // this.closeDialog();

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

@@ -66,7 +66,8 @@
        </avue-crud>
      </basic-container>
    </el-main>
    <form-dialog ref="formDialog" :TreeNodeRow="this.nodeRow" :editRow="editRow" :treeRadio="treeRadio"  @updataTable="getRightPortalVIDatas"></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>
    <!-- 导入 -->
@@ -311,7 +312,6 @@

    // 编辑按钮
    editBtnClick(row) {
      console.log('row', row);
      // 表格
      if (row.viType === 0) {
        const params = {
@@ -330,14 +330,14 @@
            // 更新表单
            this.$refs.tableDialog.form = {
              ...prmItem,
              itemFieldWidthList:prmItem.itemFieldWidthList.map(item => {
                return{
              itemFieldWidthList: prmItem.itemFieldWidthList.map(item => {
                return {
                  ...item,
                  $cellEdit: true,
                }
              }),
              viName: res.data.obj.viName,
              itemQtName:res.data.obj.prm.formQtName,
              itemQtName: res.data.obj.prm.formQtName,
              editNodeId: row.id,
              itemOutFieldList: (prmItem.itemOutFieldList || []),
              itemSearchFieldList: (prmItem.itemSearchFieldList || []).map(item => ({id: item})),
@@ -379,7 +379,6 @@
            this.$refs.formDialog.topForm.itemQtName = res.data.obj.prm.formQtName;
            this.$refs.formDialog.topForm.columnNumber = this.getValueBasedOnInput(res.data.obj.prm.showCols);
            this.$refs.formDialog.topForm.showColumn = res.data.obj.prm.showCols;

            this.$refs.formDialog.visible = true;
          }
        })
@@ -521,7 +520,6 @@

    // 克隆树点击
    cloneTreeNodeClick(row) {
      console.log(row);
      this.cloneTreeNode = row;
    },

@@ -577,7 +575,6 @@
        confirmButtonText: '确定',
        cancelButtonText: '取消',
      }).then(({value}) => {
        console.log(obj);
        const params = {
          clonePortalVIDTOList: [
            {

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

@@ -414,6 +414,7 @@
      data: [],
      option: {
        ...basicOption,
        size:'mini',
        height: this.height,
        addBtn: false,
        index: true,
@@ -424,6 +425,7 @@
          {
            label: '名称',
            prop: 'name',
            labelWidth: 110,
            rules: [
              {
                required: true,
@@ -435,6 +437,7 @@
          {
            label: '编号',
            prop: 'seq',
            labelWidth: 110,
            hide: false,
            rules: [
              {
@@ -448,17 +451,25 @@
            label: '',
            prop: 'uiParser',
            hide: true,
            labelWidth: 100,
            labelWidth: 110,
          },
          {
            label: '',
            prop: 'extAttr',
            hide: true,
            labelWidth: 110,
          },
          {
            label: '描述',
            prop: 'description',
            labelWidth: 110,
            hide: false,
          },
          {
            label: '模板类型',
            prop: 'templateType',
            type: 'radio',
            labelWidth: 110,
            span: 24,
            value: '1',
            dicData: [
@@ -517,6 +528,7 @@
            label: '显示类型',
            prop: 'navigatorType',
            type: 'radio',
            labelWidth: 110,
            span: 24,
            value: '1',
            hide: true,
@@ -539,6 +551,7 @@
            label: '搜索类型',
            prop: 'searchTarger',
            display: true,
            labelWidth: 110,
            type: 'radio',
            value: '1',
            span: 24,
@@ -573,22 +586,19 @@
              }
            }
          },
          {
            label: '描述',
            prop: 'description',
            display: false
          },
        ],
        group: [
          {
            label: '',
            arrow: false,
            icon:'el-icon-info',
            label:'',
            arrow: true,
            prop: 'group1',
            column: [
              {
                label: '源对象',
                prop: 'showType',
                type: 'select',
                labelWidth: 115,
                cascader: ['linkType', 'SubUILayout', 'searchObjType'],
                placeholder: "请输入内容",
                dicUrl: '/api/uiManagerController/getBtmDatasByPage?page=1&limit=-1',
@@ -638,6 +648,7 @@
                prop: 'linkType',
                type: 'select',
                display: false,
                labelWidth: 115,
                filterable: true,
                props: {
                  label: 'name',
@@ -670,6 +681,7 @@
              {
                label: '选择模板',
                prop: 'templateId',
                labelWidth: 115,
                display: false,
                formslot: true,
                rules: [
@@ -684,6 +696,7 @@
                label: 'UI定义',
                prop: 'SubUILayout',
                type: 'select',
                labelWidth: 115,
                filterable: true,
                display: false,
                props: {
@@ -698,6 +711,7 @@
                display: false,
                value: '1',
                type: 'radio',
                labelWidth: 115,
                span: 24,
                dicData: [
                  {
@@ -715,7 +729,7 @@
                prop: 'searchObjType',
                type: 'select',
                display: false,
                labelWidth: 100,
                labelWidth: 115,
                props: {
                  label: 'qtName',
                  value: 'qtName',
@@ -726,6 +740,7 @@
              {
                label: '查询模板',
                prop: 'queryTemplateName',
                labelWidth: 115,
                type: 'select',
                display: false,
                formslot: true,
@@ -733,6 +748,7 @@
              {
                label: '控制路径',
                prop: 'controlPath',
                labelWidth: 115,
                display: false,
                type: 'textarea',
                span: 24,
@@ -741,18 +757,20 @@
              {
                label: '树结构展开列',
                prop: 'expandCols',
                labelWidth: 110,
                labelWidth: 115,
                display: false,
                span: 12
              },
              {
                label: '参照树设置',
                prop: 'showLinkAbs',
                labelWidth: 115,
                display: false,
              },
              {
                label: '分隔符',
                prop: 'separator',
                labelWidth: 115,
                display: false,
              },
              {
@@ -760,6 +778,7 @@
                prop: 'expandMode',
                display: false,
                type: 'radio',
                labelWidth: 115,
                value: '1',
                dicData: [
                  {
@@ -773,20 +792,6 @@
                ]
              },
              {
                label: '根节点显示表达式',
                prop: 'rootContent',
                display: false,
                labelWidth: 135,
                span: 12
              },
              {
                label: '树节点显示表达式',
                prop: 'showAbs',
                display: false,
                labelWidth: 135,
                span: 12
              },
              {
                label: 'B/S自定义查询',
                prop: 'bsCustQueryCLsOrUrl',
                display: false,
@@ -800,6 +805,20 @@
                labelWidth: 115,
                span: 12
              },
              {
                label: '根节点显示表达式',
                prop: 'rootContent',
                display: false,
                labelWidth: 135,
                span: 12
              },
              {
                label: '树节点显示表达式',
                prop: 'showAbs',
                display: false,
                labelWidth: 135,
                span: 12
              },
            ]
          },
          {

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

@@ -504,7 +504,6 @@
          operId: this.form.operId
        }
        delFuncOperation(params).then(res => {
          console.log(res);
          if (res.data.code === 200) {
            this.$message.success(res.data.msg);
            this.handleRefreshTree('del');