@hw-component/form 1.6.3 → 1.6.5

package/es/Select/hooks/changeHooks.js

@@ -1,154 +1,10 @@
 // welcome to hoo hoo hoo
-import 'core-js/modules/es.object.keys.js';
-import 'core-js/modules/es.symbol.js';
-import 'core-js/modules/es.array.filter.js';
-import 'core-js/modules/es.object.get-own-property-descriptor.js';
-import 'core-js/modules/es.object.get-own-property-descriptors.js';
 import _slicedToArray from '@babel/runtime-corejs3/helpers/slicedToArray';
-import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
-import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
-import 'core-js/modules/es.array.find-index.js';
-import 'core-js/modules/es.object.to-string.js';
-import 'core-js/modules/web.dom-collections.for-each.js';
 import 'core-js/modules/es.array.map.js';
 import { useState, useEffect } from 'react';
 import { itemOpProvider } from '../utils.js';
+import { matchNotFind } from './util.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 single = function single(_ref) {
-  var options = _ref.options,
-    value = _ref.value,
-    noMatchItemRender = _ref.noMatchItemRender;
-  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: (noMatchItemRender === null || noMatchItemRender === void 0 ? void 0 : noMatchItemRender({
-      value: value
-    })) || value
-  };
-};
-var findNewValInOldVal = function findNewValInOldVal(val, oldVal) {
-  if (!oldVal) {
-    return -1;
-  }
-  return oldVal.findIndex(function (item) {
-    return item.value === val;
-  });
-};
-var sourceDataProvider = function sourceDataProvider(_ref2, oldVal) {
-  _ref2.options;
-    var value = _ref2.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 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,
-    noMatchItemRender = _ref3.noMatchItemRender;
-  var _sourceDataProvider = sourceDataProvider({
-      options: options,
-      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,
-      noMatchItemRender: noMatchItemRender
-    });
-    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,
-    noMatchItemRender = _ref5.noMatchItemRender,
-    labelInValue = _ref5.labelInValue;
-  if (labelInValue) {
-    return value;
-  }
-  if (!mode) {
-    return single({
-      options: options,
-      value: value,
-      noMatchItemRender: noMatchItemRender
-    });
-  }
-  if (mode === "multiple") {
-    return multiple({
-      options: options,
-      value: value,
-      noMatchItemRender: noMatchItemRender
-    }, oldVale) || [];
-  }
-  return tag({
-    options: options,
-    value: value
-  }, oldVale);
-};
 var useValueChange = function useValueChange(params) {
   var labelInValue = params.labelInValue,
     onChange = params.onChange,
@@ -197,9 +53,40 @@ var useValueChange = function useValueChange(params) {
         return matchNotFind(params, oldVale);
       });
     }
-  }, [value, options, mode, noMatchItemRender, labelInValue]);
+  }, [value, options, mode]);
+  var itemMaker = function itemMaker(item) {
+    var itemVal = item.value,
+      label = item.label,
+      noMatch = item.noMatch;
+    if (noMatch) {
+      return {
+        value: itemVal,
+        label: (noMatchItemRender === null || noMatchItemRender === void 0 ? void 0 : noMatchItemRender({
+          value: value
+        })) || value
+      };
+    }
+    return {
+      value: itemVal,
+      label: label
+    };
+  };
+  var valuesMaker = function valuesMaker() {
+    if (labelInValue) {
+      return val;
+    }
+    if (!val) {
+      return val;
+    }
+    if (Array.isArray(val)) {
+      return val.map(function (item) {
+        return itemMaker(item);
+      });
+    }
+    return itemMaker(val);
+  };
   return {
-    val: val,
+    val: valuesMaker(),
     change: change
   };
 };

package/es/Select/hooks/norHooks.d.ts

@@ -1,17 +1,16 @@
 import type { OptionType, PartialHSelectProps } from "../modal";
