@hw-component/form 1.6.3 → 1.6.5

package/lib/Select/hooks/util.js

@@ -0,0 +1,139 @@
+'use strict';
+
+require('core-js/modules/es.object.keys.js');
+require('core-js/modules/es.symbol.js');
+require('core-js/modules/es.array.filter.js');
+require('core-js/modules/es.object.get-own-property-descriptor.js');
+require('core-js/modules/es.object.get-own-property-descriptors.js');
+var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
+var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
+require('core-js/modules/es.array.find-index.js');
+require('core-js/modules/es.object.to-string.js');
+require('core-js/modules/web.dom-collections.for-each.js');
+require('core-js/modules/es.array.map.js');
+
+var _excluded = ["index"],
+  _excluded2 = ["index"];
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+var findNewValInOldVal = function findNewValInOldVal(val, oldVal) {
+  if (!oldVal) {
+    return -1;
+  }
+  return oldVal.findIndex(function (item) {
+    return item.value === val;
+  });
+};
+var sourceDataProvider = function sourceDataProvider(_ref, oldVal) {
+  var value = _ref.value;
+  var oldData = [];
+  var newData = [];
+  value.forEach(function (item, i) {
+    var index = findNewValInOldVal(item, oldVal);
+    if (index === -1) {
+      newData.push({
+        value: item,
+        index: i
+      });
+      return;
+    }
+    var newVal = oldVal === null || oldVal === void 0 ? void 0 : oldVal[index];
+    oldData.push(_objectSpread(_objectSpread({}, newVal), {}, {
+      index: i
+    }));
+  });
+  return {
+    oldData: oldData,
+    newData: newData
+  };
+};
+var single = function single(_ref2) {
+  var options = _ref2.options,
+    value = _ref2.value;
+  var newOptions = options || [];
+  var index = newOptions.findIndex(function (item) {
+    return item.value === value;
+  });
+  if (index !== -1) {
+    var label = newOptions[index].label;
+    return {
+      value: value,
+      label: label
+    };
+  }
+  return {
+    value: value,
+    label: value,
+    noMatch: true
+  };
+};
+var resultProvider = function resultProvider(newData, oldData, value) {
+  var newResult = new Array(value.length);
+  oldData.forEach(function (item) {
+    var index = item.index,
+      val = _objectWithoutProperties(item, _excluded);
+    newResult[index] = _objectSpread({}, val);
+  });
+  newData.forEach(function (item) {
+    var index = item.index,
+      val = _objectWithoutProperties(item, _excluded2);
+    newResult[index] = _objectSpread({}, val);
+  });
+  return newResult;
+};
+var multiple = function multiple(_ref3, oldVal) {
+  var options = _ref3.options,
+    value = _ref3.value;
+  var _sourceDataProvider = sourceDataProvider({
+      value: value
+    }, oldVal),
+    newData = _sourceDataProvider.newData,
+    oldData = _sourceDataProvider.oldData;
+  var newMatchVal = newData.map(function (item) {
+    var itemVal = item.value,
+      index = item.index;
+    var newItem = single({
+      options: options,
+      value: itemVal
+    });
+    return _objectSpread(_objectSpread({}, newItem), {}, {
+      index: index
+    });
+  });
+  return resultProvider(newMatchVal, oldData, value);
+};
+var tag = function tag(_ref4, oldVal) {
+  var options = _ref4.options,
+    value = _ref4.value;
+  var _sourceDataProvider2 = sourceDataProvider({
+      options: options,
+      value: value
+    }, oldVal),
+    newData = _sourceDataProvider2.newData,
+    oldData = _sourceDataProvider2.oldData;
+  return resultProvider(newData, oldData, value);
+};
+var matchNotFind = function matchNotFind(_ref5, oldVale) {
+  var options = _ref5.options,
+    value = _ref5.value,
+    mode = _ref5.mode;
+  if (!mode) {
+    return single({
+      options: options,
+      value: value
+    });
+  }
+  if (mode === "multiple") {
+    return multiple({
+      options: options,
+      value: value
+    }, oldVale) || [];
+  }
+  return tag({
+    options: options,
+    value: value
+  }, oldVale);
+};
+
+exports.matchNotFind = matchNotFind;
+// powered by h

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/form",
-  "version": "1.6.3",
+  "version": "1.6.5",
   "description": "基于antd二次开发",
   "repository": {
     "type": "git",

package/src/components/Select/hooks/changeHooks.tsx

@@ -1,116 +1,7 @@
-import type {
-  OptionType,
-  PartialHSelectProps,
-} from "@/components/Select/modal";
+import type { PartialHSelectProps } from "@/components/Select/modal";
 import { useEffect, useState } from "react";
-import type { FilterDataModal } from "@/components/Select/modal";
 import { itemOpProvider } from "../utils";
-
-const single = ({ options, value, noMatchItemRender }: PartialHSelectProps) => {
-  const newOptions = options || [];
-  const index = newOptions.findIndex((item) => {
-    return item.value === value;
-  });
-  if (index !== -1) {
-    const { label } = newOptions[index];
-    return {
-      value,
-      label,
-    };
-  }
-  return {
-    value,
-    label: noMatchItemRender?.({ value }) || value,
-  };
-}; //单选模式
-const findNewValInOldVal = (val, oldVal?: any[]) => {
-  if (!oldVal) {
-    return -1;
-  }
-  return oldVal.findIndex((item) => {
-    return item.value === val;
-  });
-}; //查询新增的 value
-const sourceDataProvider = (
-  { options, value }: PartialHSelectProps,
-  oldVal?: any[]
-) => {
-  const oldData: FilterDataModal[] = [];
-  const newData: FilterDataModal[] = [];
-  value.forEach((item, i) => {
-    const index = findNewValInOldVal(item, oldVal);
-    if (index === -1) {
-      newData.push({
-        value: item,
-        index: i,
-      });
-      return;
-    }
-    const newVal = oldVal?.[index];
-    oldData.push({
-      ...newVal,
-      index: i,
-    });
-  });
-  return {
-    oldData,
-    newData,
-  };
-}; //创建新旧数据
-const resultProvider = (
-  newData: FilterDataModal[],
-  oldData: FilterDataModal[],
-  value: any[]
-) => {
-  const newResult = new Array(value.length);
-  oldData.forEach((item) => {
-    const { index, ...val } = item;
-    newResult[index] = {
-      ...val,
-    };
-  });
-  newData.forEach((item) => {
-    const { index, ...val } = item;
-    newResult[index] = {
-      ...val,
-    };
-  });
-  return newResult;
-};
-const multiple = (
-  { options, value, noMatchItemRender }: PartialHSelectProps,
-  oldVal?: any[]
-) => {
-  const { newData, oldData } = sourceDataProvider({ options, value }, oldVal);
-  const newMatchVal = newData.map((item) => {
-    const { value: itemVal, index } = item;
-    const newItem = single({ options, value: itemVal, noMatchItemRender });
-    return {
-      ...newItem,
-      index,
-    };
-  });
-  return resultProvider(newMatchVal, oldData, value);
-}; //多选
-const tag = ({ options, value }: PartialHSelectProps, oldVal?: any[]) => {
-  const { newData, oldData } = sourceDataProvider({ options, value }, oldVal);
-  return resultProvider(newData, oldData, value);
-}; //tags模式
-const matchNotFind = (
-  { options, value, mode, noMatchItemRender ,labelInValue}: PartialHSelectProps,
-  oldVale?: OptionType[]
-) => {
- if (labelInValue){
-    return  value;
- }
-  if (!mode) {
-    return single({ options, value, noMatchItemRender });
-  }
-  if (mode === "multiple") {
-    return multiple({ options, value, noMatchItemRender }, oldVale) || [];
-  }
-  return tag({ options, value }, oldVale);
-}; //不匹配
+import { matchNotFind } from "./util";
 export const useValueChange = (params: PartialHSelectProps) => {
   const {
     labelInValue,
@@ -158,9 +49,36 @@ export const useValueChange = (params: PartialHSelectProps) => {
         return matchNotFind(params, oldVale);
       });
     }
-  }, [value, options, mode, noMatchItemRender,labelInValue]);
+  }, [value, options, mode]);
+  const itemMaker = (item) => {
+    const { value: itemVal, label, noMatch } = item;
+    if (noMatch) {
+      return {
+        value: itemVal,
+        label: noMatchItemRender?.({ value }) || value,
+      };
+    }
+    return {
+      value: itemVal,
+      label,
+    };
+  };
+  const valuesMaker = () => {
+    if (labelInValue) {
+      return val;
+    }
+    if (!val) {
+      return val;
+    }
+    if (Array.isArray(val)) {
+      return val.map((item) => {
+        return itemMaker(item);
+      });
+    }
+    return itemMaker(val);
+  };
   return {
-    val,
+    val: valuesMaker(),
     change,
   };
 };

