cabloy 5.1.67 → 5.1.69

package/zova/src/suite/cabloy-basic/modules/basic-date/src/.metadata/component/date.ts

@@ -0,0 +1,61 @@
+import type {
+  DefineModelOptions,
+  TypePropUpdateFromModel,
+  TypePropValueFromModel,
+  TypeControllerInnerProps,
+} from 'zova';
+
+import { defineComponent } from 'vue';
+import { prepareComponentOptions, useController } from 'zova';
+
+import type {
+  ControllerDateModels,
+  ControllerDateProps,
+} from '../../component/date/controller.jsx';
+
+import { ControllerDate } from '../../component/date/controller.jsx';
+export type ZDateProps = {
+  controllerRef?: (ref: ControllerDate) => void;
+} & ControllerDateProps &
+  ControllerDateModels & {
+    [KEY in keyof ControllerDateModels as TypePropValueFromModel<KEY>]: ControllerDateModels[KEY];
+  } & {
+    [KEY in keyof ControllerDateModels as TypePropUpdateFromModel<KEY>]: (
+      value: ControllerDateModels[KEY],
+    ) => void;
+  };
+type TypeModelArguments = {
+  [KEY in keyof ControllerDateModels as TypePropValueFromModel<KEY>]: ControllerDateModels[KEY];
+};
+type ControllerInnerProps = TypeControllerInnerProps<
+  ControllerDateProps & {
+    [KEY in keyof ControllerDateModels as TypePropValueFromModel<KEY>]: ControllerDateModels[KEY];
+  },
+  keyof typeof ControllerDate.$propsDefault
+>;
+declare module 'zova-module-basic-date' {
+  export interface ControllerDate {
+    $props: ControllerInnerProps;
+    $useModel<K extends keyof TypeModelArguments>(
+      name: K,
+      options?: DefineModelOptions<TypeModelArguments[K]>,
+    ): ControllerInnerProps[K];
+  }
+}
+
+export const ZDate = defineComponent((_props: ZDateProps) => {
+  useController(ControllerDate, undefined, undefined);
+  return () => {};
+}, prepareComponentOptions());
+declare module 'zova-module-a-bean' {
+  export interface IVonaComponentRecord {
+    'basic-date:date': ControllerDateProps &
+      ControllerDateModels & {
+        [KEY in keyof ControllerDateModels as TypePropValueFromModel<KEY>]: ControllerDateModels[KEY];
+      } & {
+        [KEY in keyof ControllerDateModels as TypePropUpdateFromModel<KEY>]: (
+          value: ControllerDateModels[KEY],
+        ) => void;
+      };
+  }
+}

package/zova/src/suite/cabloy-basic/modules/basic-date/src/.metadata/index.ts

@@ -1,5 +1,6 @@
 // eslint-disable
 /** controller: begin */
+export * from '../component/date/controller.jsx';
 export * from '../component/dateRange/controller.jsx';
 export * from '../component/formFieldDate/controller.jsx';
 export * from '../component/formFieldDateRange/controller.jsx';
