vap1 0.4.4 → 0.4.5

package/components/Box/index.d.ts

@@ -1,5 +1,5 @@
 import { useBox } from './Box';
-import { ForwardRefExoticComponent, PropsWithChildren, RefAttributes } from 'react';
+import type { ForwardRefExoticComponent, PropsWithChildren, RefAttributes } from 'react';
 import type { BoxProps } from './Box';
 export type BoxComponent = ForwardRefExoticComponent<PropsWithChildren<BoxProps> & RefAttributes<{
     resize: () => void;

package/components/Lists/SList.d.ts

@@ -1,5 +1,5 @@
-import type { FC, CSSProperties, ReactNode } from 'react';
 import type { PlainObject, Key } from '../../basetype';
+import type { FC, ReactNode, CSSProperties } from 'react';
 import type { IconProps } from '../_adapt/Icon';
 type ItemRenderFunction = (record: PlainObject, searchValue?: string) => ReactNode;
 export type SListProps = {

package/components/Lists/SList.js

@@ -55,6 +55,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SList = void 0;
 var react_1 = __importStar(require("react"));
+var py_1 = require("../../utils/py");
 var lodash_1 = __importDefault(require("lodash"));
 var utils_1 = require("../../utils");
 var Icon_1 = require("../_adapt/Icon");
@@ -131,8 +132,8 @@ exports.SList = (0, react_1.memo)(function (props) {
             return;
         }
         setList(lodash_1.default.filter(all, function (item) {
-            var title = lodash_1.default.toLower(item[props.titleField]);
-            return title.indexOf(searchValue) >= 0;
+            var hited = (0, py_1.spellHit)(item[props.titleField], searchValue);
+            return hited.length > 0;
         }));
     }, [searchValue, props.list]);
     (0, react_1.useLayoutEffect)(function () {

package/components/Tables/STable.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
-import { ListInit } from '../../hooks/_list';
 import type { VTableProps, VTableRef } from './VTable';
+import type { ListInit } from '../../hooks/_list';
 export type STableProps = Omit<VTableProps, 'model'> & ListInit & {
     /**
      * 说明 pageSize : 默认为 false ： 不分页。

package/components/Tables/TopTable.js

@@ -149,7 +149,6 @@ var TopTable = function (props) {
             }
         }); };
     }
-    console.log(scroll);
     return react_1.default.createElement("div", { ref: tableRef, className: 'c-table-top-container' },
         react_1.default.createElement(Table_1.Table, __assign({}, tableProps, props, { rowClassName: function (record, i) {
                 var clazz = [];

package/components/Trees/ActionTree.d.ts

@@ -37,9 +37,12 @@ export declare const useActionTree: () => ActionTreeContext;
 export declare const ActionTree: React.ForwardRefExoticComponent<import("../../utils/TreeUtil").BaseTreeOpts & Pick<import("antd/es/tree/Tree").TreeProps, "className" | "disabled" | "defaultExpandAll"> & {
     iconField?: string | ((item: any) => React.ReactNode);
     titleField: string | import("./index").LanguageField;
+    titleRender?: (node: PlainObject) => React.ReactNode;
     mustSelect?: boolean;
     disabledNode?: (node: PlainObject) => boolean;
-    onSelect?: (key: Key, node: PlainObject, parentNode: PlainObject, crumb: PlainObject[], pos: number[]) => void;
+    onSelect?: (key: Key, node: PlainObject, parentNode: PlainObject, crumb: PlainObject[], pos: number[]) => void; /**
+     * 获取子节点方法
+    */
     searchValue?: string;
 } & BaseActionTreeProps & CacheTree & React.RefAttributes<ActionTreeRef>>;
 export declare const renderRoot: (props: ActionTreeProps, state: BaseTreeState, context: ActionTreeContext) => ReactNode;

package/components/Trees/BaseTree.d.ts

@@ -11,6 +11,7 @@ export type BaseTreeState = Required<BaseTreeOpts> & {
     selectedKeys: string[];
     selectedNode: PlainObject;
     titleField: string;
+    titleRender?: (item: any) => ReactNode;
     iconField: string | ((item: any) => ReactNode);
     inited: boolean;
     langs: {

package/components/Trees/BaseTree.js

@@ -99,6 +99,7 @@ var BaseTree = function (props) {
         rootCode: '0',
         search: { word: null, keyword: null, match: null },
         titleField: 'name',
+        titleRender: null,
         keyField: 'id',
         iconField: null,
         sortField: null,
@@ -145,6 +146,9 @@ var BaseTree = function (props) {
             DEFAULT.langs = langs;
         }
     }
+    if (props.titleRender && lodash_1.default.isFunction(props.titleRender)) {
+        DEFAULT.titleRender = props.titleRender;
+    }
     var _a = __read((0, hooks_1.useSetState)(DEFAULT), 2), state = _a[0], setState = _a[1];
     var PID = (0, react_1.useRef)(null);
     var searchByKeyWord = (0, react_1.useCallback)(function (word) {
@@ -203,13 +207,18 @@ var BaseTree = function (props) {
 };
 exports.BaseTree = BaseTree;
 var getNodeParam = function (node, position, state, search, disabledNode, folderChecker) {
-    var titleField = state.titleField, keyField = state.keyField, iconField = state.iconField;
+    var titleField = state.titleField, keyField = state.keyField, iconField = state.iconField, titleRender = state.titleRender;
     var param = { key: node[keyField], data: { node: node, position: position } };
     if (search.keyword) {
         param.title = react_1.default.createElement(HighLight_1.HighLight, { keyword: search.keyword, text: node[titleField] });
     }
     else {
-        param.title = node[titleField];
+        if (titleRender) {
+            param.title = titleRender(node);
+        }
+        else {
+            param.title = node[titleField];
+        }
     }
     if (lodash_1.default.isFunction(disabledNode)) {
         if (disabledNode(node)) {

package/components/Trees/DTree.d.ts

@@ -42,6 +42,7 @@ export declare const DTree: React.MemoExoticComponent<React.ForwardRefExoticComp
      * 方式二：传一个方法 ，接收一个父节点参数，必须返回  Promise<TreeNodeData[]> (不要返回 children, 仅返回一级)
     */
     titleField: string | import("./index").LanguageField;
+    titleRender?: (node: PlainObject) => React.ReactNode;
     mustSelect?: boolean;
     disabledNode?: (node: PlainObject) => boolean;
     onSelect?: (key: Key, node: PlainObject, parentNode: PlainObject, crumb: PlainObject[], pos: number[]) => void;

package/components/Trees/FTree.d.ts

@@ -18,6 +18,7 @@ export type FTreeProps = BaseTreeProps & BaseActionTreeProps & FTreeData;
 export declare const FTree: React.MemoExoticComponent<React.ForwardRefExoticComponent<TreeUtil.BaseTreeOpts & Pick<TreeProps, "className" | "disabled" | "defaultExpandAll"> & {
     iconField?: string | ((item: any) => React.ReactNode);
     titleField: string | import("./index").LanguageField;
+    titleRender?: (node: import("../..").PlainObject) => React.ReactNode;
     mustSelect?: boolean;
     disabledNode?: (node: import("../..").PlainObject) => boolean;
     onSelect?: (key: import("../..").Key, node: import("../..").PlainObject, parentNode: import("../..").PlainObject, crumb: import("../..").PlainObject[], pos: number[]) => void;

package/components/Trees/index.d.ts

@@ -36,6 +36,10 @@ export type BaseTreeProps = BaseTreeOpts & Pick<TreeProps, 'className' | 'defaul
      * 如果需要支持 i18n ，则传一个对象，支持3个字段
     */
     titleField: string | LanguageField;
+    /**
+     * 自定义标题
+    */
+    titleRender?: (node: PlainObject) => ReactNode;
     /**
      * 是否必选，
     */

package/components/UForm/_register.d.ts

@@ -1,4 +1,4 @@
-import type { ComponentType, ReactNode } from 'react';
+import type { ReactNode, ComponentType } from 'react';
 import type { BaseOption, PlainObject } from '../../basetype';
 import type { UFormField } from './index';
 import type { ValidationRule, WrappedFormUtils } from 'antd/es/form/Form';

package/components/_common/HighLight.js

@@ -48,6 +48,6 @@ var StringUtil_1 = require("../../utils/StringUtil");
 var HighLight = function (props) {
     var _a = __read((0, react_1.useState)([]), 2), ptns = _a[0], setPtns = _a[1];
     (0, react_1.useLayoutEffect)(function () { return setPtns((0, StringUtil_1.searchText)(props.text, props.keyword)); }, [props]);
-    return react_1.default.createElement(react_1.Fragment, null, ptns.map(function (ptn) { return ptn.hit ? react_1.default.createElement("span", { className: 'v-highlight' }, ptn.text) : ptn.text; }));
+    return ptns.map(function (ptn) { return ptn.hit ? react_1.default.createElement("span", { className: 'v-highlight' }, ptn.text) : ptn.text; });
 };
 exports.HighLight = HighLight;

package/hooks/useApiGlobal.js

@@ -33,8 +33,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useApiGlobal = void 0;
 var lodash_1 = __importDefault(require("lodash"));
 var react_1 = require("react");
-var useGlobal_1 = require("./useGlobal");
 var _list_1 = require("./_list");
+var useGlobal_1 = require("./useGlobal");
 var useApiBase_1 = require("./useApiBase");
 var toKey = function (pathname, hash) {
     var root = lodash_1.default.toLower(lodash_1.default.trim(pathname));

package/hooks/useEffectFunction.d.ts

@@ -1,8 +1,10 @@
-import { DependencyList } from 'react';
+import type { DependencyList } from 'react';
+type EffectFn = () => void | (Promise<void>);
 /**
  * 简写 useEffect 用于方法执行，
  * 支持异步方法
  * 不支持 Return (unmount),
  * 默认没有 deps
 */
-export declare const useEffectFunction: (fn: Function, deps?: DependencyList) => void;
+export declare const useEffectFunction: (fn: EffectFn, deps?: DependencyList) => void;
+export {};

package/hooks/useGetSet.d.ts

@@ -1,4 +1,4 @@
-import { Dispatch } from 'react';
+import type { Dispatch } from 'react';
 type IHookStateInitialSetter<S> = () => S;
 type IHookStateInitAction<S> = S | IHookStateInitialSetter<S>;
 type IHookStateSetter<S> = ((prevState: S) => S) | (() => S);

package/hooks/useGlobal.d.ts

@@ -1,4 +1,4 @@
-import { Dispatch, SetStateAction } from 'react';
+import type { Dispatch, SetStateAction } from 'react';
 export type UseGStateOptions = {
     /**
      * 共享此模型, 默认不共享，说明 ：

package/package.json

@@ -1 +1 @@
-{"name":"vap1","version":"0.4.4","description":"vap1, Both support MicroService and SAP FrameWork, Support IE>9","main":"index.js","author":"Xiang da","license":"ISC"}
+{"name":"vap1","version":"0.4.5","description":"vap1, Both support MicroService and SAP FrameWork, Support IE>9","main":"index.js","author":"Xiang da","license":"ISC"}

package/screen/Page.js

@@ -26,9 +26,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Page = void 0;
 var react_1 = __importStar(require("react"));
 var antd_1 = require("antd");
+var utils_1 = require("../utils");
 // @ts-ignore : 全局
 var zh_CN = antd.locales.zh_CN;
 antd_1.Empty.defaultProps = { image: '/images/empty-insight.png' };
+utils_1.Ajax.SESSION(utils_1.GLOBAL.CONFIG.BASIC.DICT);
 var resize = function () {
     var diff = 0.1;
     // const min: number = 0.1, max: number = 0.1;
@@ -63,9 +65,7 @@ var Page = function (props) {
         }
         window.addEventListener('resize', resize, false);
         resize();
-        return function () {
-            window.removeEventListener('resize', resize);
-        };
+        return function () { return window.removeEventListener('resize', resize); };
     }, []);
     return react_1.default.createElement(antd_1.ConfigProvider, { locale: zh_CN, 
         // autoInsertSpaceInButton={false}

package/utils/CustomApp.d.ts

@@ -169,8 +169,8 @@ export type CustomAppOptions = {
         */
         enableRule?: boolean;
         /**
-         * 是否初始化字典，默认 true
-         * 开启后可正常使用 Renders.DictRender
+         * @deprecated
+         * 不再有效，后续为智能引用
         */
         enableDict?: boolean;
         /**

package/utils/Global.d.ts

@@ -30,6 +30,11 @@ export type GlobalSetting = {
          * 当项目接口不是很标准时，可以设置为false ，将会显示 抽象原因，如：添加失败，修改失败等。
         */
         TIP_ERROR: boolean;
+        /**
+         * 注册汉语拼音
+         * 注册后,各种  search value 支持拼音搜索
+        */
+        PY: Map<string, string>;
     };
     /**
      * 基础API设置，

package/utils/Global.js

@@ -22,6 +22,7 @@ var DEFAULT = {
         LANG: _Support_1.Language.ZH_CN,
         USER_MENU_HOMEPAGE: true,
         TIP_ERROR: true,
+        PY: null,
     },
     BASIC: {
         PREFIX: '/api-common',

package/utils/Renders/DictRender.d.ts

@@ -1,5 +1,5 @@
 import type { Render, BaseRenderOptions, OptionConvertConfig } from './_define';
-import type { BaseOption, PlainObject } from '../../basetype';
+import type { BaseOption } from '../../basetype';
 declare const DICT_FORMATS: readonly ["tag", "color", "status", "sup", "sub", "icon", "badge", "progress", "tip", "clazz"];
 type DictFormat = typeof DICT_FORMATS[number];
 type DictRenderOptions = Omit<BaseRenderOptions, 'len' | 'format'> & {
@@ -13,6 +13,7 @@ type DictInfo = {
 type GlobalDict = {
     DICTS: BaseOption[];
     DICT_MAP: Map<string, DictInfo>;
+    loaded: boolean;
 };
 declare const _V_DICT: GlobalDict;
 interface DictRender extends Render {
@@ -22,8 +23,4 @@ interface DictRender extends Render {
     options: (config?: OptionConvertConfig) => BaseOption[];
 }
 export declare const DictRender: (options: string | DictRenderOptions) => DictRender;
-/**
- * 初始化字典，将字典接口的响应数组传入
-*/
-export declare const initDict: (dict: PlainObject[]) => void;
 export { _V_DICT as DICT };

package/utils/Renders/DictRender.js

@@ -30,22 +30,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DICT = exports.initDict = exports.DictRender = void 0;
+exports.DICT = exports.DictRender = void 0;
 var react_1 = __importDefault(require("react"));
 var lodash_1 = __importDefault(require("lodash"));
 var index_1 = require("../index");
 var _i18n_1 = require("../../components/_i18n");
 var _Support_1 = require("../_Support");
+var _AjaxUtil_1 = require("../_AjaxUtil");
+var XHR_1 = require("../XHR");
 var Const_1 = require("../Const");
 var _DictBaseRender_1 = require("./_DictBaseRender");
 var DICT_FORMATS = ['tag', 'color', 'status', 'sup', 'sub', 'icon', 'badge', 'progress', 'tip', 'clazz'];
 ;
 var VALIDATE_FORMAT = new Set(DICT_FORMATS);
-var _V_DICT = (0, _Support_1.globalDefault)('_V_DICT', { DICTS: [], DICT_MAP: new Map() });
+var _V_DICT = (0, _Support_1.globalDefault)('_V_DICT', { DICTS: [], DICT_MAP: new Map(), loaded: false });
 exports.DICT = _V_DICT;
-var DICT = _V_DICT.DICT_MAP;
 var _DictRender = function (props) {
-    var root = DICT.get(props.dictType);
+    var root = _V_DICT.DICT_MAP.get(props.dictType);
     if (root == null)
         return props.default || Const_1.NONE; // 没有字典
     var idx = lodash_1.default.findIndex(root.nodes, function (item) { return (props.value + '') == item.value; });
@@ -106,10 +107,16 @@ var putOptions = function (arr, config) {
     return list;
 };
 var DictRender = function (options) {
+    if (!_V_DICT.loaded) {
+        _V_DICT.loaded = true;
+        (0, _AjaxUtil_1.SESSION)(index_1.GLOBAL.CONFIG.BASIC.DICT);
+        var resp = (0, XHR_1.GETSYNC)(index_1.GLOBAL.CONFIG.BASIC.DICT);
+        initDict(resp.data || []);
+    }
     var props = lodash_1.default.isString(options) ? { dictType: options } : options;
     var fn = function (txt) { return react_1.default.createElement(_DictRender, __assign({}, props, { value: txt })); };
     fn.options = function (config) {
-        var info = DICT.get(props.dictType);
+        var info = _V_DICT.DICT_MAP.get(props.dictType);
         if (info == null)
             return [];
         return putOptions(info.nodes, config);
@@ -117,7 +124,7 @@ var DictRender = function (options) {
     fn.getText = function (key, defaultValue) {
         if (key === null)
             return lodash_1.default.isString(defaultValue) ? defaultValue : '';
-        var dictInfo = DICT.get(props.dictType);
+        var dictInfo = _V_DICT.DICT_MAP.get(props.dictType);
         if (dictInfo == null)
             return lodash_1.default.isString(defaultValue) ? defaultValue : '';
         var dictKey = key + '';
@@ -153,7 +160,6 @@ var initDict = function (dict) {
             info.format = format;
         _V_DICT.DICTS.push({ label: root.codeValue, value: root.type });
         initNodes(root.type, dict, info.nodes);
-        DICT.set(root.type, info);
+        _V_DICT.DICT_MAP.set(root.type, info);
     });
 };
-exports.initDict = initDict;

package/utils/StringUtil.d.ts

@@ -1,7 +1,9 @@
-import type { MatchPatterns } from './_Support';
+import { spellMatch } from './py';
+import type { MatchPatterns } from './py';
 export declare const REG_EMAIL: RegExp;
 export declare const REG_PHONE: RegExp;
 export declare const REG_TELEPHONE: RegExp;
+export declare const LETTERS: Set<string>;
 export declare const REG_IPV4: RegExp;
 export declare const REG_IPV6: RegExp;
 export declare const REG_URL: RegExp;
@@ -83,6 +85,7 @@ export declare const isBoolean: (str: string) => boolean;
  * 清空首尾空格，并小写
 */
 export declare const trimLower: (str: string) => string;
+export { spellMatch };
 /**
  * 搜索，用于高亮，通常与 HighLight 结合使用，或只使用 HighLight 组件
 */
@@ -127,4 +130,3 @@ type FileType = 'image' | 'pdf' | 'doc' | 'excel' | 'ppt' | 'zip' | 'video' | 'a
  * 获取文件类及 icon
 */
 export declare const getFileType: (fileName: string) => [FileType, string];
-export {};

package/utils/StringUtil.js

@@ -28,13 +28,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFileType = exports.getSuffix = exports.getFileName = exports.getFloat = exports.getInteger = exports.getBoolean = exports.getString = exports.copy = exports.px = exports.replaceAll = exports.className = exports.searchText = exports.trimLower = exports.isBoolean = exports.isBTCAddress = exports.uuid = exports.genKey = exports.isId = exports.isId15 = exports.isId18 = exports.REG_ID_15 = exports.REG_ID_18 = exports.isIP = exports.isIP6 = exports.isIP4 = exports.isPhone = exports.isMAC = exports.isURL = exports.isEmail = exports.isTelePhone = exports.isMobilePhone = exports.REG_PORT = exports.REG_URL = exports.REG_IPV6 = exports.REG_IPV4 = exports.REG_TELEPHONE = exports.REG_PHONE = exports.REG_EMAIL = void 0;
+exports.getFileType = exports.getSuffix = exports.getFileName = exports.getFloat = exports.getInteger = exports.getBoolean = exports.getString = exports.copy = exports.px = exports.replaceAll = exports.className = exports.searchText = exports.spellMatch = exports.trimLower = exports.isBoolean = exports.isBTCAddress = exports.uuid = exports.genKey = exports.isId = exports.isId15 = exports.isId18 = exports.REG_ID_15 = exports.REG_ID_18 = exports.isIP = exports.isIP6 = exports.isIP4 = exports.isPhone = exports.isMAC = exports.isURL = exports.isEmail = exports.isTelePhone = exports.isMobilePhone = exports.REG_PORT = exports.REG_URL = exports.REG_IPV6 = exports.REG_IPV4 = exports.LETTERS = exports.REG_TELEPHONE = exports.REG_PHONE = exports.REG_EMAIL = void 0;
 var lodash_1 = __importDefault(require("lodash"));
-var _Support_1 = require("./_Support");
 var dayjs_1 = __importDefault(require("dayjs"));
+var _Support_1 = require("./_Support");
+var py_1 = require("./py");
+Object.defineProperty(exports, "spellMatch", { enumerable: true, get: function () { return py_1.spellMatch; } });
+// import type { MatchPatterns } from './_Support';
 exports.REG_EMAIL = /^(([^<>()[\].,;:\s@"]+(\.[^<>()[\].,;:\s@"]+)*)|(".+"))@(([^<>()[\].,;:\s@"]+\.)+[^<>()[\].,;:\s@"]{2,})$/i;
 exports.REG_PHONE = /^((\+|00)86)?(1[3-9]|9[28])\d{9}$/; // https://github.com/validatorjs/validator.js/blob/master/src/lib/isMobilePhone.js
 exports.REG_TELEPHONE = /^0\d{2,3}-[1-9]\d{6,7}$/;
+exports.LETTERS = new Set(['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z']);
 var IPv4SegmentFormat = '(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])';
 var IPv4AddressFormat = "(".concat(IPv4SegmentFormat, "[.]){3}").concat(IPv4SegmentFormat);
 exports.REG_IPV4 = new RegExp("^".concat(IPv4AddressFormat, "$"));
@@ -225,7 +229,12 @@ exports.trimLower = trimLower;
 /**
  * 搜索，用于高亮，通常与 HighLight 结合使用，或只使用 HighLight 组件
 */
-var searchText = function (sentence, keyword) { return (0, _Support_1.matchText)(keyword)(sentence); };
+var searchText = function (sentence, keyword) {
+    var result = (0, py_1.spellMatch)(sentence, keyword);
+    if (result.hit)
+        return result.result;
+    return [{ hit: false, text: sentence }];
+};
 exports.searchText = searchText;
 /**
  * 拼 className

package/utils/TreeUtil.js

@@ -42,6 +42,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.search = exports.buildFlatTree = void 0;
 var lodash_1 = __importDefault(require("lodash"));
 var StringUtil_1 = require("../utils/StringUtil");
+var py_1 = require("../utils/py");
 var buildTree = function (list, root, keyField, parentField, sortField) {
     var e_1, _a;
     if (sortField === void 0) { sortField = null; }
@@ -108,13 +109,13 @@ var search = function (tree, word, titleField) {
     return { word: word, keyword: keyword, match: match };
 };
 exports.search = search;
-var searchNode = function (node, pos, word, result, titleField) {
-    var name = lodash_1.default.toLower(node[titleField]);
-    if (name.indexOf(word) >= 0) {
+var searchNode = function (node, pos, keyword, result, titleField) {
+    var hited = (0, py_1.spellHit)(node[titleField], keyword);
+    if (hited.length >= 0) {
         result.push(pos.join('-'));
     }
     if (node.children && node.children.length) {
-        searchNodes(node.children, pos, word, result, titleField);
+        searchNodes(node.children, pos, keyword, result, titleField);
     }
 };
-var searchNodes = function (data, pos, word, result, titleField) { return data.map(function (item, idx) { return searchNode(item, __spreadArray(__spreadArray([], __read(pos), false), [idx], false), word, result, titleField); }); };
+var searchNodes = function (data, pos, keyword, result, titleField) { return data.map(function (item, idx) { return searchNode(item, __spreadArray(__spreadArray([], __read(pos), false), [idx], false), keyword, result, titleField); }); };

package/utils/_Support.d.ts

@@ -17,12 +17,6 @@ export declare enum Language {
 export declare const globalDefault: <T>(key: GLOBAL_KEY, init: T) => T;
 export declare const TRUE_SET: Set<string>;
 export declare const FALSE_SET: Set<string>;
-export type MatchPatterns = {
-    hit: boolean;
-    text: string;
-};
-type TextMatchFunction = (sentence: string) => MatchPatterns[];
-export declare const matchText: (keyword: any) => TextMatchFunction;
 export declare const APP_ROOT: string;
 export declare const CACHE_URL: Set<string>;
 export {};

package/utils/_Support.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CACHE_URL = exports.APP_ROOT = exports.matchText = exports.FALSE_SET = exports.TRUE_SET = exports.globalDefault = exports.Language = exports.getGlobal = void 0;
+exports.CACHE_URL = exports.APP_ROOT = exports.FALSE_SET = exports.TRUE_SET = exports.globalDefault = exports.Language = exports.getGlobal = void 0;
 var lodash_1 = __importDefault(require("lodash"));
 var getGlobal = function () {
     if (typeof window !== 'undefined') {
@@ -36,71 +36,5 @@ var globalDefault = function (key, init) {
 exports.globalDefault = globalDefault;
 exports.TRUE_SET = new Set(['1', 'true', 'yes']);
 exports.FALSE_SET = new Set(['0', 'false', 'no']);
-var NOT_MATCH = function (sentence) { return [{ hit: false, text: sentence }]; };
-var CACHE = {};
-var matchText = function (keyword) {
-    var word = lodash_1.default.trim(keyword);
-    if (word.length == 0)
-        return NOT_MATCH;
-    var key = word.toLowerCase();
-    var keyLen = key.length;
-    var FN = function (sentence) {
-        var str = lodash_1.default.trim(sentence);
-        if (str.length == 0)
-            return [{ hit: false, text: '' }];
-        var strLen = str.length;
-        var fixed = new Array(strLen);
-        var searchStr = str.toLowerCase();
-        var hasFix = false;
-        var idx = searchStr.indexOf(key);
-        while (idx >= 0) {
-            hasFix = true;
-            for (var i = 0; i < keyLen; i++) {
-                fixed[idx + i] = 1;
-            }
-            idx = searchStr.indexOf(key, idx + keyLen);
-        }
-        if (!hasFix)
-            return [{ hit: false, text: str }];
-        var matched = [];
-        var tagging = false;
-        var start = 0;
-        for (var i = 0; i < strLen; i++) {
-            if (fixed[i]) {
-                if (!tagging) {
-                    tagging = true;
-                    start = i;
-                }
-                if (i == (strLen - 1)) {
-                    tagging = false;
-                    matched.push(start);
-                }
-            }
-            else {
-                if (tagging) {
-                    tagging = false;
-                    matched.push(start);
-                }
-            }
-        }
-        var domList = [];
-        var cur = 0;
-        for (var i = 0, _i = matched.length; i < _i; i++) {
-            var pos = matched[i];
-            domList.push({ hit: false, text: str.substring(cur, pos) });
-            // domList.push(str.substring(pos, pos + keyLen));
-            domList.push({ hit: true, text: str.substring(pos, pos + keyLen) });
-            cur = pos + keyLen;
-        }
-        if (cur < str.length) {
-            domList.push({ hit: false, text: str.substring(cur) });
-        }
-        return domList;
-    };
-    CACHE[keyword] = FN;
-    // window.setTimeout(() => _.unset(CACHE, keyword), 5000)
-    return FN;
-};
-exports.matchText = matchText;
 exports.APP_ROOT = (0, exports.getGlobal)()['APP_ROOT'] || '';
 exports.CACHE_URL = (0, exports.globalDefault)('_INNER_CACHE', new Set());

package/utils/py.d.ts

@@ -0,0 +1,19 @@
+export type TextIndexItem = {
+    i: number;
+    char: string;
+    spell?: string;
+};
+export type TextIndex = TextIndexItem[];
+export declare const createIndex: (txt: string) => TextIndex;
+export declare const matchKeywordByIndex: (key: string, index: TextIndex) => number[];
+export type MatchPatterns = {
+    hit: boolean;
+    text: string;
+};
+export declare const arrangeText: (text: string, hit: number[]) => MatchPatterns[];
+export type SpellResult = {
+    hit: boolean;
+    result?: MatchPatterns[];
+};
+export declare const spellHit: (text: string, keyword: any) => number[];
+export declare const spellMatch: (text: string, keyword: string) => SpellResult;

package/utils/py.js

@@ -0,0 +1,174 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.spellMatch = exports.spellHit = exports.arrangeText = exports.matchKeywordByIndex = exports.createIndex = void 0;
+var Global_1 = require("./Global");
+var lodash_1 = __importDefault(require("lodash"));
+// 创建反向索引
+var createIndex = function (txt) {
+    var index = [];
+    for (var i = 0, _i = txt.length; i < _i; i++) {
+        var char = txt[i];
+        if (Global_1.CONFIG.APP.PY && Global_1.CONFIG.APP.PY.has(char)) {
+            index.push({ i: i, char: char, spell: Global_1.CONFIG.APP.PY.get(char) });
+        }
+        else {
+            index.push({ i: i, char: char.toLowerCase() });
+        }
+    }
+    return index;
+};
+exports.createIndex = createIndex;
+var matchKeywordByIndex = function (key, index) {
+    /**
+     * 字符匹配分为 四步
+     * 1. 将需要搜索的文本创建索引
+     *      并将索引和关键字进行匹配
+    */
+    if (key == null || key.length == 0)
+        return [];
+    var keyword = key.toLowerCase(); // 关键字 转小写
+    var keywordLen = keyword.length;
+    var keywordCursor = 0; // 关键字 当前游标
+    var textLen = index.length;
+    var textCursor = 0; // 文本 当前游标
+    var hited = []; // 命中文本位置
+    var diff = 0; // 字数差值,用于最后计算 
+    //   - 命中次数 + 差值 = 关键字长度,否则无效
+    //  示例 : 关键字 hubei(length=5)  命中: 湖北(length=2) 差值 3  
+    while (keywordCursor < keywordLen) {
+        var char = keyword[keywordCursor];
+        while (textCursor < textLen) {
+            /**
+             * 2. 将关键字从左往右 , 在索引中进行匹配
+             *   如果与索引中的文本一致,则直接命中
+            */
+            var matcher = index[textCursor];
+            if (matcher.char == char) {
+                hited.push(textCursor);
+                textCursor++;
+                break;
+            }
+            if (matcher.spell == null) { // 即不相同,也没有拼音时,直接下一个(双加)
+                textCursor++;
+                continue;
+            }
+            ;
+            /**
+            * 3. 在索引中有拼音的情况下,匹配汉语拼音
+            *       说明1 : 拼音从声母开始, 如  bei  be b 可以匹配 北 , 而  ei  不行.
+            *       说明2 : 匹配过程中, 会将 keyword, 的游标移位 , 更改 {i} {char}
+            *       说明3 : 将匹配的字数存到 spell
+            *                   如 bei = 3 be =2 b =1
+            *                   如果 spell = 0  则没有匹配
+            *       说明4 : 根据spell 再计算hit
+            *                   没有没有匹配上,则不计算 diff
+            */
+            var count = 0;
+            var spell = matcher.spell, _j = spell.length;
+            for (var j = 0; j < _j; j++) {
+                if (char == spell[j]) {
+                    keywordCursor++;
+                    char = keyword[keywordCursor];
+                    count++;
+                    continue;
+                }
+                // pos++;
+                break;
+            }
+            if (count > 0) {
+                hited.push(textCursor);
+                diff += (count - 1);
+            }
+            textCursor++;
+        }
+        /**
+         * 4. 如果原文本已经遍历完成 ,不管关键字有没有完成 ,都直接中段
+        */
+        if (textCursor >= (textLen - 1))
+            break;
+        keywordCursor++;
+    }
+    /**
+     * 5. 根据  hit / diff 计算搜索结果
+    */
+    if ((hited.length + diff) < keywordLen)
+        return [];
+    return hited;
+};
+exports.matchKeywordByIndex = matchKeywordByIndex;
+var arrangeText = function (text, hit) {
+    if (hit == null || hit.length == 0 || text == null || text.length == 0)
+        return [{ text: text, hit: false }];
+    var result = [];
+    var LEN = text.length;
+    var cursor = 0;
+    var hited = hit[0] == 0;
+    var buff = '';
+    var HitSet = new Set(hit);
+    while (cursor < LEN) {
+        if (hited) {
+            if (HitSet.has(cursor)) {
+                buff += text[cursor]; // 连续命中,直接append
+            }
+            else { // 上次命中,但本次未命中
+                if (buff.length)
+                    result.push({ text: buff, hit: true });
+                buff = text[cursor];
+                hited = false;
+            }
+        }
+        else {
+            if (HitSet.has(cursor)) { // 上次未命中,但本次命中中
+                if (buff.length)
+                    result.push({ text: buff, hit: false });
+                buff = text[cursor];
+                hited = true;
+            }
+            else {
+                buff += text[cursor]; // 连续未命中,直接 append
+            }
+        }
+        cursor++;
+    }
+    // 处理最后的缓冲区内容
+    if (buff.length > 0)
+        result.push({ text: buff, hit: hited, });
+    return result;
+};
+exports.arrangeText = arrangeText;
+var spellHit = function (text, keyword) {
+    if (text == null || text.length == 0 || keyword == null || keyword.length == 0)
+        return [];
+    var fullCheck = text.toLowerCase().indexOf(keyword.toLowerCase());
+    var hit;
+    if (fullCheck >= 0) {
+        hit = lodash_1.default.range(fullCheck, fullCheck + keyword.length);
+    }
+    else {
+        hit = (0, exports.matchKeywordByIndex)(keyword, (0, exports.createIndex)(text));
+    }
+    return hit;
+};
+exports.spellHit = spellHit;
+var spellMatch = function (text, keyword) {
+    if (text == null || text.length == 0 || keyword == null || keyword.length == 0)
+        return { hit: false };
+    var fullCheck = text.toLowerCase().indexOf(keyword.toLowerCase());
+    var hit;
+    if (fullCheck >= 0) {
+        hit = lodash_1.default.range(fullCheck, fullCheck + keyword.length);
+    }
+    else {
+        hit = (0, exports.matchKeywordByIndex)(keyword, (0, exports.createIndex)(text));
+    }
+    if (hit.length == 0)
+        return { hit: false };
+    var result = (0, exports.arrangeText)(text, hit);
+    if (result.length == 0)
+        return { hit: false };
+    return { hit: true, result: result };
+};
+exports.spellMatch = spellMatch;