diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index 9db5d45..0a8bca8 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -1143,9 +1143,26 @@ const controlChange = (obj: any, val: any) => {
if (val) {
// 多选,将值改为数组
controlData.value.control.modelValue = [];
+ controlData.value.control.glxxsz = [];
} else {
// 单选
controlData.value.control.modelValue = "";
+ for (var i = 0; i < controlData.value.options.length; i++) {
+ if (controlData.value.control.glxxsz[i] === undefined) {
+ //新增了某个option
+ controlData.value.control.glxxsz.push({
+ conditionField: controlData.value.name,
+ optionLabel: controlData.value.options[i].label,
+ optionValue: controlData.value.options[i].value,
+ tableIndex: i,
+ id: uuidv4().replaceAll("-", "").toString(),
+ });
+ } else {
+ //修改了某个option
+ controlData.value.control.glxxsz[i].optionLabel = controlData.value.options[i].label;
+ controlData.value.control.glxxsz[i].optionValue = controlData.value.options[i].value;
+ }
+ }
}
break;
case "tableColumn1":
@@ -2022,13 +2039,14 @@ watch(
let strArr: [string] = resDataForGlxxszExceptself1[i].id.split(":");
// console.log(strArr)
let str = strArr[strArr.length - 1];
- // console.log(str)
+ /* console.log(str)
+ console.log(newVal) */
if (str == newVal) {
resDataForGlxxszExceptself1.splice(i, 1); // 将使后面的元素依次前移,数组长度减1
i--; // 如果不减,将漏掉一个元素
}
}
- // console.log(resDataForGlxxszExceptself1)
+ console.log(resDataForGlxxszExceptself1)
if (
getAssociatedFormsCurrentFieldTreeData &&
getAssociatedFormsCurrentFieldTreeData.treeAttrs &&
@@ -3319,7 +3337,7 @@ watch(
(changedOptions: any) => {
// console.log("radio,select添加选项时同步配置选项",changedOptions)
// console.log("radio,select添加选项时同步配置选项------>",controlData.value)
- if (controlData.value.type === "radio" || controlData.value.type === "select") {
+ if (controlData.value.type === "radio" || controlData.value.type === "select" && (!controlData.value.multiple)) {
if (controlData.value.config.optionsType == 0) {
if (changedOptions.length === 0) {
//删没了option
@@ -3371,6 +3389,17 @@ function createRowForGlxxsz() {
});
}
}
+function createRowForGlxxsz1() {
+ if (controlData.value.config.optionsType == 0) {
+ controlData.value.control.glxxsz.push({
+ conditionField: controlData.value.name,
+ selectedOptions: [],
+ showFields: [],
+ id: uuidv4().replaceAll("-", "").toString(),
+ });
+ }
+}
+
function deleteRowForGlxxsz(row: { id: any }) {
if (controlData.value.config.optionsType == 0) {
@@ -3379,6 +3408,14 @@ function deleteRowForGlxxsz(row: { id: any }) {
);
}
}
+
+function deleteRowForGlxxsz1(row: { id: any }) {
+ if (controlData.value.config.optionsType == 0) {
+ controlData.value.control.glxxsz = controlData.value.control.glxxsz.filter(
+ (item: { id: any }) => item.id != row.id
+ );
+ }
+}
/* */
const optionsValue3SettingDialogOpenFlag = ref(false);
@@ -6059,7 +6096,7 @@ const libraryList = ref([
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+
+
+