@airpower/web 1.9.5 → 1.9.7

package/dist/components/form/FormField.vue.d.ts

@@ -6,7 +6,6 @@ import { RootEntity } from '../../model/RootEntity';
 declare const _default: <E extends RootEntity>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
     props: __VLS_PrettifyLocal<Pick<Partial<{
         disabled: boolean;
-        list: IEnum<number>[];
         entity: ITransformerConstructor<E>;
         modelValue: [{
             type: PropType<E>;
@@ -17,6 +16,7 @@ declare const _default: <E extends RootEntity>(__VLS_props: NonNullable<Awaited<
         };
         readonly: boolean;
         disabledValue: string | number | boolean | unknown[] | Record<string, any>;
+        list: IEnum<number>[];
         tree: (ITree & E)[];
     }> & Omit<{
         readonly disabled: boolean;
@@ -30,15 +30,15 @@ declare const _default: <E extends RootEntity>(__VLS_props: NonNullable<Awaited<
             default: null;
         }, undefined>;
         readonly readonly: boolean;
-        readonly list?: IEnum<number>[] | undefined;
         readonly disabledValue?: string | number | boolean | unknown[] | Record<string, any> | undefined;
+        readonly list?: IEnum<number>[] | undefined;
         readonly tree?: (ITree & E)[] | undefined;
         readonly onClear?: (() => any) | undefined;
         readonly onBlur?: (() => any) | undefined;
         readonly onChange?: ((value: E) => any) | undefined;
         readonly "onUpdate:modelValue"?: ((value: E) => any) | undefined;
         readonly onFocus?: (() => any) | undefined;
-    } & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps, "disabled" | "list" | "entity" | "modelValue" | "readonly" | "disabledValue" | "tree">, "onFocus" | "onBlur" | "onChange" | "field" | "onClear" | "onUpdate:modelValue" | ("disabled" | "list" | "entity" | "modelValue" | "readonly" | "disabledValue" | "tree")> & {} & Partial<{}>> & import('vue').PublicProps;
+    } & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps, "disabled" | "entity" | "modelValue" | "readonly" | "disabledValue" | "list" | "tree">, "onFocus" | "onBlur" | "onChange" | "field" | "onClear" | "onUpdate:modelValue" | ("disabled" | "entity" | "modelValue" | "readonly" | "disabledValue" | "list" | "tree")> & {} & Partial<{}>> & import('vue').PublicProps;
     expose(exposed: import('vue').ShallowUnwrapRef<{}>): void;
     attrs: any;
     slots: {

package/dist/components/image/Image.vue.d.ts

@@ -6,12 +6,12 @@ declare const _default: <F extends IFile & RootEntity>(__VLS_props: NonNullable<
         width: number;
         placeholder: string;
         data: IJson<any>;
-        headers: IJson<any>;
         clearable: boolean;
         height: number;
         entity: ITransformerConstructor<F>;
         src: string;
         upload: boolean;
+        headers: IJson<any>;
         showTips: boolean;
         limit: number;
         extensions: unknown[];
@@ -20,10 +20,10 @@ declare const _default: <F extends IFile & RootEntity>(__VLS_props: NonNullable<
     }> & Omit<{
         readonly width: number;
         readonly data: IJson<any>;
-        readonly headers: IJson<any>;
         readonly clearable: boolean;
         readonly height: number;
         readonly upload: boolean;
+        readonly headers: IJson<any>;
         readonly showTips: boolean;
         readonly limit: number;
         readonly extensions: unknown[];
@@ -34,7 +34,7 @@ declare const _default: <F extends IFile & RootEntity>(__VLS_props: NonNullable<
         readonly src?: string | undefined;
         readonly onUpload?: ((file: F) => any) | undefined;
         readonly onRemove?: (() => any) | undefined;
-    } & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps, "width" | "placeholder" | "data" | "headers" | "clearable" | "height" | "entity" | "src" | "upload" | "showTips" | "limit" | "extensions" | "uploadUrl" | "uploadFileName">, "onUpload" | "onRemove" | ("width" | "placeholder" | "data" | "headers" | "clearable" | "height" | "entity" | "src" | "upload" | "showTips" | "limit" | "extensions" | "uploadUrl" | "uploadFileName")> & {} & Partial<{}>> & import('vue').PublicProps;
+    } & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps, "width" | "placeholder" | "data" | "clearable" | "height" | "entity" | "src" | "upload" | "headers" | "showTips" | "limit" | "extensions" | "uploadUrl" | "uploadFileName">, "onUpload" | "onRemove" | ("width" | "placeholder" | "data" | "clearable" | "height" | "entity" | "src" | "upload" | "headers" | "showTips" | "limit" | "extensions" | "uploadUrl" | "uploadFileName")> & {} & Partial<{}>> & import('vue').PublicProps;
     expose(exposed: import('vue').ShallowUnwrapRef<{}>): void;
     attrs: any;
     slots: {};

package/dist/components/input/Input.vue.d.ts

@@ -6,12 +6,12 @@ declare const _default: <E extends RootEntity, T extends ITree & E, EM extends I
     props: __VLS_PrettifyLocal<Pick<Partial<{
         disabled: boolean;
         placeholder: string;
-        list: EM[];
         dateShowFormatter: string;
         entity: ITransformerConstructor<E>;
         modelValue: string | number | boolean | unknown[] | Record<string, any>;
         readonly: boolean;
         disabledValue: string | number | boolean | unknown[] | Record<string, any>;
+        list: EM[];
         tree: T[];
         modelModifiers: Record<string, any>;
         modifier: string;
@@ -24,11 +24,11 @@ declare const _default: <E extends RootEntity, T extends ITree & E, EM extends I
         readonly modelModifiers: Record<string, any>;
         readonly showClear: boolean;
         readonly onSearch: Function;
-        readonly list?: EM[] | undefined;
         readonly dateShowFormatter?: string | undefined;
         readonly entity?: ITransformerConstructor<E> | undefined;
         readonly modelValue?: string | number | boolean | unknown[] | Record<string, any> | undefined;
         readonly disabledValue?: string | number | boolean | unknown[] | Record<string, any> | undefined;
+        readonly list?: EM[] | undefined;
         readonly tree?: T[] | undefined;
         readonly modifier?: string | undefined;
         readonly onClear?: ((...args: any[]) => any) | undefined;
@@ -36,7 +36,7 @@ declare const _default: <E extends RootEntity, T extends ITree & E, EM extends I
         readonly onChange?: ((...args: any[]) => any) | undefined;
         readonly "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
         readonly onFocus?: ((...args: any[]) => any) | undefined;
-    } & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps, "disabled" | "placeholder" | "list" | "dateShowFormatter" | "entity" | "modelValue" | "readonly" | "disabledValue" | "tree" | "modelModifiers" | "modifier" | "showClear" | "onSearch">, "onFocus" | "onBlur" | "onChange" | "onClear" | "onUpdate:modelValue" | ("disabled" | "placeholder" | "list" | "dateShowFormatter" | "entity" | "modelValue" | "readonly" | "disabledValue" | "tree" | "modelModifiers" | "modifier" | "showClear" | "onSearch")> & {} & Partial<{}>> & import('vue').PublicProps;
+    } & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps, "disabled" | "placeholder" | "dateShowFormatter" | "entity" | "modelValue" | "readonly" | "disabledValue" | "list" | "tree" | "modelModifiers" | "modifier" | "showClear" | "onSearch">, "onFocus" | "onBlur" | "onChange" | "onClear" | "onUpdate:modelValue" | ("disabled" | "placeholder" | "dateShowFormatter" | "entity" | "modelValue" | "readonly" | "disabledValue" | "list" | "tree" | "modelModifiers" | "modifier" | "showClear" | "onSearch")> & {} & Partial<{}>> & import('vue').PublicProps;
     expose(exposed: import('vue').ShallowUnwrapRef<{}>): void;
     attrs: any;
     slots: Partial<Record<NonNullable<string | number | symbol>, (_: {}) => any>>;

package/dist/main.js

@@ -13481,9 +13481,6 @@ const _sfc_main$j = /* @__PURE__ */ defineComponent({
     const props = __props;
     const emits = __emit;
     const value = ref(props.modelValue);
-    function emitChange() {
-      emits("change", value.value);
-    }
     function emitBlur() {
       emits("blur");
     }
@@ -13580,10 +13577,6 @@ const _sfc_main$j = /* @__PURE__ */ defineComponent({
         value.value = Number.parseFloat(value.value?.toString() || "0");
       }
     }
-    function onClear() {
-      emitClear();
-      emitChange();
-    }
     function emitValue() {
       if (formConfig.value && value.value) {
         switch (formConfig.value.trim) {
@@ -13602,6 +13595,7 @@ const _sfc_main$j = /* @__PURE__ */ defineComponent({
       emitChange();
     }
     function onKeyDown(event) {
+      checkNumberValue();
       switch (event.code) {
         case "KeyE":
           if (formConfig.value?.number) {
@@ -13616,10 +13610,8 @@ const _sfc_main$j = /* @__PURE__ */ defineComponent({
           break;
       }
     }
-    function onBlur() {
-      checkNumberValue();
-      emitValue();
-      emitBlur();
+    function emitChange() {
+      emits("change", value.value);
     }
     watch(value, () => {
       emitValue();
@@ -13675,7 +13667,7 @@ const _sfc_main$j = /* @__PURE__ */ defineComponent({
             type: formConfig.value.dateType,
             "value-format": formConfig.value.dateFormatter ? formConfig.value.dateFormatter.key : unref(DateTimeFormatter).TIMESTAMP.key,
             style: { "width": "100%" },
-            onClear,
+            onClear: emitClear,
             onFocus: emitFocus,
             onKeydown: onKeyDown
           }, null, 8, ["modelValue", "clearable", "disabled", "format", "placeholder", "prefix-icon", "readonly", "suffix-icon", "type", "value-format"])) : (openBlock(), createBlock(_component_el_time_picker, {
@@ -13691,7 +13683,7 @@ const _sfc_main$j = /* @__PURE__ */ defineComponent({
             "suffix-icon": formConfig.value?.suffixIcon,
             "value-format": formConfig.value.dateFormatter ? formConfig.value.dateFormatter.key : unref(DateTimeFormatter).TIMESTAMP.key,
             style: { "width": "100%" },
-            onClear,
+            onClear: emitClear,
             onFocus: emitFocus,
             onKeydown: onKeyDown
           }, null, 8, ["modelValue", "clearable", "disabled", "format", "placeholder", "prefix-icon", "readonly", "suffix-icon", "value-format"]))
@@ -13765,7 +13757,8 @@ const _sfc_main$j = /* @__PURE__ */ defineComponent({
             "suffix-icon": formConfig.value?.suffixIcon,
             "collapse-tags-tooltip": "",
             "fit-input-width": "",
-            onClear,
+            onChange: emitChange,
+            onClear: emitClear,
             onFocus: emitFocus,
             onKeydown: onKeyDown
           }, {
@@ -13813,7 +13806,7 @@ const _sfc_main$j = /* @__PURE__ */ defineComponent({
           class: "a-input-cascader",
           "collapse-tags-tooltip": "",
           "popper-class": "a-input-cascader-popper",
-          onClear,
+          onClear: emitClear,
           onFocus: emitFocus,
           onKeydown: onKeyDown
         }, null, 8, ["modelValue", "clearable", "collapse-tags", "disabled", "options", "placeholder", "props", "readonly", "show-all-levels"])) : (openBlock(), createBlock(_component_el_input, {
@@ -13833,9 +13826,9 @@ const _sfc_main$j = /* @__PURE__ */ defineComponent({
           "show-word-limit": formConfig.value?.showLimit !== false,
           "suffix-icon": formConfig.value?.suffixIcon,
           type: getInputType.value,
-          onBlur,
-          onChange: checkNumberValue,
-          onClear,
+          onBlur: emitBlur,
+          onChange: emitChange,
+          onClear: emitClear,
           onFocus: emitFocus,
           onKeydown: onKeyDown
         }, createSlots({ _: 2 }, [
@@ -13850,7 +13843,7 @@ const _sfc_main$j = /* @__PURE__ */ defineComponent({
                   name === "suffix" ? (openBlock(), createElementBlock(Fragment, { key: 1 }, [
                     isClearButtonShow.value ? (openBlock(), createBlock(_component_el_icon, {
                       key: 0,
-                      onClick: _cache[7] || (_cache[7] = ($event) => onClear())
+                      onClick: _cache[7] || (_cache[7] = ($event) => emitClear())
                     }, {
                       default: withCtx(() => [
                         createVNode(unref(circle_close_default))
@@ -18606,12 +18599,12 @@ class WebValidator {
   }
   /**
    * ### 创建验证器
-   * @param service 接口服务对象
+   * @param entityClass 接口服务对象
    * @param rules `可选` 表单验证规则
    */
-  static createRules(service, rules = {}) {
+  static createRules(entityClass, rules = {}) {
     const formRules = rules;
-    const formFieldList = getFormConfigList(service.entityClass);
+    const formFieldList = getFormConfigList(entityClass);
     for (let i = 0; i < formFieldList.length; i += 1) {
       const config = formFieldList[i];
       const fieldKey = config.key;
@@ -19087,7 +19080,7 @@ class WebValidator {
 function useEditor(props, ServiceClass, option = {}) {
   const result = useDetail(props, ServiceClass, option);
   const title = computed(() => result.formData.value.id ? WebI18n.get().Update : WebI18n.get().Add);
-  const rules = WebValidator.createRules(new ServiceClass(), option.customRules || {});
+  const rules = WebValidator.createRules(new ServiceClass().entityClass, option.customRules || {});
   const formRef = ref();
   async function onSubmit() {
     let postData = result.formData.value.copy();
@@ -19455,7 +19448,7 @@ class AbstractCurdService extends AbstractService {
    * @param moreRule `可选` 更多的验证规则
    */
   static createValidator(moreRule = {}) {
-    return WebValidator.createRules(new this(), moreRule);
+    return WebValidator.createRules(new this().entityClass, moreRule);
   }
   /**
    * ### 查询分页数据列表

package/dist/validator/WebValidator.d.ts

@@ -1,5 +1,5 @@
+import { ITransformerConstructor } from '@airpower/transformer';
 import { RootEntity } from '../model/RootEntity';
-import { AbstractCurdService } from '../service/AbstractCurdService';
 import { WebValidateRule, WebValidatorCallback, WebValidatorTarget, WebValidatorTrigger, WebValidatorType } from './type';
 /**
  * ### 表单验证
@@ -43,10 +43,10 @@ export declare class WebValidator {
     static create<E extends RootEntity = RootEntity>(rule: WebValidateRule<E>): WebValidateRule<E>;
     /**
      * ### 创建验证器
-     * @param service 接口服务对象
+     * @param entityClass 接口服务对象
      * @param rules `可选` 表单验证规则
      */
-    static createRules<E extends RootEntity, S extends AbstractCurdService<E>>(service: S, rules?: WebValidateRule<E>): WebValidateRule<E>;
+    static createRules<E extends RootEntity>(entityClass: ITransformerConstructor<E>, rules?: WebValidateRule<E>): WebValidateRule<E>;
     /**
      * ### 获取一个验证器
      * @param configValue 验证器配置的值

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@airpower/web",
   "type": "module",
-  "version": "1.9.5",
+  "version": "1.9.7",
   "description": "AirPower-Web",
   "author": {
     "name": "Hamm",