Commit daa5a5e72d545b9c3ece4b90e1dcb300544c6574
Merge branch 'fix/DEFECT-1825' into 'main_dev'
fix: 修改看板小程序端无法滑动 See merge request yunteng/thingskit-front!1129
Showing
3 changed files
with
8 additions
and
5 deletions
@@ -4,8 +4,8 @@ | @@ -4,8 +4,8 @@ | ||
4 | destroyOnClose | 4 | destroyOnClose |
5 | v-bind="$attrs" | 5 | v-bind="$attrs" |
6 | width="30rem" | 6 | width="30rem" |
7 | - :height="50" | ||
8 | - :minHeight="50" | 7 | + :height="75" |
8 | + :minHeight="75" | ||
9 | @register="register" | 9 | @register="register" |
10 | title="操作密码" | 10 | title="操作密码" |
11 | @ok="handleSuccess" | 11 | @ok="handleSuccess" |
@@ -33,6 +33,8 @@ | @@ -33,6 +33,8 @@ | ||
33 | const [registerForm, { getFieldsValue, validate }] = useForm({ | 33 | const [registerForm, { getFieldsValue, validate }] = useForm({ |
34 | labelWidth: 70, | 34 | labelWidth: 70, |
35 | schemas: formSchema, | 35 | schemas: formSchema, |
36 | + | ||
37 | + wrapperCol: { span: 12 }, | ||
36 | showActionButtonGroup: false, | 38 | showActionButtonGroup: false, |
37 | }); | 39 | }); |
38 | 40 |
@@ -4,7 +4,7 @@ export const formSchema: FormSchema[] = [ | @@ -4,7 +4,7 @@ export const formSchema: FormSchema[] = [ | ||
4 | { | 4 | { |
5 | field: 'password', | 5 | field: 'password', |
6 | label: '操作密码', | 6 | label: '操作密码', |
7 | - colProps: { span: 16 }, | 7 | + colProps: { span: 18 }, |
8 | component: 'InputPassword', | 8 | component: 'InputPassword', |
9 | required: true, | 9 | required: true, |
10 | componentProps: { | 10 | componentProps: { |
@@ -185,8 +185,8 @@ | @@ -185,8 +185,8 @@ | ||
185 | }); | 185 | }); |
186 | 186 | ||
187 | const phoneSize = ref({ | 187 | const phoneSize = ref({ |
188 | - width: '' || 375, | ||
189 | - height: '' || 667, | 188 | + width: 375, |
189 | + height: 667, | ||
190 | }); | 190 | }); |
191 | </script> | 191 | </script> |
192 | 192 | ||
@@ -286,6 +286,7 @@ | @@ -286,6 +286,7 @@ | ||
286 | <WidgetWrapper> | 286 | <WidgetWrapper> |
287 | <template #header> | 287 | <template #header> |
288 | <WidgetHeader | 288 | <WidgetHeader |
289 | + v-if="!getIsAppPage" | ||
289 | :raw-data-source="rawDataSource" | 290 | :raw-data-source="rawDataSource" |
290 | :source-info="item" | 291 | :source-info="item" |
291 | @update="handleUpdateWidget" | 292 | @update="handleUpdateWidget" |