diff --git a/src/components/DesignForm/app/formPage.vue b/src/components/DesignForm/app/formPage.vue
index 023db0e..28ab3a9 100644
--- a/src/components/DesignForm/app/formPage.vue
+++ b/src/components/DesignForm/app/formPage.vue
@@ -1270,14 +1270,6 @@ watch(
'detail-form': type === 3 || type === 4 || type === 1,
}"
>
-
-
diff --git a/src/components/DesignForm/assembly/index.ts b/src/components/DesignForm/assembly/index.ts
index a5d0618..d129d2b 100644
--- a/src/components/DesignForm/assembly/index.ts
+++ b/src/components/DesignForm/assembly/index.ts
@@ -658,6 +658,9 @@ export default [
icon: 'table',
iconFont: 'fa-table',
list: [],
+ item:{
+ label:""
+ },
tableData: [], // 子表表格列表数据集合
control: {
border: true
diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index 9d8aab2..6957e23 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -79,8 +79,8 @@ const { formConfig, formData } = toRefs(props);
const store = useDesignFormStore() as any;
const controlData = computed(() => {
// console.log("注册自定义事件----------------->",props.formInfo)
- // console.log("注册自定义事件--------1--------->",store.controlAttr)
- // console.log("注册自定义事件---------3-------->",controlData.value.customRules)
+ // console.log("注册自定义事件--------1--------->", store.controlAttr);
+ // console.log("注册自定义事件---------3-------->", controlData.value.customRules);
return store.controlAttr;
});
//获取组件样式Demo
@@ -291,12 +291,12 @@ const attrList = computed(() => {
}
}
//判断校验规则
- // console.log("判断校验规则--->",typeof(controlData.value.customRules))
+ // console.log("判断校验规则--->", item);
if (typeof controlData.value.customRules == "object") {
if (Array.isArray(controlData.value.customRules)) {
let otherPick = [];
controlData.value.customRules.forEach((item: any) => {
- // console.log("判断校验规则-1-->",item)
+ // console.log("判断校验规则-1-->", item);
if (item.type == ValidateText.type) {
ValidateText.checkbox = true;
} else {
@@ -317,7 +317,7 @@ const attrList = computed(() => {
ValidateText.checkbox = false;
radioVerify.type = "";
}
-
+ // console.log("判断校验规则-1-->", item);
const temp = reactive([
{
label: "标签名称",
@@ -1167,14 +1167,25 @@ const controlChange = (obj: any, val: any) => {
if (data.code == 0) {
if (data.data != "") {
if (!fileSignAry.includes(data.data)) {
- controlData.value.name = data.data;
+ if (controlData.value.type == "table") {
+ controlData.value.name = "table_" + data.data;
+ } else {
+ controlData.value.name = data.data;
+ }
+
fileSignAry.push(data.data);
} else {
let isEnd = true;
do {
let titleVal = data.data + Rand(10000000, 99999999);
if (!fileSignAry.includes(titleVal)) {
- controlData.value.name = titleVal;
+ // controlData.value.name = titleVal;
+ if (controlData.value.type == "table") {
+ controlData.value.name = "table_" + titleVal;
+ } else {
+ controlData.value.name = titleVal;
+ }
+
fileSignAry.push(titleVal);
isEnd = false;
}
@@ -1182,12 +1193,22 @@ const controlChange = (obj: any, val: any) => {
}
} else {
if (!fileSignAry.includes(val)) {
- controlData.value.name = val;
+ if (controlData.value.type == "table") {
+ controlData.value.name = "table_" + val;
+ } else {
+ controlData.value.name = val;
+ }
+ // controlData.value.name = val;
fileSignAry.push(val);
} else {
let titleVal = val + Rand(10000000, 99999999);
if (!fileSignAry.includes(titleVal)) {
- controlData.value.name = titleVal;
+ // controlData.value.name = titleVal;
+ if (controlData.value.type == "table") {
+ controlData.value.name = "table_" + titleVal;
+ } else {
+ controlData.value.name = titleVal;
+ }
fileSignAry.push(titleVal);
}
}
@@ -1266,6 +1287,7 @@ const Rand = (Min: number, Max: number) => {
const getPropByPath = (obj: any, path: string, val: any) => {
let tempObj = obj;
const keyArr = path.split(".");
+ console.log("修改指定路径下的值", keyArr, tempObj);
let i = 0;
for (i; i < keyArr.length - 1; i++) {
const key = keyArr[i];
@@ -2154,23 +2176,22 @@ const transferDataSourceOptions = [
//liwenxuan20240313 lowcodeImage end
//liwenxuan20250103 qrCode start
-let qrCodeImgInside = ""
-const qrCodeInsideDialogFlag = ref(false)
-function showQrCodeOutside(){
- alert("暂不支持外部填单")
+let qrCodeImgInside = "";
+const qrCodeInsideDialogFlag = ref(false);
+function showQrCodeOutside() {
+ alert("暂不支持外部填单");
}
-function showQrCodeInside(){
+function showQrCodeInside() {
//查看二维码展示弹窗图片,图片带有分组,app,表单名称,和二维码图片
//在此获取必要的参数并请求后台,获取二维码图片,当图片返回成功时,显示弹窗
//必要的参数为cfid
getQrCodeImgInside().then(({ data }) => {
- qrCodeImgInside = data
- if(qrCodeInsideDialogFlag.value==false){
+ qrCodeImgInside = data;
+ if (qrCodeInsideDialogFlag.value == false) {
//console.log(qrCodeImgInside)
- qrCodeInsideDialogFlag.value = true
+ qrCodeInsideDialogFlag.value = true;
}
- })
-
+ });
}
function getQrCodeImgInside() {
return request({
@@ -2185,12 +2206,13 @@ function getQrCodeImgInside() {
function showQrCodeOutPrintConfig(){
qrCodeOutPrintConfigFlag.value = true
} */
-function handleMaxSelect(){
+function handleMaxSelect() {
//console.log(formData.value.qrCodeShowFields.length)
- if(formData.value.qrCodeShowFields.length>5){
- alert("最多可选择5个字段")
+ if (formData.value.qrCodeShowFields.length > 5) {
+ alert("最多可选择5个字段");
}
- while (formData.value.qrCodeShowFields.length > 5) {//
+ while (formData.value.qrCodeShowFields.length > 5) {
+ //
formData.value.qrCodeShowFields.pop();
}
}
@@ -2201,11 +2223,12 @@ import AssociatedFormsTinyaceRange from "@/widget/associatedforms/associatedForm
import AssociatedFormsFillRole from "@/widget/associatedforms/associatedFormsFillRole.vue";
import AssociatedFormsChildFillRole from "@/widget/associatedforms/associatedFormsChildFillRole.vue";
-const treeDefaultProps = {//
+const treeDefaultProps = {
+ //
children: "children",
label: "label",
};
-//拿到子组件AssociatedFormsTinyace的实例
+//拿到子组件AssociatedFormsTinyace的实例
const aft = ref();
const aftRange = ref();
@@ -2503,7 +2526,10 @@ function getAssociatedFormsCurrentFieldTree1() {
(item: { type: string | null }) => item.type != "table"
);
resDataNoTableNoAsf = resDataNoTable.filter(
- (item: { type: string | null }) => item.type != "associatedForms"&&item.type != "table"&&item.type != "checkbox"
+ (item: { type: string | null }) =>
+ item.type != "associatedForms" &&
+ item.type != "table" &&
+ item.type != "checkbox"
);
associatedFormsCurrentFormFieldTreeNoTable.value = [
@@ -2514,8 +2540,8 @@ function getAssociatedFormsCurrentFieldTree1() {
treeAttrs: data.treeAttrs,
},
];
-
- associatedFormsCurrentFormFieldTreeNoTable1.value = [...resDataNoTable]
+
+ associatedFormsCurrentFormFieldTreeNoTable1.value = [...resDataNoTable];
let resDataForGlxxsz = ref(data.children.slice(8));
@@ -3342,11 +3368,11 @@ const gainFormGroupList = () => {
.finally(() => {
loadingmore.value = false;
- console.log("组件加载完毕--------1----------->", formData.value);
- console.log("组件加载完毕--------2----------->", props.formList);
- console.log("组件加载完毕--------3----------->", state.dataSourceList);
+ // console.log("组件加载完毕--------1----------->", formData.value);
+ // console.log("组件加载完毕--------2----------->", props.formList);
+ // console.log("组件加载完毕--------3----------->", state.dataSourceList);
if (formData.value.dataSource == "yes" && state.dataSourceList.length < 1) {
- console.log("组件加载完毕--------4----------->", state.dataSourceList);
+ // console.log("组件加载完毕--------4----------->", state.dataSourceList);
tableFileList();
}
});
@@ -3446,10 +3472,10 @@ onMounted(() => {
watch(
() => state.tabsName,
(val: string) => {
- console.log("监听字段切换", val);
+ // console.log("监听字段切换", val);
if (val == "first") {
if (formData.value.dataSource == "yes" && state.dataSourceList.length < 1) {
- console.log("组件加载完毕--------4----------->", formData.value);
+ // console.log("组件加载完毕--------4----------->", formData.value);
tableFileList();
}
}
@@ -3569,7 +3595,7 @@ const requiredText = (val: any) => {
});
}
}
- console.log("判断校验规则-1-->", controlData.value.customRules);
+ // console.log("判断校验规则-1-->", controlData.value.customRules);
};
/**
@@ -4833,10 +4859,10 @@ const updataBase = (val: any) => {
/>
-
+
-
+
{
查看内部二维码图片
-
+
{
查看外部二维码图片
-
-
+
-
{
style="margin-top: 70px"
width="50%"
>
- ![]()
+ ![]()