@@ -11,6 +12,11 @@ declare module 'zova' {
 }
 declare module 'zova-module-basic-date' {
   
+        export interface ControllerDate {
+          /** @internal */
+          get scope(): ScopeModuleBasicDate;
+        }
+
         export interface ControllerDateRange {
           /** @internal */
           get scope(): ScopeModuleBasicDate;
@@ -28,13 +34,15 @@ declare module 'zova-module-basic-date' {
 }
 /** controller: end */
 /** controller: begin */
+import { ControllerDate } from '../component/date/controller.jsx';
 import { ControllerDateRange } from '../component/dateRange/controller.jsx';
 import { ControllerFormFieldDate } from '../component/formFieldDate/controller.jsx';
 import { ControllerFormFieldDateRange } from '../component/formFieldDateRange/controller.jsx';
 import 'zova';
 declare module 'zova' {
   export interface IBeanRecordLocal {
-    'basic-date.controller.dateRange': ControllerDateRange;
+    'basic-date.controller.date': ControllerDate;
+'basic-date.controller.dateRange': ControllerDateRange;
 'basic-date.controller.formFieldDate': ControllerFormFieldDate;
 'basic-date.controller.formFieldDateRange': ControllerFormFieldDateRange;
   }
@@ -42,6 +50,8 @@ declare module 'zova' {
 /** controller: end */
 
 /** components: begin */
+export * from './component/date.js';
+import { ZDate } from './component/date.js';
 export * from './component/dateRange.js';
 import { ZDateRange } from './component/dateRange.js';
 export * from './component/formFieldDate.js';
@@ -49,19 +59,22 @@ import { ZFormFieldDate } from './component/formFieldDate.js';
 export * from './component/formFieldDateRange.js';
 import { ZFormFieldDateRange } from './component/formFieldDateRange.js';
 export const components = {
-  'dateRange': ZDateRange,
+  'date': ZDate,
+'dateRange': ZDateRange,
 'formFieldDate': ZFormFieldDate,
 'formFieldDateRange': ZFormFieldDateRange,
 };
 import 'zova';
 declare module 'zova' {
 export interface IComponentRecord {
-  'basic-date:dateRange': ControllerDateRange;
+  'basic-date:date': ControllerDate;
+'basic-date:dateRange': ControllerDateRange;
 'basic-date:formFieldDate': ControllerFormFieldDate;
 'basic-date:formFieldDateRange': ControllerFormFieldDateRange;
 }
 export interface IZovaComponentRecord {
-  'basic-date:dateRange': typeof ZDateRange;
+  'basic-date:date': typeof ZDate;
+'basic-date:dateRange': typeof ZDateRange;
 'basic-date:formFieldDate': typeof ZFormFieldDate;
 'basic-date:formFieldDateRange': typeof ZFormFieldDateRange;
 }

package/zova/src/suite/cabloy-basic/modules/basic-date/src/component/date/controller.tsx

@@ -0,0 +1,44 @@
+import { BeanControllerBase } from 'zova';
+import { Controller } from 'zova-module-a-bean';
+
+import type { TypeDateInputType } from '../../types/date.js';
+
+import { dateFromInputValue, dateToInputValue } from '../../lib/utils.js';
+
+export interface ControllerDateProps {
+  type?: TypeDateInputType;
+  onBlur?: () => void;
+}
+
+export interface ControllerDateModels {
+  vModel?: any;
+}
+
+@Controller()
+export class ControllerDate extends BeanControllerBase {
+  static $propsDefault = { type: 'date' as TypeDateInputType };
+
+  modelValue?: any;
+
+  protected async __init__() {
+    this.modelValue = this.$useModel('modelValue');
+  }
+
+  protected render() {
+    const { type, onBlur } = this.$props as ControllerDateProps;
+    return (
+      <input
+        type={type}
+        step={type === 'date' ? undefined : 1}
+        value={dateToInputValue(this.modelValue, type)}
+        onInput={e => {
+          const value = (e.target as HTMLInputElement).value;
+          this.modelValue = dateFromInputValue(value, type);
+        }}
+        onBlur={() => {
+          onBlur?.();
+        }}
+      />
+    );
+  }
+}

package/zova/src/suite/cabloy-basic/modules/basic-date/src/component/formFieldDate/controller.tsx

@@ -2,12 +2,14 @@ import type { IComponentOptions } from 'zova';
 import type { IFormFieldComponentOptions } from 'zova-module-a-form';
 import type { IResourceFormFieldOptionsBase } from 'zova-module-a-openapi';
 
+import { classes } from 'typestyle';
 import { BeanControllerBase } from 'zova';
 import { Controller } from 'zova-module-a-bean';
-import { ZFormFieldPreset } from 'zova-module-a-form';
+import { ZFormField, ZFormFieldPreset } from 'zova-module-a-form';
 
-import { dateFormatUtil } from '../../lib/utils.js';
-import { TypeDateFormatPreset } from '../../types/date.js';
+import { ZDate } from '../../.metadata/component/date.js';
+import { dateFormatUtil, dateInputTypeFromPreset } from '../../lib/utils.js';
+import { TypeDateFormatPreset, TypeDateInputType } from '../../types/date.js';
 
 declare module 'zova-module-a-openapi' {
   export interface IResourceFormFieldRecord {
@@ -18,6 +20,7 @@ declare module 'zova-module-a-openapi' {
 export interface IResourceFormFieldDateOptions extends IResourceFormFieldOptionsBase {
   preset?: TypeDateFormatPreset;
   format?: string;
+  inputType?: TypeDateInputType;
 }
 
 export interface ControllerFormFieldDateProps extends IFormFieldComponentOptions {
@@ -37,17 +40,54 @@ export class ControllerFormFieldDate extends BeanControllerBase {
   protected async __init__() {}
 
   protected render() {
-    const value = dateFormatUtil(this.$props.value, this.dateFormat);
+    if (this.$props.readonly) {
+      const value = dateFormatUtil(this.$props.value, this.dateOptions);
+      return (
+        <ZFormFieldPreset
+          {...this.$props}
+          render="basic-input:formFieldInput"
+          options={{ value }}
+        ></ZFormFieldPreset>
+      );
+    }
     return (
-      <ZFormFieldPreset
+      <ZFormField
         {...this.$props}
-        render="basic-input:formFieldInput"
-        options={{ value }}
-      ></ZFormFieldPreset>
+        slotDefault={({ propsBucket, props }, $$formField) => {
+          const className = !propsBucket.needHandleBorder
+            ? props.class
+            : classes(props.class, 'input', !$$formField.field.state.meta.isValid && 'input-error');
+          const propsNew: Omit<IResourceFormFieldDateOptions, 'style'> = {
+            'type': this.dateInputType,
+            'placeholder': undefined,
+            'modelValue': propsBucket.value,
+            'onUpdate:modelValue': (value: Date | undefined) => {
+              $$formField.setValue(value, propsBucket.disableNotifyChanged);
+            },
+            'onBlur': () => {
+              $$formField.handleBlur();
+            },
+            'onInput': (e: Event) => {
+              $$formField.setValue(
+                (e.target as HTMLInputElement).value,
+                propsBucket.disableNotifyChanged,
+              );
+            },
+            ...propsBucket.options,
+            ...props,
+            'class': className,
+          };
+          return <ZDate {...propsNew}></ZDate>;
+        }}
+      ></ZFormField>
     );
   }
 
-  get dateFormat(): IResourceFormFieldDateOptions | undefined {
+  get dateOptions(): IResourceFormFieldDateOptions | undefined {
     return this.$props.options;
   }
+
+  get dateInputType(): TypeDateInputType {
+    return this.dateOptions?.inputType ?? dateInputTypeFromPreset(this.dateOptions?.preset);
+  }
 }

package/zova/src/suite/cabloy-basic/modules/basic-date/src/lib/utils.ts

@@ -1,11 +1,16 @@
 import { DateTime } from 'luxon';
 
 import { ITableCellOptionsDate } from '../bean/tableCell.date.jsx';
+import { TypeDateInputType } from '../types/date.js';
 
 export function dateFormatUtil(value: any, options?: ITableCellOptionsDate) {
   if (!value) return;
   if (!options) return value;
-  const datetime = DateTime.fromJSDate(value);
+  const datetime = _normalizeDateTime(
+    value,
+    options.preset ? _dateInputTypeFromPreset(options.preset) : 'date',
+  );
+  if (!datetime) return value;
   if (options.format) {
     return datetime.toFormat(options.format);
   } else if (options.preset) {
@@ -13,3 +18,57 @@ export function dateFormatUtil(value: any, options?: ITableCellOptionsDate) {
   }
   return value;
 }
+
+export function dateInputTypeFromPreset(preset?: string): TypeDateInputType {
+  return _dateInputTypeFromPreset(preset);
+}
+
+export function dateToInputValue(value: any, type: TypeDateInputType = 'date') {
+  if (!value) return '';
+  const datetime = _normalizeDateTime(value, type);
+  if (!datetime) return '';
+  return _formatDateTimeForInput(datetime, type);
+}
+
+export function dateFromInputValue(value: string | undefined, type: TypeDateInputType = 'date') {
+  if (!value) return undefined;
+  const datetime = _parseInputValue(value, type);
+  return datetime?.toJSDate();
+}
+
+function _dateInputTypeFromPreset(preset?: string): TypeDateInputType {
+  if (!preset) return 'date';
+  if (preset.startsWith('TIME_')) return 'time';
+  if (preset.startsWith('DATETIME_')) return 'datetime-local';
+  return 'date';
+}
+
+function _normalizeDateTime(value: any, type: TypeDateInputType) {
+  if (value instanceof Date) {
+    const datetime = DateTime.fromJSDate(value);
+    return datetime.isValid ? datetime : undefined;
+  }
+  if (typeof value === 'string') {
+    return _parseInputValue(value, type);
+  }
+  return undefined;
+}
+
+function _parseInputValue(value: string, type: TypeDateInputType) {
+  const normalizedValue = type === 'datetime-local' && value.length === 16 ? `${value}:00` : value;
+  const datetime =
+    type === 'time'
+      ? DateTime.fromFormat(normalizedValue, normalizedValue.length === 5 ? 'HH:mm' : 'HH:mm:ss')
+      : DateTime.fromISO(normalizedValue);
+  return datetime.isValid ? datetime : undefined;
+}
+
+function _formatDateTimeForInput(datetime: DateTime, type: TypeDateInputType) {
+  if (type === 'time') {
+    return datetime.toFormat('HH:mm:ss');
+  }
+  if (type === 'datetime-local') {
+    return datetime.toFormat("yyyy-LL-dd'T'HH:mm:ss");
+  }
+  return datetime.toISODate() ?? '';
+}

package/zova/src/suite/cabloy-basic/modules/basic-date/src/types/date.ts

@@ -1,3 +1,5 @@
+export type TypeDateInputType = 'date' | 'datetime-local' | 'time';
+
 export type TypeDateFormatPreset =
   | 'DATE_SHORT'
   | 'DATE_MED'

package/zova/src/suite/cabloy-basic/modules/basic-resource/src/bean/tableCell.resourcePicker.tsx

@@ -11,7 +11,7 @@ import { ZSelectProps } from 'zova-module-basic-select';
 
 declare module 'zova-module-a-openapi' {
   export interface IResourceTableCellRecord {
-    'start-resource:resourcePicker'?: ITableCellOptionsResourcePicker;
+    'basic-resource:resourcePicker'?: ITableCellOptionsResourcePicker;
   }
 }
 

package/zova/src/suite/cabloy-basic/modules/basic-resource/src/component/formFieldResourcePicker/controller.tsx

@@ -12,7 +12,7 @@ import { ModelResource } from 'zova-module-rest-resource';
 
 declare module 'zova-module-a-openapi' {
   export interface IResourceFormFieldRecord {
-    'start-resource:formFieldResourcePicker'?: IResourceFormFieldResourcePickerOptions;
+    'basic-resource:formFieldResourcePicker'?: IResourceFormFieldResourcePickerOptions;
   }
 }
 

package/zova/src/suite-vendor/a-zova/modules/a-form/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-form",
-  "version": "5.1.40",
+  "version": "5.1.41",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "",
   "keywords": [

package/zova/src/suite-vendor/a-zova/modules/a-form/src/component/formField/controller.tsx

@@ -69,6 +69,14 @@ export class ControllerFormField<TParentData extends {} = {}> extends BeanContro
         return this._getFieldBehaviors();
       },
     });
+    this.$watch(
+      () => this.$$form.getFieldValue(this.name),
+      (newValue, oldValue) => {
+        if (newValue === oldValue) return;
+        // do something
+        console.log(this.name, newValue);
+      },
+    );
   }
 
   public get form() {

package/zova/src/suite-vendor/a-zova/modules/a-form/src/types/formField.ts

@@ -6,6 +6,7 @@ import type {
   IJsxRenderContextBase,
   IResourceFormFieldLayoutOptions,
   ISchemaRenderComponentPresetRecord,
+  TypeFormFieldOnEffect,
   TypeFormFieldRenderComponent,
   TypeFormFieldRenderComponentProvider,
   TypeRenderComponentPreset,
@@ -61,6 +62,7 @@ export interface IFormFieldOptionsBase<
   readonly?: boolean;
   required?: boolean;
   disableNotifyChanged?: boolean;
+  onEffect?: TypeFormFieldOnEffect;
   validators?: IFormFieldValidatorsOptionsBase;
   // onChange?: (e: Event) => void; // allow set to null, but not provide null type
   // onInput?: (e: Event) => void; // allow set to null, but not provide null type

package/zova/src/suite-vendor/a-zova/modules/a-openapi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-openapi",
-  "version": "5.1.40",
+  "version": "5.1.41",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "",
   "keywords": [

package/zova/src/suite-vendor/a-zova/modules/a-openapi/src/types/rest.ts

@@ -11,6 +11,8 @@ import { IResourceRenderBlockOptionsBlock } from './resource/block.js';
 import { IResourceFormFieldRecord } from './resource/formField.js';
 import { IResourceTableActionRowRecord } from './resource/tableActionRow.js';
 
+export type TypeFormFieldOnEffect = (value: any) => void;
+
 export interface ISchemaRenderComponentPresetRecord extends IResourceFormFieldRecord {}
 
 export interface ISchemaObjectExtensionFieldRest {
@@ -21,6 +23,7 @@ export interface ISchemaObjectExtensionFieldRest {
   'order'?: number;
   'disableNotifyChanged'?: boolean;
   'readonly'?: boolean;
+  'onEffect'?: TypeFormFieldOnEffect;
   //
   'render'?: TypeFormFieldRenderComponentNormal | TypeTableCellRenderComponentNormal;
   'table'?: Omit<ISchemaObjectExtensionFieldRest, TypeSchemaScene>;

package/zova/src/suite-vendor/a-zova/modules/a-zod/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-zod",
-  "version": "5.1.33",
+  "version": "5.1.34",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "",
   "keywords": [
@@ -36,7 +36,7 @@
   "dependencies": {
     "@cabloy/zod-errors-custom": "^2.1.9",
     "@cabloy/zod-openapi": "^1.1.9",
-    "@cabloy/zod-query": "^2.1.11",
+    "@cabloy/zod-query": "^2.1.12",
     "zod": "^4.4.3"
   },
   "devDependencies": {

package/zova/src/suite-vendor/a-zova/modules/a-zova/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-zova",
-  "version": "5.1.77",
+  "version": "5.1.78",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "keywords": [
@@ -43,7 +43,7 @@
     "@cabloy/word-utils": "^2.1.14",
     "defu": "^6.1.7",
     "luxon": "^3.7.2",
-    "zova-jsx": "^1.1.63"
+    "zova-jsx": "^1.1.64"
   },
   "devDependencies": {
     "@cabloy/cli": "^3.1.23",

package/zova/src/suite-vendor/a-zova/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-suite-a-zova",
-  "version": "5.1.112",
+  "version": "5.1.114",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "license": "MIT",
@@ -16,13 +16,13 @@
     "zova-module-a-boundary": "^5.1.21",
     "zova-module-a-command": "^5.1.33",
     "zova-module-a-fetch": "^5.1.23",
-    "zova-module-a-form": "^5.1.40",
+    "zova-module-a-form": "^5.1.41",
     "zova-module-a-icon": "^5.1.26",
     "zova-module-a-interceptor": "^5.1.29",
     "zova-module-a-logger": "^5.1.26",
     "zova-module-a-meta": "^5.1.21",
     "zova-module-a-model": "^5.1.30",
-    "zova-module-a-openapi": "^5.1.40",
+    "zova-module-a-openapi": "^5.1.41",
     "zova-module-a-router": "^5.1.29",
     "zova-module-a-routerstack": "^5.1.26",
     "zova-module-a-routertabs": "^5.1.32",
@@ -31,8 +31,8 @@
     "zova-module-a-ssrserver": "^5.1.22",
     "zova-module-a-style": "^5.1.32",
     "zova-module-a-table": "^5.1.36",
-    "zova-module-a-zod": "^5.1.33",
-    "zova-module-a-zova": "^5.1.77"
+    "zova-module-a-zod": "^5.1.34",
+    "zova-module-a-zova": "^5.1.78"
   },
   "title": "a-zova"
 }