-import { OptionsPageResultModal } from "../modal";
 interface ParamsModal {
     options?: OptionType[];
     params?: any;
 }
 export declare const useSelectReq: ({ manual, request, options, serviceSearch, showSearch, onSearch: propsOnSearch, dispatch, isList, }: PartialHSelectProps) => {
-    run: (requestParams?: any, type?: any) => Promise<OptionType[] | OptionsPageResultModal | undefined>;
+    run: (requestParams?: {}, type?: string) => void;
     loading: boolean;
     error: Error | undefined;
     data: OptionType[] | undefined;
     onSearch: ((value: string) => void) | undefined;
     mathShowSearch: boolean | undefined;
-    reload: (reloadParams?: ParamsModal) => void | Promise<OptionType[] | OptionsPageResultModal | undefined>;
+    reload: (reloadParams?: ParamsModal) => void;
     onPopupScroll: ((e: any) => void) | undefined;
 };
 export declare const useFilterOption: ({ filterOption, serviceSearch, }: PartialHSelectProps) => boolean | import("rc-select/lib/Select").FilterFunc<import("rc-select/lib/Select").DefaultOptionType> | undefined;

package/es/Select/hooks/norHooks.js

@@ -135,9 +135,17 @@ var useOptionsRequest = function useOptionsRequest(_ref) {
         setData([].concat(_toConsumableArray(oldData), _toConsumableArray(op)));
       }
     }),
-    run = _useRequest.run,
+    listRun = _useRequest.run,
     loading = _useRequest.loading,
     error = _useRequest.error;
+  var run = function run() {
+    var requestParams = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "init";
+    if (loading) {
+      return;
+    }
+    listRun(requestParams, type);
+  };
   return {
     loading: loading,
     run: run,

package/es/Select/hooks/util.d.ts

@@ -0,0 +1,10 @@
+import type { OptionType, PartialHSelectProps } from "@/components/Select/modal";
+export declare const matchNotFind: ({ options, value, mode }: PartialHSelectProps, oldVale?: OptionType[]) => any[] | {
+    value: any;
+    label: any;
+    noMatch?: undefined;
+} | {
+    value: any;
+    label: any;
+    noMatch: boolean;
+};

package/es/Select/hooks/util.js

@@ -0,0 +1,138 @@
+// welcome to hoo hoo hoo
+import 'core-js/modules/es.object.keys.js';
+import 'core-js/modules/es.symbol.js';
+import 'core-js/modules/es.array.filter.js';
+import 'core-js/modules/es.object.get-own-property-descriptor.js';
+import 'core-js/modules/es.object.get-own-property-descriptors.js';
+import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
+import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
+import 'core-js/modules/es.array.find-index.js';
+import 'core-js/modules/es.object.to-string.js';
+import 'core-js/modules/web.dom-collections.for-each.js';
+import '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);
+};
+
+export { matchNotFind };
+// powered by hdj

package/lib/Select/hooks/changeHooks.js

@@ -1,155 +1,11 @@
 '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 _slicedToArray = require('@babel/runtime-corejs3/helpers/slicedToArray');
-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 React = require('react');
 var utils = require('../utils.js');
