oakIcon 样式优化级调整

es/aspects/AspectService.d.ts

@@ -8,5 +8,5 @@ type TransformAspectDict<T extends AspectDict<ED, BCT>, ED extends BaseEntityDic
     [K in keyof T]: T[K] extends (params: infer P, context: BCT) => infer R ? R extends Promise<unknown> ? (params: P, callback?: (result: R, opRecords?: OpRecord<ED>[]) => void, dontPublish?: true, ignoreContext?: true) => R : never : never;
 };
 export type AspectDictTrans<ED extends BaseEntityDict, AD extends AspectDict<ED, BCT>, BCT extends AsyncContext<ED>> = TransformAspectDict<AD & CommonAspectDict<ED>, ED, BCT>;
-export declare const createService: <ED extends BaseEntityDict, AD extends AspectDict<ED, any>>(cache: BasicFeatures<ED>["cache"]) => TransformAspectDict<AD & CommonAspectDict<ED>, ED, any>;
+export declare const createService: <ED extends BaseEntityDict, AD extends AspectDict<ED, any>>(cache: import("../features/cache").Cache<ED>) => TransformAspectDict<AD & CommonAspectDict<ED>, ED, any>;
 export {};

es/components/actionTabPanel/index.js

@@ -1,9 +1,9 @@
 export default OakComponent({
     isList: false,
     data: {
-        slideWidth: 0, //小程序使用
+        slideWidth: 0,
-        slideLeft: 0, //小程序使用
+        slideLeft: 0,
-        slideShow: false, //小程序使用
+        slideShow: false,
         commonAction: [
             'create',
             'update',

es/components/detail/index.d.ts

@@ -2,12 +2,12 @@ import { ED, OakAbsAttrDef } from '../../types/AbstractComponent';
 import { ReactComponentProps } from '../../types/Page';
 import { Breakpoint } from 'antd';
 declare const _default: <ED2 extends ED, T2 extends keyof ED2>(props: ReactComponentProps<ED2, T2, false, {
-    column?: number | Record<Breakpoint, number>;
+    column?: number | Record<Breakpoint, number> | undefined;
     entity: T2;
     attributes: OakAbsAttrDef[];
-    data: Partial<ED2[T2]['Schema']>;
+    data: Partial<ED2[T2]["Schema"]>;
-    title?: string;
+    title?: string | undefined;
-    bordered?: boolean;
+    bordered?: boolean | undefined;
-    layout?: 'horizontal' | 'vertical';
+    layout?: "horizontal" | "vertical" | undefined;
 }>) => React.ReactElement;
 export default _default;

es/components/detail/index.js

@@ -61,7 +61,7 @@ export default OakComponent({
             let currentUrl = event.currentTarget.dataset.src;
             let urlList = event.currentTarget.dataset.list;
             wx.previewImage({
-                current: currentUrl, // 当前显示图片的http链接
+                current: currentUrl,
                 urls: urlList, // 需要预览的图片http链接列表
             });
         },

es/components/errorPage/index.d.ts

@@ -3,8 +3,8 @@ import { ReactComponentProps } from '../../types/Page';
 import { ECode } from '../../types/ErrorPage';
 declare const _default: <ED2 extends ED, T2 extends keyof ED2>(props: ReactComponentProps<ED2, T2, false, {
     code: ECode;
-    title?: string;
+    title?: string | undefined;
-    desc?: string;
+    desc?: string | undefined;
     children?: React.ReactNode;
     icon?: React.ReactNode;
     content?: React.ReactNode;

es/components/errorPage/index.js

@@ -52,7 +52,7 @@ export default OakComponent({
         code: '',
         title: '',
         desc: '',
-        icon: '', //web独有
+        icon: '',
         imagePath: '', //小程序独有
     },
     lifetimes: {

es/components/filter/index.js

@@ -93,7 +93,7 @@ export default OakComponent({
         attribute: {},
         options: [],
         inputType: '',
-        timeStartStr: '', // 小程序选择时间显示
+        timeStartStr: '',
         timeEndStr: '',
         selectedLabel: '',
         minDateMp: new Date(1980, 1, 1).getTime(),

es/components/icon/index.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 declare const _default: (props: import("../..").ReactComponentProps<import("oak-domain/lib/types").EntityDict & import("oak-domain/lib/base-app-domain").EntityDict, string | number, false, {
     name: string;
-    size: number;
+    size: number | null | undefined;
     color: string;
 }>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
 export default _default;

es/components/icon/index.js

@@ -5,7 +5,7 @@ export default OakComponent({
     },
     properties: {
         name: '',
-        size: 12,
+        size: undefined,
         color: 'primary',
     },
 });

es/components/icon/index.less

@@ -1,6 +1,7 @@
 @import './iconfont.less';
 @import '../../config/styles/mp/index.less';
 
+
 .oak-icon__primary {
     color: @oak-color-primary;
 }

es/components/icon/index.xml

@@ -1 +1 @@
-<view class="oak-icon  {{ name === '' ? '' : 'oak-icon-' +  name }} {{ color === '' || color === 'primary' || color === 'info' || color === 'error' || color === 'success' || color === 'warning' ? 'oak-icon__' +  (color || 'primary') : ''}} oak-class" style="font-size: {{ size || 14 }}px; {{ color && color !== 'primary'  && color !== 'info'&& color !== 'error'&& color !== 'success'&& color !== 'warning' ? 'color:' + color : '' }}"></view>
+<view class="oak-icon  {{ name === '' ? '' : 'oak-icon-' +  name }} {{ color === '' || color === 'primary' || color === 'info' || color === 'error' || color === 'success' || color === 'warning' ? 'oak-icon__' +  (color || 'primary') : ''}} oak-class" style="{{ size ? 'font-size:' + size + 'px' : '' }} {{ color && color !== 'primary'  && color !== 'info'&& color !== 'error'&& color !== 'success'&& color !== 'warning' ? 'color:' + color : '' }}"></view>

es/components/icon/web.d.ts

@@ -5,7 +5,7 @@ import './web.less';
 export default function Render(props: WebComponentProps<ED, keyof ED, false, {
     name: string;
     color?: 'primary' | 'success' | 'error' | 'waring' | 'info' | string;
-    size?: string;
+    size?: number;
     className?: string;
     style?: React.CSSProperties;
 }, {}>): React.JSX.Element;

es/components/list/index.d.ts

@@ -10,13 +10,18 @@ declare const _default: <ED2 extends ED, T2 extends keyof ED2>(props: ReactCompo
     data: RowWithActions<ED2, T2>[];
     loading: boolean;
     tablePagination?: React.ReactNode | false;
-    rowSelection?: TableProps<RowWithActions<ED2, T2>>['rowSelection'];
+    rowSelection?: import("antd/es/table/interface").TableRowSelection<RowWithActions<ED2, T2>> | undefined;
-    hideHeader?: boolean;
+    hideHeader?: boolean | undefined;
-    disableSerialNumber?: boolean;
+    disableSerialNumber?: boolean | undefined;
-    size?: 'large' | 'middle' | 'small';
+    size?: "small" | "large" | "middle" | undefined;
-    scroll?: TableProps<RowWithActions<ED2, T2>>['scroll'];
+    scroll?: ({
+        x?: string | number | true | undefined;
+        y?: string | number | undefined;
+    } & {
+        scrollToFirstRowOnChange?: boolean | undefined;
+    }) | undefined;
     empty?: React.ReactNode;
-    opWidth?: number;
+    opWidth?: number | undefined;
-    ellipsis?: boolean;
+    ellipsis?: boolean | undefined;
 }>) => React.ReactElement;
 export default _default;

es/components/list/index.js

@@ -13,7 +13,7 @@ export default OakComponent({
         tablePagination: undefined,
         rowSelection: undefined,
         hideHeader: false,
-        disableSerialNumber: false, //是否禁用序号 默认启用
+        disableSerialNumber: false,
         size: 'large',
         scroll: undefined,
         empty: undefined,

es/components/pageHeader/index.d.ts

@@ -1,20 +1,21 @@
+/// <reference types="react" />
 import { ReactComponentProps } from '../../types/Page';
 import { ED } from '../../types/AbstractComponent';
 declare const _default: <ED2 extends ED, T2 extends keyof ED2>(props: ReactComponentProps<ED2, T2, false, {
-    style?: React.CSSProperties;
+    style?: import("react").CSSProperties | undefined;
-    className?: string;
+    className?: string | undefined;
     title?: React.ReactNode;
-    showBack?: boolean;
+    showBack?: boolean | undefined;
-    onBack?: () => void;
+    onBack?: (() => void) | undefined;
     backIcon?: React.ReactNode;
-    delta?: number;
+    delta?: number | undefined;
     extra?: React.ReactNode;
     subTitle?: React.ReactNode;
-    contentMargin?: boolean;
+    contentMargin?: boolean | undefined;
-    contentStyle?: React.CSSProperties;
+    contentStyle?: import("react").CSSProperties | undefined;
-    contentClassName?: string;
+    contentClassName?: string | undefined;
     tags?: React.ReactNode;
     children?: React.ReactNode;
-    showHeader?: boolean;
+    showHeader?: boolean | undefined;
 }>) => React.ReactElement;
 export default _default;

es/components/pageHeader2/index.d.ts

@@ -1,22 +1,23 @@
+/// <reference types="react" />
 import { ReactComponentProps } from '../../types/Page';
 import { ED } from '../../types/AbstractComponent';
 declare const _default: <ED2 extends ED, T2 extends keyof ED2>(props: ReactComponentProps<ED2, T2, false, {
-    style?: React.CSSProperties;
+    style?: import("react").CSSProperties | undefined;
-    className?: string;
+    className?: string | undefined;
-    showHeader?: boolean;
+    showHeader?: boolean | undefined;
-    showBack?: boolean;
+    showBack?: boolean | undefined;
-    onBack?: () => void;
+    onBack?: (() => void) | undefined;
     backIcon?: React.ReactNode;
-    delta?: number;
+    delta?: number | undefined;
     title?: React.ReactNode;
     subTitle?: React.ReactNode;
     tags?: React.ReactNode;
     extra?: React.ReactNode;
     children?: React.ReactNode;
     content: React.ReactNode;
-    contentStyle?: React.CSSProperties;
+    contentStyle?: import("react").CSSProperties | undefined;
-    contentClassName?: string;
+    contentClassName?: string | undefined;
-    bodyStyle?: React.CSSProperties;
+    bodyStyle?: import("react").CSSProperties | undefined;
-    bodyClassName?: string;
+    bodyClassName?: string | undefined;
 }>) => React.ReactElement;
 export default _default;

es/components/pagination/index.d.ts

@@ -1,12 +1,13 @@
+/// <reference types="react" />
 import { ReactComponentProps } from '../../types/Page';
 import { ED } from '../../types/AbstractComponent';
 declare const _default: <ED2 extends ED, T2 extends keyof ED2>(props: ReactComponentProps<ED2, T2, false, {
     entity: T2;
-    style?: React.CSSProperties;
+    style?: import("react").CSSProperties | undefined;
-    className?: string;
+    className?: string | undefined;
-    showQuickJumper?: boolean;
+    showQuickJumper?: boolean | undefined;
-    size?: 'default' | 'small';
+    size?: "small" | "default" | undefined;
-    showSizeChanger?: boolean;
+    showSizeChanger?: boolean | undefined;
-    showTotal?: (total: number, range: [number, number]) => React.ReactNode;
+    showTotal?: ((total: number, range: [number, number]) => React.ReactNode) | undefined;
 }>) => React.ReactElement;
 export default _default;

es/components/refAttr/index.js

@@ -9,7 +9,7 @@ export default OakComponent({
         multiple: false,
         entityId: '',
         entityIds: [],
-        pickerRender: {}, // OakAbsRefAttrPickerRender
+        pickerRender: {},
         onChange: (() => undefined),
     },
     formData() {

es/components/upsert/index.d.ts

@@ -4,7 +4,7 @@ declare const _default: <ED2 extends ED, T2 extends keyof ED2, T3 extends string
     helps: Record<string, string>;
     entity: T2;
     attributes: OakAbsAttrUpsertDef<ED2, T2, T3>[];
-    data: ED2[T2]['Schema'];
+    data: ED2[T2]["Schema"];
     layout: 'horizontal' | 'vertical';
     mode: 'default' | 'card';
 }>) => React.ReactElement;

es/components/upsert/index.js

@@ -5,7 +5,7 @@ export default OakComponent({
         return this.props.entity;
     },
     properties: {
-        helps: {}, // Record<string, string>;
+        helps: {},
         entity: '',
         attributes: [],
         layout: 'horizontal',

es/features/cache.js

@@ -427,7 +427,7 @@ export class Cache extends Feature {
         opers.forEach((oper) => {
             const { entity, operation } = oper;
             this.cacheStore.operate(entity, operation, this.context, {
-                checkerTypes: ['logical'], // 这里不能检查data，不然在数据没填完前会有大量异常
+                checkerTypes: ['logical'],
                 dontCollect: true,
             });
         });

es/page.react.d.ts

@@ -49,21 +49,21 @@ export declare function createComponent<IsList extends boolean, ED extends Entit
         redirectTo<T2_1 extends keyof ED>(options: {
             url: string;
         } & OakNavigateToParameters<ED, T2_1>, state?: Record<string, any> | undefined, disableNamespace?: boolean | undefined): Promise<void>;
-        addItem<T_1 extends keyof ED>(data: Omit<ED[T_1]["CreateSingle"]["data"], "id"> & {
+        addItem<T extends keyof ED>(data: Omit<ED[T]["CreateSingle"]["data"], "id"> & {
             id?: string | undefined;
         }, path?: string | undefined): string;
-        addItems<T_2 extends keyof ED>(data: (Omit<ED[T_2]["CreateSingle"]["data"], "id"> & {
+        addItems<T_1 extends keyof ED>(data: (Omit<ED[T_1]["CreateSingle"]["data"], "id"> & {
             id?: string | undefined;
         })[], path?: string | undefined): string[];
         removeItem(id: string, path?: string | undefined): void;
         removeItems(ids: string[], path?: string | undefined): void;
-        updateItem<T_3 extends keyof ED>(data: ED[T_3]["Update"]["data"], id: string, action?: ED[T_3]["Action"] | undefined, path?: string | undefined): void;
+        updateItem<T_2 extends keyof ED>(data: ED[T_2]["Update"]["data"], id: string, action?: ED[T_2]["Action"] | undefined, path?: string | undefined): void;
-        updateItems<T_4 extends keyof ED>(data: ED[T_4]["Update"]["data"], ids: string[], action?: ED[T_4]["Action"] | undefined, path?: string | undefined): void;
+        updateItems<T_3 extends keyof ED>(data: ED[T_3]["Update"]["data"], ids: string[], action?: ED[T_3]["Action"] | undefined, path?: string | undefined): void;
         recoverItem(id: string, path?: string | undefined): void;
         recoverItems(ids: string[], path?: string | undefined): void;
         resetItem(id: string, path?: string | undefined): void;
-        update<T_5 extends keyof ED>(data: ED[T_5]["Update"]["data"], action?: ED[T_5]["Action"] | undefined, path?: string | undefined): void;
+        update<T_4 extends keyof ED>(data: ED[T_4]["Update"]["data"], action?: ED[T_4]["Action"] | undefined, path?: string | undefined): void;
-        create<T_6 extends keyof ED>(data: Omit<ED[T_6]["CreateSingle"]["data"], "id">, path?: string | undefined): void;
+        create<T_5 extends keyof ED>(data: Omit<ED[T_5]["CreateSingle"]["data"], "id">, path?: string | undefined): void;
         remove(path?: string | undefined): void;
         isCreation(path?: string | undefined): boolean;
         clean(lsn?: number | undefined, dontPublish?: true | undefined, path?: string | undefined): void;
@@ -78,7 +78,7 @@ export declare function createComponent<IsList extends boolean, ED extends Entit
         select<T2_2 extends keyof ED>(entity: T2_2, selection: ED[T2_2]["Selection"]): Partial<import("oak-domain/lib/types").GeneralEntityShape>[];
         checkOperation<T2_3 extends keyof ED>(entity: T2_3, operation: Omit<ED[T2_3]["Operation"], "id">, checkerTypes?: CheckerType[] | undefined, cacheInsensative?: true | undefined): boolean | { [A in ED[T2_3]["Action"]]: boolean | import("oak-domain/lib/types").OakUserException<ED>; }[ED[T2_3]["Action"]];
         tryExecute(path?: string | undefined, action?: string | undefined): boolean | { [A_1 in ED[keyof ED]["Action"]]: boolean | import("oak-domain/lib/types").OakUserException<ED>; }[ED[keyof ED]["Action"]];
-        getOperations<T_7 extends keyof ED>(path?: string | undefined): {
+        getOperations<T_6 extends keyof ED>(path?: string | undefined): {
             entity: keyof ED;
             operation: ED[keyof ED]["Operation"];
         }[] | undefined;

es/platforms/web/responsive/context.js

@@ -1,7 +1,7 @@
 import React from 'react';
 export const keys = ['xs', 'sm', 'md', 'lg', 'xl', 'xxl'];
 export const values = {
-    xs: 576, //小于576
+    xs: 576,
     sm: 576,
     md: 768,
     lg: 992,

es/types/ErrorPage.d.ts

@@ -5,7 +5,7 @@ export declare enum ECode {
     networkError = "network-error",
     browserIncompatible = "browser-incompatible",
     maintenance = "maintenance",
-    pageCrash = "pageCrash",// 页面崩溃
+    pageCrash = "pageCrash",
-    pageUpdate = "pageUpdate",// 页面更新
+    pageUpdate = "pageUpdate",
     pageDataCacheFailure = "pageDataCacheFailure"
 }

lib/aspects/AspectService.d.ts

@@ -8,5 +8,5 @@ type TransformAspectDict<T extends AspectDict<ED, BCT>, ED extends BaseEntityDic
     [K in keyof T]: T[K] extends (params: infer P, context: BCT) => infer R ? R extends Promise<unknown> ? (params: P, callback?: (result: R, opRecords?: OpRecord<ED>[]) => void, dontPublish?: true, ignoreContext?: true) => R : never : never;
 };
 export type AspectDictTrans<ED extends BaseEntityDict, AD extends AspectDict<ED, BCT>, BCT extends AsyncContext<ED>> = TransformAspectDict<AD & CommonAspectDict<ED>, ED, BCT>;
-export declare const createService: <ED extends BaseEntityDict, AD extends AspectDict<ED, any>>(cache: BasicFeatures<ED>["cache"]) => TransformAspectDict<AD & CommonAspectDict<ED>, ED, any>;
+export declare const createService: <ED extends BaseEntityDict, AD extends AspectDict<ED, any>>(cache: import("../features/cache").Cache<ED>) => TransformAspectDict<AD & CommonAspectDict<ED>, ED, any>;
 export {};

lib/features/cache.js

@@ -430,7 +430,7 @@ class Cache extends Feature_1.Feature {
         opers.forEach((oper) => {
             const { entity, operation } = oper;
             this.cacheStore.operate(entity, operation, this.context, {
-                checkerTypes: ['logical'], // 这里不能检查data，不然在数据没填完前会有大量异常
+                checkerTypes: ['logical'],
                 dontCollect: true,
             });
         });

lib/page.react.d.ts

@@ -49,21 +49,21 @@ export declare function createComponent<IsList extends boolean, ED extends Entit
         redirectTo<T2_1 extends keyof ED>(options: {
             url: string;
         } & OakNavigateToParameters<ED, T2_1>, state?: Record<string, any> | undefined, disableNamespace?: boolean | undefined): Promise<void>;
-        addItem<T_1 extends keyof ED>(data: Omit<ED[T_1]["CreateSingle"]["data"], "id"> & {
+        addItem<T extends keyof ED>(data: Omit<ED[T]["CreateSingle"]["data"], "id"> & {
             id?: string | undefined;
         }, path?: string | undefined): string;
-        addItems<T_2 extends keyof ED>(data: (Omit<ED[T_2]["CreateSingle"]["data"], "id"> & {
+        addItems<T_1 extends keyof ED>(data: (Omit<ED[T_1]["CreateSingle"]["data"], "id"> & {
             id?: string | undefined;
         })[], path?: string | undefined): string[];
         removeItem(id: string, path?: string | undefined): void;
         removeItems(ids: string[], path?: string | undefined): void;
-        updateItem<T_3 extends keyof ED>(data: ED[T_3]["Update"]["data"], id: string, action?: ED[T_3]["Action"] | undefined, path?: string | undefined): void;
+        updateItem<T_2 extends keyof ED>(data: ED[T_2]["Update"]["data"], id: string, action?: ED[T_2]["Action"] | undefined, path?: string | undefined): void;
-        updateItems<T_4 extends keyof ED>(data: ED[T_4]["Update"]["data"], ids: string[], action?: ED[T_4]["Action"] | undefined, path?: string | undefined): void;
+        updateItems<T_3 extends keyof ED>(data: ED[T_3]["Update"]["data"], ids: string[], action?: ED[T_3]["Action"] | undefined, path?: string | undefined): void;
         recoverItem(id: string, path?: string | undefined): void;
         recoverItems(ids: string[], path?: string | undefined): void;
         resetItem(id: string, path?: string | undefined): void;
-        update<T_5 extends keyof ED>(data: ED[T_5]["Update"]["data"], action?: ED[T_5]["Action"] | undefined, path?: string | undefined): void;
+        update<T_4 extends keyof ED>(data: ED[T_4]["Update"]["data"], action?: ED[T_4]["Action"] | undefined, path?: string | undefined): void;
-        create<T_6 extends keyof ED>(data: Omit<ED[T_6]["CreateSingle"]["data"], "id">, path?: string | undefined): void;
+        create<T_5 extends keyof ED>(data: Omit<ED[T_5]["CreateSingle"]["data"], "id">, path?: string | undefined): void;
         remove(path?: string | undefined): void;
         isCreation(path?: string | undefined): boolean;
         clean(lsn?: number | undefined, dontPublish?: true | undefined, path?: string | undefined): void;
@@ -78,7 +78,7 @@ export declare function createComponent<IsList extends boolean, ED extends Entit
         select<T2_2 extends keyof ED>(entity: T2_2, selection: ED[T2_2]["Selection"]): Partial<import("oak-domain/lib/types").GeneralEntityShape>[];
         checkOperation<T2_3 extends keyof ED>(entity: T2_3, operation: Omit<ED[T2_3]["Operation"], "id">, checkerTypes?: CheckerType[] | undefined, cacheInsensative?: true | undefined): boolean | { [A in ED[T2_3]["Action"]]: boolean | import("oak-domain/lib/types").OakUserException<ED>; }[ED[T2_3]["Action"]];
         tryExecute(path?: string | undefined, action?: string | undefined): boolean | { [A_1 in ED[keyof ED]["Action"]]: boolean | import("oak-domain/lib/types").OakUserException<ED>; }[ED[keyof ED]["Action"]];
-        getOperations<T_7 extends keyof ED>(path?: string | undefined): {
+        getOperations<T_6 extends keyof ED>(path?: string | undefined): {
             entity: keyof ED;
             operation: ED[keyof ED]["Operation"];
         }[] | undefined;

lib/platforms/web/responsive/context.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importDefault(require("react"));
 exports.keys = ['xs', 'sm', 'md', 'lg', 'xl', 'xxl'];
 exports.values = {
-    xs: 576, //小于576
+    xs: 576,
     sm: 576,
     md: 768,
     lg: 992,

lib/types/ErrorPage.d.ts

@@ -5,7 +5,7 @@ export declare enum ECode {
     networkError = "network-error",
     browserIncompatible = "browser-incompatible",
     maintenance = "maintenance",
-    pageCrash = "pageCrash",// 页面崩溃
+    pageCrash = "pageCrash",
-    pageUpdate = "pageUpdate",// 页面更新
+    pageUpdate = "pageUpdate",
     pageDataCacheFailure = "pageDataCacheFailure"
 }

src/components/icon/index.less

@@ -1,6 +1,7 @@
 @import './iconfont.less';
 @import '../../config/styles/mp/index.less';
 
+
 .oak-icon__primary {
     color: @oak-color-primary;
 }

src/components/icon/index.ts

@@ -6,7 +6,7 @@ export default OakComponent({
     },
     properties: {
         name: '',
-        size: 12 as number,
+        size: undefined as number | undefined | null,
         color: 'primary' as 'primary' | 'success' | 'error' | 'waring' | 'info' | string,
     },
 });

src/components/icon/index.xml

@@ -1 +1 @@
-<view class="oak-icon  {{ name === '' ? '' : 'oak-icon-' +  name }} {{ color === '' || color === 'primary' || color === 'info' || color === 'error' || color === 'success' || color === 'warning' ? 'oak-icon__' +  (color || 'primary') : ''}} oak-class" style="font-size: {{ size || 14 }}px; {{ color && color !== 'primary'  && color !== 'info'&& color !== 'error'&& color !== 'success'&& color !== 'warning' ? 'color:' + color : '' }}"></view>
+<view class="oak-icon  {{ name === '' ? '' : 'oak-icon-' +  name }} {{ color === '' || color === 'primary' || color === 'info' || color === 'error' || color === 'success' || color === 'warning' ? 'oak-icon__' +  (color || 'primary') : ''}} oak-class" style="{{ size ? 'font-size:' + size + 'px' : '' }} {{ color && color !== 'primary'  && color !== 'info'&& color !== 'error'&& color !== 'success'&& color !== 'warning' ? 'color:' + color : '' }}"></view>

src/components/icon/web.tsx

@@ -17,7 +17,7 @@ export default function Render(
                 | 'waring'
                 | 'info'
                 | string;
-            size?: string;
+            size?: number;
             className?: string;
             style?: React.CSSProperties;
         },
@@ -28,9 +28,7 @@ export default function Render(
 
     const { name, color = '', size, className, style = {} } = data;
 
-    const isColor = ['primary', 'info', 'success', 'error', 'warning'].includes(
+    const isColor = ['primary', 'info', 'success', 'error', 'warning'].includes(color);
-        color
-    );
 
     let class_name = 'oak-icon ' + 'oak-icon-' + name;
     if (isColor || color === '') {