diff --git a/io.sc.platform.core.frontend/src/platform/components-ext/formater/DatetimeFormater.ts b/io.sc.platform.core.frontend/src/platform/components-ext/formater/DatetimeFormater.ts
index a2572724..7c9d4992 100644
--- a/io.sc.platform.core.frontend/src/platform/components-ext/formater/DatetimeFormater.ts
+++ b/io.sc.platform.core.frontend/src/platform/components-ext/formater/DatetimeFormater.ts
@@ -7,7 +7,7 @@ import { DateTools } from '@/platform/utils';
*/
const dateOnlyFormater = (value) => {
if (value) {
- return '' + DateTools.format(value, 'YYYY-MM-DD') + '';
+ return DateTools.format(value, 'YYYY-MM-DD');
}
return '';
};
diff --git a/io.sc.platform.core.frontend/src/platform/components/date/WDateRange.vue b/io.sc.platform.core.frontend/src/platform/components/date/WDateRange.vue
index c6456623..f541d555 100644
--- a/io.sc.platform.core.frontend/src/platform/components/date/WDateRange.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/date/WDateRange.vue
@@ -11,6 +11,7 @@
name: 'from',
type: 'w-date',
autoClose: false,
+ clearable: true,
options: (date) => {
if (dateRangeRef) {
const toValue = dateRangeRef.getFieldValue('to');
@@ -27,6 +28,7 @@
name: 'to',
type: 'w-date',
autoClose: false,
+ clearable: true,
options: (date) => {
if (dateRangeRef) {
const fromValue = dateRangeRef.getFieldValue('from');
diff --git a/io.sc.platform.core.frontend/src/platform/components/dialog/WLoadingDialog.vue b/io.sc.platform.core.frontend/src/platform/components/dialog/WLoadingDialog.vue
new file mode 100644
index 00000000..e4059f37
--- /dev/null
+++ b/io.sc.platform.core.frontend/src/platform/components/dialog/WLoadingDialog.vue
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/io.sc.platform.core.frontend/src/platform/components/form/FormField.ts b/io.sc.platform.core.frontend/src/platform/components/form/FormField.ts
index 0595145c..6c59f644 100644
--- a/io.sc.platform.core.frontend/src/platform/components/form/FormField.ts
+++ b/io.sc.platform.core.frontend/src/platform/components/form/FormField.ts
@@ -104,7 +104,7 @@ export abstract class FormFieldMethods {
if (typeof props_.requiredIf === 'boolean') {
return props_.requiredIf;
} else if (typeof props_.requiredIf === 'function') {
- return props_.requiredIf({ value: value_, form: props_.form }) || false;
+ return props_.requiredIf({ value: value_, form: props_.form, name: props_.name }) || false;
}
}
return false;
@@ -120,7 +120,7 @@ export abstract class FormFieldMethods {
if (typeof props_.showIf === 'boolean') {
return props_.showIf;
} else if (typeof props_.showIf === 'function') {
- return props_.showIf({ value: value_, form: props_.form }) || false;
+ return props_.showIf({ value: value_, form: props_.form, name: props_.name }) || false;
}
}
return true;
@@ -139,7 +139,7 @@ export abstract class FormFieldMethods {
if (typeof props_.readOnlyIf === 'boolean') {
return props_.readOnlyIf;
} else if (typeof props_.readOnlyIf === 'function') {
- return props_.readOnlyIf({ value: value_, form: props_.form }) || false;
+ return props_.readOnlyIf({ value: value_, form: props_.form, name: props_.name }) || false;
}
}
return false;
@@ -155,7 +155,7 @@ export abstract class FormFieldMethods {
if (typeof props_.disableIf === 'boolean') {
return props_.disableIf;
} else if (typeof props_.disableIf === 'function') {
- return props_.disableIf({ value: value_, form: props_.form }) || false;
+ return props_.disableIf({ value: value_, form: props_.form, name: props_.name }) || false;
}
}
return false;
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/WGrid.vue b/io.sc.platform.core.frontend/src/platform/components/grid/WGrid.vue
index 05aefd2d..cc65d45a 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/WGrid.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/WGrid.vue
@@ -76,7 +76,7 @@