+var util = require('./util.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 single = function single(_ref) {
-  var options = _ref.options,
-    value = _ref.value,
-    noMatchItemRender = _ref.noMatchItemRender;
-  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: (noMatchItemRender === null || noMatchItemRender === void 0 ? void 0 : noMatchItemRender({
-      value: value
-    })) || value
-  };
-};
-var findNewValInOldVal = function findNewValInOldVal(val, oldVal) {
-  if (!oldVal) {
-    return -1;
-  }
-  return oldVal.findIndex(function (item) {
-    return item.value === val;
-  });
-};
-var sourceDataProvider = function sourceDataProvider(_ref2, oldVal) {
-  _ref2.options;
-    var value = _ref2.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 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,
-    noMatchItemRender = _ref3.noMatchItemRender;
-  var _sourceDataProvider = sourceDataProvider({
-      options: options,
-      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,
-      noMatchItemRender: noMatchItemRender
-    });
-    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,
-    noMatchItemRender = _ref5.noMatchItemRender,
-    labelInValue = _ref5.labelInValue;
-  if (labelInValue) {
-    return value;
-  }
-  if (!mode) {
-    return single({
-      options: options,
-      value: value,
-      noMatchItemRender: noMatchItemRender
-    });
-  }
-  if (mode === "multiple") {
-    return multiple({
-      options: options,
-      value: value,
-      noMatchItemRender: noMatchItemRender
-    }, oldVale) || [];
-  }
-  return tag({
-    options: options,
-    value: value
-  }, oldVale);
-};
 var useValueChange = function useValueChange(params) {
   var labelInValue = params.labelInValue,
     onChange = params.onChange,
@@ -195,12 +51,43 @@ var useValueChange = function useValueChange(params) {
     }
     if (options) {
       setVal(function (oldVale) {
-        return matchNotFind(params, oldVale);
+        return util.matchNotFind(params, oldVale);
+      });
+    }
+  }, [value, options, mode]);
+  var itemMaker = function itemMaker(item) {
+    var itemVal = item.value,
+      label = item.label,
+      noMatch = item.noMatch;
+    if (noMatch) {
+      return {
+        value: itemVal,
+        label: (noMatchItemRender === null || noMatchItemRender === void 0 ? void 0 : noMatchItemRender({
+          value: value
+        })) || value
+      };
+    }
+    return {
+      value: itemVal,
+      label: label
+    };
+  };
+  var valuesMaker = function valuesMaker() {
+    if (labelInValue) {
+      return val;
+    }
+    if (!val) {
+      return val;
+    }
+    if (Array.isArray(val)) {
+      return val.map(function (item) {
+        return itemMaker(item);
       });
     }
-  }, [value, options, mode, noMatchItemRender, labelInValue]);
+    return itemMaker(val);
+  };
   return {
-    val: val,
+    val: valuesMaker(),
     change: change
   };
 };

package/lib/Select/hooks/norHooks.d.ts

@@ -1,17 +1,16 @@
 import type { OptionType, PartialHSelectProps } from "../modal";
-import { OptionsPageResultModal } from "../modal";
 interface ParamsModal {
     options?: OptionType[];
     params?: any;
 }
 export declare const useSelectReq: ({ manual, request, options, serviceSearch, showSearch, onSearch: propsOnSearch, dispatch, isList, }: PartialHSelectProps) => {
-    run: (requestParams?: any, type?: any) => Promise<OptionType[] | OptionsPageResultModal | undefined>;
+    run: (requestParams?: {}, type?: string) => void;
     loading: boolean;
     error: Error | undefined;
     data: OptionType[] | undefined;
     onSearch: ((value: string) => void) | undefined;
     mathShowSearch: boolean | undefined;
-    reload: (reloadParams?: ParamsModal) => void | Promise<OptionType[] | OptionsPageResultModal | undefined>;
+    reload: (reloadParams?: ParamsModal) => void;
     onPopupScroll: ((e: any) => void) | undefined;
 };
 export declare const useFilterOption: ({ filterOption, serviceSearch, }: PartialHSelectProps) => boolean | import("rc-select/lib/Select").FilterFunc<import("rc-select/lib/Select").DefaultOptionType> | undefined;

package/lib/Select/hooks/norHooks.js

@@ -136,9 +136,17 @@ var useOptionsRequest = function useOptionsRequest(_ref) {
         setData([].concat(_toConsumableArray(oldData), _toConsumableArray(op)));
       }
     }),
-    run = _useRequest.run,
+    listRun = _useRequest.run,
     loading = _useRequest.loading,
     error = _useRequest.error;
+  var run = function run() {
+    var requestParams = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "init";
+    if (loading) {
+      return;
+    }
+    listRun(requestParams, type);
+  };
   return {
     loading: loading,
     run: run,

package/lib/Select/hooks/util.d.ts

@@ -0,0 +1,10 @@
+import type { OptionType, PartialHSelectProps } from "@/components/Select/modal";
+export declare const matchNotFind: ({ options, value, mode }: PartialHSelectProps, oldVale?: OptionType[]) => any[] | {
+    value: any;
+    label: any;
+    noMatch?: undefined;
+} | {
+    value: any;
+    label: any;
+    noMatch: boolean;
+};