diff --git a/src/components/DesignForm/assembly/index.ts b/src/components/DesignForm/assembly/index.ts
index a5d0618..38bdf76 100644
--- a/src/components/DesignForm/assembly/index.ts
+++ b/src/components/DesignForm/assembly/index.ts
@@ -217,7 +217,9 @@ export default [
iconFont: 'fa-text-width',
control: {
// 组件所有属性
- modelValue: ''
+ modelValue: '',
+ scanInputFlag: false,
+ scanType:'',
},
config: {}, // 其他配置信息
styles: {
diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index 9d8aab2..e372ecd 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -527,6 +527,7 @@ const attrList = computed(() => {
path: "config.append",
vShow: ["input", "password", "digitpage"],
},
+
// {
// label: '状态打开时的值',
// value: control.activeValue,
@@ -733,6 +734,14 @@ const attrList = computed(() => {
vIf: state.isSearch,
vShow: ["associatedForms"],
},
+ {
+ label: "移动端扫描输入",
+ value: config.scanInput,
+ path: "config.scanInput",
+ type: "input",
+ vIf: state.isSearch,
+ vShow: ["input"],
+ },
{
label: "隐藏条件",
value: config.associatedForms,
@@ -3351,6 +3360,19 @@ const gainFormGroupList = () => {
}
});
};
+//liwenxuan 2025 移动端单选扫描输入功能 start
+const scanTypes = [
+ {
+ value: 'QrCode',
+ label: '二维码',
+ },
+ {
+ value: 'OCR',
+ label: '光学字符识别',
+ },
+]
+//liwenxuan 2025 移动端单选扫描输入功能 end
+
let asfs: any[] = [];
let asfsExpectCurrent: any[] = [];
@@ -4207,6 +4229,35 @@ const updataBase = (val: any) => {
>
+
+
+
+
+
+