package/src/components/Select/hooks/norHooks.ts

@@ -1,80 +1,77 @@
-import {useEffect, useMemo, useState} from "react";
-import type {
-  OptionType,
-  PartialHSelectProps,
-} from "../modal";
+import { useEffect, useMemo, useState } from "react";
+import type { OptionType, PartialHSelectProps } from "../modal";
 import { useRequest } from "ahooks";
 import { useFormContext } from "../../Form/Context";
-import {OptionsPageResultModal} from "../modal";
+import type { OptionsPageResultModal } from "../modal";
 
 interface ParamsModal {
   options?: OptionType[];
   params?: any;
 }
-const useSaveParams=()=>{
-  const saveParams=useMemo(()=>{
+const useSaveParams = () => {
+  const saveParams = useMemo(() => {
     return {
-      listParams:{
-        isEnd:false,
-        page:1,
-        size:100,
-        reqParams:{}
-      }
-    }
-  },[]);
-  const resetSaveParams=()=>{
-      saveParams.listParams={
-        isEnd:false,
-        page:1,
-        size:100,
-        reqParams:{}
-      }
-  }
-  const nextPage=(data:OptionsPageResultModal)=>{
-    const {size,total,page}=data;
-    saveParams.listParams.size=size;
-    saveParams.listParams.page=page+1;
-    saveParams.listParams.isEnd=size*page>=total;
-  }
+      listParams: {
+        isEnd: false,
+        page: 1,
+        size: 100,
+        reqParams: {},
+      },
+    };
+  }, []);
+  const resetSaveParams = () => {
+    saveParams.listParams = {
+      isEnd: false,
+      page: 1,
+      size: 100,
+      reqParams: {},
+    };
+  };
+  const nextPage = (data: OptionsPageResultModal) => {
+    const { size, total, page } = data;
+    saveParams.listParams.size = size;
+    saveParams.listParams.page = page + 1;
+    saveParams.listParams.isEnd = size * page >= total;
+  };
   return {
     saveParams,
     resetSaveParams,
-    nextPage
-  }
-}
+    nextPage,
+  };
+};
 const useOptionsRequest = ({
   request,
   dispatch = {},
   manual,
   options,
-  isList
+  isList,
 }: PartialHSelectProps) => {
-  const {saveParams,resetSaveParams,nextPage}=useSaveParams();
+  const { saveParams, resetSaveParams, nextPage } = useSaveParams();
   const { form } = useFormContext();
   const { manual: dispatchManual } = dispatch;
   const [data, setData] = useState<OptionType[] | undefined>();
-  const paramsProvider=(params:Record<string, any>)=>{
-    if (isList){
-      const page=saveParams.listParams.page;
-      const size=saveParams.listParams.size;
-      return  {
+  const paramsProvider = (params: Record<string, any>) => {
+    if (isList) {
+      const page = saveParams.listParams.page;
+      const size = saveParams.listParams.size;
+      return {
         ...params,
         page,
-        size
-      }
+        size,
+      };
     }
     return params;
-  }
-  const { run, loading, error } = useRequest(
-    async (requestParams = {},type="init") => {
-      const { params = saveParams.listParams.reqParams, values} = requestParams;
+  };
+  const { run:listRun, loading, error } = useRequest(
+    async (requestParams = {}, type = "init") => {
+      const { params = saveParams.listParams.reqParams, values } = requestParams;
       const formData = values || form?.getFieldsValue();
       if (type === "init") {
         resetSaveParams();
         setData(undefined);
       }
-      saveParams.listParams.reqParams=params;
-      if (isList&&saveParams.listParams.isEnd){
+      saveParams.listParams.reqParams = params;
+      if (isList && saveParams.listParams.isEnd) {
         return data;
       }
       if (request) {
@@ -86,20 +83,23 @@ const useOptionsRequest = ({
       manual: dispatchManual === false ? true : manual,
       debounceInterval: 300,
       onSuccess: (resultData) => {
-        if (Array.isArray(resultData)||!resultData){
-         return  setData(resultData);
+        if (Array.isArray(resultData) || !resultData) {
+          return setData(resultData);
         }
-        const oldData=data||[];
-        const {data:resultOption}=resultData;
-        const op = resultOption||[];
+        const oldData = data || [];
+        const { data: resultOption } = resultData;
+        const op = resultOption || [];
         nextPage(resultData);
-        setData([
-            ...oldData,
-            ...op
-        ]);
+        setData([...oldData, ...op]);
       },
     }
   );
+  const run=(requestParams = {}, type = "init")=>{
+    if (loading){
+      return;
+    }
+    listRun(requestParams,type);
+  }
   return {
     loading,
     run,
@@ -124,7 +124,7 @@ export const useSelectReq = ({
     dispatch,
     manual,
     options,
-    isList
+    isList,
   });
   const reload = (reloadParams?: ParamsModal) => {
     const { options: changeOpts, params } = reloadParams || {};
@@ -145,13 +145,16 @@ export const useSelectReq = ({
       setData(options);
     }
   }, [options]);
-  const onPopupScroll=(e)=>{
-    const {target} = e;
-    const changeTarget=(target as any);
-    if (changeTarget.scrollTop + changeTarget.offsetHeight === changeTarget.scrollHeight) {
-      run({},"page");
+  const onPopupScroll = (e) => {
+    const { target } = e;
+    const changeTarget = target as any;
+    if (
+      changeTarget.scrollTop + changeTarget.offsetHeight ===
+      changeTarget.scrollHeight
+    ) {
+      run({}, "page");
     }
-  }
+  };
   const mathShowSearch = showSearch || serviceSearch;
   return {
     run,
@@ -161,7 +164,7 @@ export const useSelectReq = ({
     onSearch: mathShowSearch ? onSearch : propsOnSearch,
     mathShowSearch: showSearch || serviceSearch,
     reload,
-    onPopupScroll:isList?onPopupScroll:undefined
+    onPopupScroll: isList ? onPopupScroll : undefined,
   };
 };
 
@@ -170,7 +173,7 @@ export const useFilterOption = ({
   serviceSearch,
 }: PartialHSelectProps) => {
   if (serviceSearch) {
-    return false
+    return false;
   }
   return filterOption;
 };

package/src/components/Select/hooks/util.ts

@@ -0,0 +1,106 @@
+import type {
+  FilterDataModal,
+  OptionType,
+  PartialHSelectProps,
+} from "@/components/Select/modal";
+
+const findNewValInOldVal = (val, oldVal?: any[]) => {
+  if (!oldVal) {
+    return -1;
+  }
+  return oldVal.findIndex((item) => {
+    return item.value === val;
+  });
+}; //查询新增的 value
+
+const sourceDataProvider = ({ value }: PartialHSelectProps, oldVal?: any[]) => {
+  const oldData: FilterDataModal[] = [];
+  const newData: FilterDataModal[] = [];
+  value.forEach((item, i) => {
+    const index = findNewValInOldVal(item, oldVal);
+    if (index === -1) {
+      newData.push({
+        value: item,
+        index: i,
+      });
+      return;
+    }
+    const newVal = oldVal?.[index];
+    oldData.push({
+      ...newVal,
+      index: i,
+    });
+  });
+  return {
+    oldData,
+    newData,
+  };
+}; //创建新旧数据
+
+const single = ({ options, value }: PartialHSelectProps) => {
+  const newOptions = options || [];
+  const index = newOptions.findIndex((item) => {
+    return item.value === value;
+  });
+  if (index !== -1) {
+    const { label } = newOptions[index];
+    return {
+      value,
+      label,
+    };
+  }
+  return {
+    value,
+    label: value,
+    noMatch: true,
+  };
+}; //单选模式
+const resultProvider = (
+  newData: FilterDataModal[],
+  oldData: FilterDataModal[],
+  value: any[]
+) => {
+  const newResult = new Array(value.length);
+  oldData.forEach((item) => {
+    const { index, ...val } = item;
+    newResult[index] = {
+      ...val,
+    };
+  });
+  newData.forEach((item) => {
+    const { index, ...val } = item;
+    newResult[index] = {
+      ...val,
+    };
+  });
+  return newResult;
+};
+const multiple = ({ options, value }: PartialHSelectProps, oldVal?: any[]) => {
+  const { newData, oldData } = sourceDataProvider({ value }, oldVal);
+  const newMatchVal = newData.map((item) => {
+    const { value: itemVal, index } = item;
+    const newItem = single({ options, value: itemVal });
+    return {
+      ...newItem,
+      index,
+    };
+  });
+  return resultProvider(newMatchVal, oldData, value);
+}; //多选
+
+const tag = ({ options, value }: PartialHSelectProps, oldVal?: any[]) => {
+  const { newData, oldData } = sourceDataProvider({ options, value }, oldVal);
+  return resultProvider(newData, oldData, value);
+}; //tags模式
+export const matchNotFind = (
+  { options, value, mode }: PartialHSelectProps,
+  oldVale?: OptionType[]
+) => {
+  if (!mode) {
+    return single({ options, value });
+  }
+  if (mode === "multiple") {
+    return multiple({ options, value }, oldVale) || [];
+  }
+  return tag({ options, value }, oldVale);
+}; //不匹配

package/src/components/Select/index.tsx

@@ -1,6 +1,6 @@
 import { Select } from "antd";
 import React from "react";
-import {useFilterOption, useSelectReq} from "./hooks/norHooks";
+import { useFilterOption, useSelectReq } from "./hooks/norHooks";
 import { useValueChange } from "./hooks/changeHooks";
 import type { HSelectProps } from "./modal";
 import { defaultModeConfig, defaultSelectConfig } from "./defaultConfig";
@@ -34,7 +34,7 @@ const Index: React.FC<HSelectProps> = ({
   addFormat,
   dispatch,
   isList,
-  onPopupScroll:propsOnPopupScroll,
+  onPopupScroll: propsOnPopupScroll,
   ...props
 }) => {
   const { icon, render } = modeConfig?.[mode || ""] || {};
@@ -48,7 +48,7 @@ const Index: React.FC<HSelectProps> = ({
     onSearch,
     mathShowSearch,
     reload,
-    onPopupScroll
+    onPopupScroll,
   } = useSelectReq({
     options,
     manual,
@@ -58,7 +58,7 @@ const Index: React.FC<HSelectProps> = ({
     showSearch,
     onSearch: propsOnSearch,
     dispatch,
-    isList
+    isList,
   }); //options
 
   const data = useChangeOptions({ options: resultData, fieldNames });
@@ -107,7 +107,7 @@ const Index: React.FC<HSelectProps> = ({
       filterOption={selfFilterOption}
       showSearch={mathShowSearch}
       labelInValue={true}
-      onPopupScroll={propsOnPopupScroll||onPopupScroll}
+      onPopupScroll={propsOnPopupScroll || onPopupScroll}
       {...props}
     >
       {data?.map((item) => {

package/src/components/Select/modal.ts

@@ -20,11 +20,9 @@ export interface OptionsPageResultModal {
   page: number;
   size: number;
   data: OptionsListType;
-  total:number;
+  total: number;
 }
-export type OptionsDataType =
-  | OptionsListType
-  | OptionsPageResultModal
+export type OptionsDataType = OptionsListType | OptionsPageResultModal;
 export interface HSelectProps
   extends Omit<SelectProps, "options" | "placeholder"> {
   style?: React.CSSProperties;
@@ -40,7 +38,7 @@ export interface HSelectProps
   addFormat?: (format: Record<string, addFormatItemModal>) => void;
   placeholder?: string;
   dispatch?: DispatchModal;
-  isList?:boolean
+  isList?: boolean;
 }
 export interface FilterDataModal {
   value: any;