From 011a8921ba81682c9c468a9cc42ddefbb0790385 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 13 十一月 2023 16:12:51 +0800
Subject: [PATCH] 密码策略校验bug
---
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 70 ++++++++++++++++++++++++++---------
1 files changed, 52 insertions(+), 18 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index 8bcb7ef..6b59ceb 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -11,9 +11,12 @@
@opened="openDialog"
>
<FormTemplate
+ key="masterForm" data-key="masterForm"
v-bind="$attrs"
:type="type"
+ :TreeValue="TreeValue"
:rowOid="rowOid"
+ :eventList="eventList"
:templateOid="templateOid"
v-if="dialogVisible"
ref="FormTemplate"
@@ -31,7 +34,8 @@
<el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
<el-tab-pane label="鐮佸�肩敵璇�" name="codeApply" v-if="showCodeApply">
<FormTemplate
- v-bind="$attrs"
+ key="codeApplyForm" data-key="codeApplyForm"
+ secDTOListv-bind="$attrs"
:type="type"
:selfColumnType="selfColumnType"
:selfColumnConfig="selfColumnConfig"
@@ -91,6 +95,10 @@
type: Boolean,
default: false,
},
+ TreeValue:{
+ type: String,
+ default: "",
+ },
type: {
type: String,
default: "add",
@@ -123,6 +131,9 @@
},
data() {
return {
+ eventList:[],
+ //鐮佸�肩殑绗簩绉嶅彧璇婚殣钘忔儏鍐�
+ codeValueApplyStatus:'',
loading: false,
submitBtnLoading: false,
hasResemble: false,
@@ -215,6 +226,13 @@
},
},
},
+ watch:{
+ codeApplyForm:{
+ handler(newval,oldval){
+ // console.log('newval',newval)
+ }
+ }
+ },
methods: {
openDialog() {
this.getFormTemplate();
@@ -244,11 +262,12 @@
} else {
this.showResembleQuery = false;
}
- console.log(this.hasResemble, "this.hasResemblethis.hasResemble");
this.$nextTick(() => {
this.$refs.FormTemplate.templateRender(
res.data.formDefineVO.items
);
+ this.eventList=res.data.templateVO.attributes
+ // this.$refs.FormTemplate.$emit('eventList', res.data.templateVO.attributes);
if (Object.keys(this.setForm).length > 0) {
this.$refs.FormTemplate.form = this.setForm;
}
@@ -261,29 +280,38 @@
},
// 鑾峰彇鐮佸�肩敵璇锋暟鎹�
getCodeRule() {
- getCodeRule({ codeClassifyOid: this.codeClassifyOid }).then((res) => {
+ let that = this;
+ getCodeRule({codeClassifyOid: that.codeClassifyOid}).then((res) => {
if (res.data && res.data.code === 200) {
- this.codeRuleOid = res.data.data.oid;
+ that.codeRuleOid = res.data.data.oid;
const typeList = [
- "codefixedsec",
- "codeclassifysec",
- "codevariablesec",
- "coderefersec",
+ //灞炴�х爜娈� 鍙
"codeattrsec",
+ //鍙彉鐮佹
+ "codevariablesec",
+ //鍥哄畾鐮佹
+ "codefixedsec",
+ //鍒嗙被鐮佹
+ "codeclassifysec",
+ //鏃ユ湡鐮佹 鍙
+ "codedatesec",
+ //寮曠敤鐮佹
+ "coderefersec",
+ //灞傜骇鐮佹 鍙
"codelevelsec",
- "codedatesec"
+ //娴佹按鐮佹 闅愯棌
];
- this.secVOList = (res.data.data.secVOList || []).filter((item) =>
+ that.secVOList = (res.data.data.secVOList || []).filter((item) =>
typeList.includes(item.secType)
);
- if (this.secVOList.length > 0 && this.type === "add") {
- this.showCodeApply = true;
- this.activeName = "codeApply";
+ if (that.secVOList.length > 0 && that.type === "add") {
+ that.showCodeApply = true;
+ that.activeName = "codeApply";
this.$nextTick(() => {
- this.$refs.CodeApply.templateRender(this.secVOList);
+ that.$refs.CodeApply.templateRender(that.secVOList, this.TreeValue);
});
} else {
- this.showCodeApply = false;
+ that.showCodeApply = false;
}
}
});
@@ -297,16 +325,20 @@
// 鍙傜収缁勪欢鏁版嵁鍙樻洿
referConfigDataUpdate(data) {
const { field } = data;
+ let childItems=[];
this.secVOList = this.secVOList.map((item) => {
if (item.parentClassifySecOid === field) {
this.$refs.CodeApply.form[item.oid] = undefined;
this.$refs.CodeApply.form[item.name] = undefined;
item.readOnly=false;
item.referConfig.extraParams.parentClassifyValueOid=data.value;
+ item.referConfig.reloadData = true;
+ childItems.push(item)
}
return item;
});
- this.$refs.CodeApply.templateRender(this.secVOList);
+ //this.$refs.CodeApply.templateRender(this.secVOList,this.TreeValue);
+ this.$refs.CodeApply.changeChildItem(childItems);
},
resembleQuerySubmit() {
this.activeName = "resembleQuery";
@@ -331,7 +363,7 @@
// }
// }
let resembleQueryList = [];
- if (this.$refs.resembleQueryRef) {
+ if (this.showResembleQuery && this.$refs.resembleQueryRef) {
// 杩涜鐩镐技椤规煡璇�
resembleQueryList = await this.$refs.resembleQueryRef.resembleQuery(
this.form
@@ -370,7 +402,6 @@
this.$delete(formValue, item);
});
const keys = Object.keys(formValue);
- debugger
keys.forEach((item, index) => {
keys.forEach((itm, idx) => {
if ((item === ('$' + itm)) && idx !== index) {
@@ -390,6 +421,8 @@
resForm.codeClassifyOid = this.codeClassifyOid;
resForm.codeRuleOid = this.codeRuleOid;
resForm.templateOid = this.templateOid;
+ // console.log('formValue',formValue)
+ // console.log('resForm',resForm)
this.$emit("submit", resForm);
},
getDefaultValueAndFormValues(form) {
@@ -480,6 +513,7 @@
isRequired(item) {
return item.nullableFlag != "true";
},
+ //榛樿鍊�
getOptionList(item) {
if (
Array.isArray(item.fixedValueVOList) &&
--
Gitblit v1.9.3