|
|
|
@ -52,7 +52,7 @@ watch( |
|
|
|
() => props.data, |
|
|
|
(v: FormList[]) => { |
|
|
|
dataList.value = v; |
|
|
|
console.log("监听表单变化++++++++++>", v); |
|
|
|
// console.log("监听表单变化++++++++++>", v); |
|
|
|
}, |
|
|
|
{ |
|
|
|
deep: true, |
|
|
|
@ -142,11 +142,11 @@ const draggableAdd = (evt: any) => { |
|
|
|
const key = new Date().getTime().toString(); |
|
|
|
const obj: any = dataList.value[newIndex]; |
|
|
|
const isNested = evt.target && evt.target.getAttribute("data-type"); // 不能嵌套 |
|
|
|
console.log("设计拖拽事件-----1------->", newIndex); |
|
|
|
console.log("设计拖拽事件-----2------->", key); |
|
|
|
console.log("设计拖拽事件-----3------->", obj); |
|
|
|
console.log("设计拖拽事件-----4------->", isNested); |
|
|
|
console.log("设计拖拽事件-----4------->", dataList.value); |
|
|
|
// console.log("设计拖拽事件-----1------->", newIndex); |
|
|
|
// console.log("设计拖拽事件-----2------->", key); |
|
|
|
// console.log("设计拖拽事件-----3------->", obj); |
|
|
|
// console.log("设计拖拽事件-----4------->", isNested); |
|
|
|
// console.log("设计拖拽事件-----4------->", dataList.value); |
|
|
|
if ( |
|
|
|
(isNested === "not-nested" && notNested(obj.type)) || |
|
|
|
((isNested === "not-table" || isNested === "not-flex") && |
|
|
|
@ -272,7 +272,7 @@ const groupClick = (item: any, ele?: string) => { |
|
|
|
state.gridAdd = item.type === "grid"; |
|
|
|
// state.clone = !notNested(item.type) |
|
|
|
state.clone = !notNestedTableFlex(item.type); |
|
|
|
console.log("点击激活当前--->", store); |
|
|
|
// console.log("点击激活当前--->", store); |
|
|
|
}; |
|
|
|
// 返回栅格宽度 |
|
|
|
const getFormItemStyle = (ele: FormList) => { |
|
|
|
@ -493,7 +493,7 @@ function asfValueChanged(val: any) { |
|
|
|
fillFieldsChild = fillFieldsChild.filter((element: any) => { |
|
|
|
if (containsDangerousWords(element.filterCondition.gongShi.mathsFormula)) { |
|
|
|
//alert("筛选条件非法") |
|
|
|
console.log("筛选条件非法===>" + element.filterCondition.conditionHtml); |
|
|
|
// console.log("筛选条件非法===>" + element.filterCondition.conditionHtml); |
|
|
|
} else { |
|
|
|
return element; |
|
|
|
} |
|
|
|
|