Browse Source

表格优化提交

main
likunming 1 year ago
parent
commit
45b1d6d359
  1. 12
      io.sc.platform.core.frontend/src/platform/components/form/elements/WCheckbox.vue
  2. 14
      io.sc.platform.core.frontend/src/platform/components/form/elements/WDate.vue
  3. 14
      io.sc.platform.core.frontend/src/platform/components/form/elements/WNumber.vue
  4. 14
      io.sc.platform.core.frontend/src/platform/components/form/elements/WPassword.vue
  5. 14
      io.sc.platform.core.frontend/src/platform/components/form/elements/WSelect.vue
  6. 14
      io.sc.platform.core.frontend/src/platform/components/form/elements/WText.vue
  7. 14
      io.sc.platform.core.frontend/src/platform/components/form/elements/WTextBtn.vue
  8. 14
      io.sc.platform.core.frontend/src/platform/components/form/elements/WTextarea.vue
  9. 17
      io.sc.platform.core.frontend/src/views/likm/Form.vue

12
io.sc.platform.core.frontend/src/platform/components/form/elements/WCheckbox.vue

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<q-checkbox v-show="!hideIfComputed" v-bind="attrs" :rules="rulesComputed" :disable="disableIfComputed"></q-checkbox> <q-checkbox v-show="showIfComputed" v-bind="attrs" :rules="rulesComputed" :disable="disableIfComputed"></q-checkbox>
</div> </div>
</template> </template>
@ -11,10 +11,10 @@ import { computed, defineProps, useAttrs } from 'vue';
const attrs = useAttrs(); const attrs = useAttrs();
const inRules = attrs.rules; const inRules = attrs.rules;
const props = defineProps({ const props = defineProps({
hideIf: { showIf: {
type: Function, type: Function,
default: () => { default: () => {
return false; return true;
}, },
}, },
disableIf: { disableIf: {
@ -31,14 +31,14 @@ const props = defineProps({
const rulesComputed = computed(() => { const rulesComputed = computed(() => {
let rules = inRules || <any>[]; let rules = inRules || <any>[];
if (hideIfComputed.value) { if (!showIfComputed.value) {
rules = []; rules = [];
} }
return rules; return rules;
}); });
const hideIfComputed = computed(() => { const showIfComputed = computed(() => {
return props.hideIf(props.form); return props.showIf(props.form);
}); });
const disableIfComputed = computed(() => { const disableIfComputed = computed(() => {
return props.disableIf(props.form); return props.disableIf(props.form);

14
io.sc.platform.core.frontend/src/platform/components/form/elements/WDate.vue

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<q-input <q-input
v-show="!hideIfComputed" v-show="showIfComputed"
ref="dateRef" ref="dateRef"
:hide-bottom-space="true" :hide-bottom-space="true"
:hide-hint="true" :hide-hint="true"
@ -38,10 +38,10 @@ const date = ref(null);
const attrs = useAttrs(); const attrs = useAttrs();
const inRules = attrs.rules; const inRules = attrs.rules;
const props = defineProps({ const props = defineProps({
hideIf: { showIf: {
type: Function, type: Function,
default: () => { default: () => {
return false; return true;
}, },
}, },
required: { required: {
@ -79,9 +79,9 @@ watch(
const rulesComputed = computed(() => { const rulesComputed = computed(() => {
let rules = inRules || <any>[]; let rules = inRules || <any>[];
if (!hideIfComputed.value && requiredIfComputed.value) { if (showIfComputed.value && requiredIfComputed.value) {
rules.push(FormValidators.required()); rules.push(FormValidators.required());
} else if (hideIfComputed.value) { } else if (!showIfComputed.value) {
rules = []; rules = [];
} }
if (dateRef?.value) { if (dateRef?.value) {
@ -90,8 +90,8 @@ const rulesComputed = computed(() => {
return rules; return rules;
}); });
const hideIfComputed = computed(() => { const showIfComputed = computed(() => {
return props.hideIf(props.form); return props.showIf(props.form);
}); });
const requiredIfComputed = computed(() => { const requiredIfComputed = computed(() => {
if (props.requiredIf) { if (props.requiredIf) {

14
io.sc.platform.core.frontend/src/platform/components/form/elements/WNumber.vue

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<q-input <q-input
v-show="!hideIfComputed" v-show="showIfComputed"
ref="numberRef" ref="numberRef"
:hide-bottom-space="true" :hide-bottom-space="true"
:hide-hint="true" :hide-hint="true"
@ -28,10 +28,10 @@ const attrs = useAttrs();
const inRules = attrs.rules; const inRules = attrs.rules;
const props = defineProps({ const props = defineProps({
precision: { type: Number, default: 0 }, precision: { type: Number, default: 0 },
hideIf: { showIf: {
type: Function, type: Function,
default: () => { default: () => {
return false; return true;
}, },
}, },
required: { required: {
@ -63,9 +63,9 @@ const props = defineProps({
const rulesComputed = computed(() => { const rulesComputed = computed(() => {
let rules = inRules || <any>[]; let rules = inRules || <any>[];
rules.push(FormValidators.maxPrecision(props.precision)); rules.push(FormValidators.maxPrecision(props.precision));
if (!hideIfComputed.value && requiredIfComputed.value) { if (showIfComputed.value && requiredIfComputed.value) {
rules.push(FormValidators.required()); rules.push(FormValidators.required());
} else if (hideIfComputed.value) { } else if (!showIfComputed.value) {
rules = []; rules = [];
} }
if (numberRef?.value) { if (numberRef?.value) {
@ -74,8 +74,8 @@ const rulesComputed = computed(() => {
return rules; return rules;
}); });
const hideIfComputed = computed(() => { const showIfComputed = computed(() => {
return props.hideIf(props.form); return props.showIf(props.form);
}); });
const requiredIfComputed = computed(() => { const requiredIfComputed = computed(() => {
if (props.requiredIf) { if (props.requiredIf) {

14
io.sc.platform.core.frontend/src/platform/components/form/elements/WPassword.vue

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<q-input <q-input
v-show="!hideIfComputed" v-show="showIfComputed"
ref="pwdRef" ref="pwdRef"
:hide-bottom-space="true" :hide-bottom-space="true"
:hide-hint="true" :hide-hint="true"
@ -27,10 +27,10 @@ const pwdRef = ref();
const attrs = useAttrs(); const attrs = useAttrs();
const inRules = attrs.rules; const inRules = attrs.rules;
const props = defineProps({ const props = defineProps({
hideIf: { showIf: {
type: Function, type: Function,
default: () => { default: () => {
return false; return true;
}, },
}, },
required: { required: {
@ -61,9 +61,9 @@ const props = defineProps({
const rulesComputed = computed(() => { const rulesComputed = computed(() => {
let rules = inRules || <any>[]; let rules = inRules || <any>[];
if (!hideIfComputed.value && requiredIfComputed.value) { if (showIfComputed.value && requiredIfComputed.value) {
rules.push(FormValidators.required()); rules.push(FormValidators.required());
} else if (hideIfComputed.value) { } else if (!showIfComputed.value) {
rules = []; rules = [];
} }
if (pwdRef?.value) { if (pwdRef?.value) {
@ -72,8 +72,8 @@ const rulesComputed = computed(() => {
return rules; return rules;
}); });
const hideIfComputed = computed(() => { const showIfComputed = computed(() => {
return props.hideIf(props.form); return props.showIf(props.form);
}); });
const requiredIfComputed = computed(() => { const requiredIfComputed = computed(() => {
if (props.requiredIf) { if (props.requiredIf) {

14
io.sc.platform.core.frontend/src/platform/components/form/elements/WSelect.vue

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<q-select <q-select
v-show="!hideIfComputed" v-show="showIfComputed"
ref="selectRef" ref="selectRef"
emit-value emit-value
map-options map-options
@ -27,10 +27,10 @@ const selectRef = ref();
const attrs = useAttrs(); const attrs = useAttrs();
const inRules = attrs.rules; const inRules = attrs.rules;
const props = defineProps({ const props = defineProps({
hideIf: { showIf: {
type: Function, type: Function,
default: () => { default: () => {
return false; return true;
}, },
}, },
required: { required: {
@ -61,9 +61,9 @@ const props = defineProps({
const rulesComputed = computed(() => { const rulesComputed = computed(() => {
let rules = inRules || <any>[]; let rules = inRules || <any>[];
if (!hideIfComputed.value && requiredIfComputed.value) { if (showIfComputed.value && requiredIfComputed.value) {
rules.push(FormValidators.required()); rules.push(FormValidators.required());
} else if (hideIfComputed.value) { } else if (!showIfComputed.value) {
rules = []; rules = [];
} }
if (selectRef?.value) { if (selectRef?.value) {
@ -72,8 +72,8 @@ const rulesComputed = computed(() => {
return rules; return rules;
}); });
const hideIfComputed = computed(() => { const showIfComputed = computed(() => {
return props.hideIf(props.form); return props.showIf(props.form);
}); });
const requiredIfComputed = computed(() => { const requiredIfComputed = computed(() => {
if (props.requiredIf) { if (props.requiredIf) {

14
io.sc.platform.core.frontend/src/platform/components/form/elements/WText.vue

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<q-input <q-input
v-show="!hideIfComputed" v-show="showIfComputed"
ref="textRef" ref="textRef"
:hide-bottom-space="true" :hide-bottom-space="true"
:hide-hint="true" :hide-hint="true"
@ -26,10 +26,10 @@ const textRef = ref();
const attrs = useAttrs(); const attrs = useAttrs();
const inRules = attrs.rules; const inRules = attrs.rules;
const props = defineProps({ const props = defineProps({
hideIf: { showIf: {
type: Function, type: Function,
default: () => { default: () => {
return false; return true;
}, },
}, },
required: { required: {
@ -60,9 +60,9 @@ const props = defineProps({
const rulesComputed = computed(() => { const rulesComputed = computed(() => {
let rules = inRules || <any>[]; let rules = inRules || <any>[];
if (!hideIfComputed.value && requiredIfComputed.value) { if (showIfComputed.value && requiredIfComputed.value) {
rules.push(FormValidators.required()); rules.push(FormValidators.required());
} else if (hideIfComputed.value) { } else if (!showIfComputed.value) {
rules = []; rules = [];
} }
if (textRef?.value) { if (textRef?.value) {
@ -71,8 +71,8 @@ const rulesComputed = computed(() => {
return rules; return rules;
}); });
const hideIfComputed = computed(() => { const showIfComputed = computed(() => {
return props.hideIf(props.form); return props.showIf(props.form);
}); });
const requiredIfComputed = computed(() => { const requiredIfComputed = computed(() => {
if (props.requiredIf) { if (props.requiredIf) {

14
io.sc.platform.core.frontend/src/platform/components/form/elements/WTextBtn.vue

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<q-input <q-input
v-show="!hideIfComputed" v-show="showIfComputed"
ref="textBtnRef" ref="textBtnRef"
:hide-bottom-space="true" :hide-bottom-space="true"
:hide-hint="true" :hide-hint="true"
@ -38,10 +38,10 @@ const textBtnRef = ref();
const attrs = useAttrs(); const attrs = useAttrs();
const inRules = attrs.rules; const inRules = attrs.rules;
const props = defineProps({ const props = defineProps({
hideIf: { showIf: {
type: Function, type: Function,
default: () => { default: () => {
return false; return true;
}, },
}, },
required: { required: {
@ -72,9 +72,9 @@ const props = defineProps({
const rulesComputed = computed(() => { const rulesComputed = computed(() => {
let rules = inRules || <any>[]; let rules = inRules || <any>[];
if (!hideIfComputed.value && requiredIfComputed.value) { if (showIfComputed.value && requiredIfComputed.value) {
rules.push(FormValidators.required()); rules.push(FormValidators.required());
} else if (hideIfComputed.value) { } else if (!showIfComputed.value) {
rules = []; rules = [];
} }
if (textBtnRef?.value) { if (textBtnRef?.value) {
@ -83,8 +83,8 @@ const rulesComputed = computed(() => {
return rules; return rules;
}); });
const hideIfComputed = computed(() => { const showIfComputed = computed(() => {
return props.hideIf(props.form); return props.showIf(props.form);
}); });
const requiredIfComputed = computed(() => { const requiredIfComputed = computed(() => {
if (props.requiredIf) { if (props.requiredIf) {

14
io.sc.platform.core.frontend/src/platform/components/form/elements/WTextarea.vue

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<q-input <q-input
v-show="!hideIfComputed" v-show="showIfComputed"
ref="textareaRef" ref="textareaRef"
:hide-bottom-space="true" :hide-bottom-space="true"
:hide-hint="true" :hide-hint="true"
@ -26,10 +26,10 @@ const textareaRef = ref();
const attrs = useAttrs(); const attrs = useAttrs();
const inRules = attrs.rules; const inRules = attrs.rules;
const props = defineProps({ const props = defineProps({
hideIf: { showIf: {
type: Function, type: Function,
default: () => { default: () => {
return false; return true;
}, },
}, },
required: { required: {
@ -60,9 +60,9 @@ const props = defineProps({
const rulesComputed = computed(() => { const rulesComputed = computed(() => {
let rules = inRules || <any>[]; let rules = inRules || <any>[];
if (!hideIfComputed.value && requiredIfComputed.value) { if (showIfComputed.value && requiredIfComputed.value) {
rules.push(FormValidators.required()); rules.push(FormValidators.required());
} else if (hideIfComputed.value) { } else if (!showIfComputed.value) {
rules = []; rules = [];
} }
if (textareaRef?.value) { if (textareaRef?.value) {
@ -71,8 +71,8 @@ const rulesComputed = computed(() => {
return rules; return rules;
}); });
const hideIfComputed = computed(() => { const showIfComputed = computed(() => {
return props.hideIf(props.form); return props.showIf(props.form);
}); });
const requiredIfComputed = computed(() => { const requiredIfComputed = computed(() => {
if (props.requiredIf) { if (props.requiredIf) {

17
io.sc.platform.core.frontend/src/views/likm/Form.vue

@ -89,11 +89,11 @@ const aaaa = {
options: ['1', '0'], options: ['1', '0'],
requiredIf: () => true, requiredIf: () => true,
'onUpdate:modelValue': (value) => { 'onUpdate:modelValue': (value) => {
if (value === 1) { // if (value === 1) {
formRef.value.fields.addr.label = '地址2222'; // formRef.value.fields.addr.label = '2222';
} else { // } else {
formRef.value.fields.addr.label = '地址3333'; // formRef.value.fields.addr.label = '3333';
} // }
}, },
}, },
{ {
@ -126,6 +126,13 @@ const aaaa = {
colsFirst: true, colsFirst: true,
colspan: 2, colspan: 2,
type: 'w-checkbox', type: 'w-checkbox',
// showIf: (form) => {
// if (form.getFieldValue('sex') === '1') {
// return true;
// } else {
// return false;
// }
// },
// disableIf: () => { // disableIf: () => {
// return true; // return true;
// }, // },

Loading…
Cancel
Save