@kne/super-select-plus 0.1.0 → 0.1.2

package/dist/index.modern.js

@@ -71,11 +71,110 @@ const withLocale = createWithIntlProvider({
   namespace: 'super-select-plus'
 });
 
-const _excluded$4 = ["data", "name", "type", "cache", "children", "getLabel", "dataFormat", "transformItem"];
+const _excluded$4 = ["data", "name", "names", "type", "cache", "children", "getLabel", "dataFormat", "transformItem"];
 const enumCache = new Map();
 
 // 默认子组件渲染函数
-const defaultChildren = item => get(item, 'label', '');
+const defaultChildren = output => {
+  if (Array.isArray(output)) {
+    return output.map(item => get(item, 'label', '')).filter(Boolean).toString();
+  }
+  return get(output, 'label', '');
+};
+const getLabels = output => Array.isArray(output) ? output.map(item => get(item, 'label', '')).filter(Boolean) : output ? [get(output, 'label', '')].filter(Boolean) : [];
+
+/**
+ * 将 EnumDisplay / FunctionEnum / IndustryEnum 解析结果转为选择器 value
+ * @param {Array|Object} items createEnumComponent children 第一个参数
+ * @param {Object} options valueKey / labelKey 字段映射
+ */
+const enumItemsToSelectValue = (items, {
+  valueKey: _valueKey = 'id',
+  labelKey: _labelKey = 'name'
+} = {}) => (Array.isArray(items) ? items : [items]).filter(Boolean).map(item => {
+  var _item$id, _ref, _item$label;
+  return {
+    [_valueKey]: (_item$id = item.id) != null ? _item$id : item.code,
+    [_labelKey]: (_ref = (_item$label = item.label) != null ? _item$label : item.name) != null ? _ref : item.chName
+  };
+});
+
+/**
+ * 将单个 Enum 解析结果转为选择器 value（单选）
+ */
+const enumItemToSelectValue = (item, options) => {
+  var _enumItemsToSelectVal;
+  return (_enumItemsToSelectVal = enumItemsToSelectValue(item, options)[0]) != null ? _enumItemsToSelectVal : null;
+};
+
+/**
+ * 将 AddressEnum 解析结果转为 SelectAddress value（支持 name 单值或 names 数组）
+ */
+const addressEnumToSelectValue = outputs => {
+  const list = Array.isArray(outputs) ? outputs : outputs ? [outputs] : [];
+  return list.filter(item => item == null ? void 0 : item.city).map(({
+    city
+  }) => _extends({
+    value: city.code,
+    label: city.name
+  }, city));
+};
+
+/**
+ * 将单个 AddressEnum 解析结果转为 SelectAddress value（单选）
+ */
+const addressEnumToSelectValueSingle = output => {
+  var _addressEnumToSelectV;
+  return (_addressEnumToSelectV = addressEnumToSelectValue(output)[0]) != null ? _addressEnumToSelectV : null;
+};
+const resolveOutput = (mapping, name, names) => {
+  if (names) {
+    return names.map(code => mapping.get(code));
+  }
+  return mapping.get(name);
+};
+const cacheOutput = (output, {
+  cacheKey,
+  type,
+  name,
+  names
+}) => {
+  if (!cacheKey || !type) {
+    return;
+  }
+  if (names) {
+    names.forEach((code, index) => {
+      const item = output[index];
+      if (item) {
+        enumCache.set(`${cacheKey}_${type}_${code}`, item);
+      }
+    });
+    return;
+  }
+  if (output) {
+    enumCache.set(`${cacheKey}_${type}_${name}`, output);
+  }
+};
+const getCachedOutput = ({
+  cacheKey,
+  type,
+  name,
+  names,
+  force
+}) => {
+  var _enumCache$get;
+  if (force) {
+    return null;
+  }
+  if (names != null && names.length) {
+    const items = names.map(code => enumCache.get(`${cacheKey}_${type}_${code}`));
+    return items.every(Boolean) ? items : null;
+  }
+  if (name == null) {
+    return null;
+  }
+  return (_enumCache$get = enumCache.get(`${cacheKey}_${type}_${name}`)) != null ? _enumCache$get : null;
+};
 
 /**
  * 默认获取标签函数
@@ -104,18 +203,19 @@ const defaultTransformItem = (item, label) => _extends({}, item, {
 /**
  * 内部枚举显示组件
  */
-const EnumDisplayInner = withFetch(_ref => {
+const EnumDisplayInner = withFetch(_ref2 => {
   let {
       data,
       name,
+      names,
       type,
       cache: cacheKey,
       children,
       getLabel,
       dataFormat,
       transformItem
-    } = _ref,
-    props = _objectWithoutPropertiesLoose(_ref, _excluded$4);
+    } = _ref2,
+    props = _objectWithoutPropertiesLoose(_ref2, _excluded$4);
   const {
     locale
   } = useIntl();
@@ -131,17 +231,18 @@ const EnumDisplayInner = withFetch(_ref => {
       return [item.code, transformedItem];
     }));
   }, [formattedData, getLabel, locale, transformItem]);
-
-  // 获取枚举值
-  const output = mapping.get(name);
-
-  // 缓存结果
-  if (output && cacheKey && type) {
-    enumCache.set(`${cacheKey}_${type}_${name}`, output);
-  }
+  const output = useMemo(() => resolveOutput(mapping, name, names), [mapping, name, names]);
+  cacheOutput(output, {
+    cacheKey,
+    type,
+    name,
+    names
+  });
   return children(output, _extends({}, props, {
     locale,
-    mapping
+    mapping,
+    names,
+    labels: getLabels(output)
   }));
 });
 
@@ -149,9 +250,9 @@ const EnumDisplayInner = withFetch(_ref => {
  * 枚举显示组件
  */
 const EnumDisplay = withLocale(props => {
-  useIntl();
   const {
     name,
+    names,
     type = 'default',
     cache: cacheKey = 'ENUM_DATA',
     force = false,
@@ -160,13 +261,18 @@ const EnumDisplay = withLocale(props => {
     transformItem = defaultTransformItem,
     children = defaultChildren
   } = props;
-
-  // 检查缓存
-  const key = `${cacheKey}_${type}_${name}`;
-  const cached = enumCache.get(key);
-  if (cached && !force) {
+  const cached = getCachedOutput({
+    cacheKey,
+    type,
+    name,
+    names,
+    force
+  });
+  if (cached) {
     return children(cached, {
-      locale: props.locale
+      locale: props.locale,
+      names,
+      labels: getLabels(cached)
     });
   }
   return /*#__PURE__*/jsx(EnumDisplayInner, _extends({}, props, {
@@ -202,16 +308,22 @@ const createEnumComponent = options => {
   const EnumComponent = withLocale(props => {
     const {
       name,
+      names,
       force = false,
       children = defaultChildren
     } = props;
-
-    // 检查缓存
-    const key = `${cache}_${type}_${name}`;
-    const cached = enumCache.get(key);
-    if (cached && !force) {
+    const cached = getCachedOutput({
+      cacheKey: cache,
+      type,
+      name,
+      names,
+      force
+    });
+    if (cached) {
       return children(cached, {
-        locale: props.locale
+        locale: props.locale,
+        names,
+        labels: getLabels(cached)
       });
     }
     return /*#__PURE__*/jsx(EnumDisplayInner, _extends({}, props, defaultApi, {
@@ -268,6 +380,151 @@ const FunctionEnum = createEnumComponent({
   defaultApi: defaultFunctionApi
 });
 
+const getItemId = (item, valueKey = 'id') => {
+  var _ref, _ref2, _item$valueKey;
+  if (item == null) {
+    return null;
+  }
+  if (typeof item !== 'object') {
+    return item;
+  }
+  return (_ref = (_ref2 = (_item$valueKey = item[valueKey]) != null ? _item$valueKey : item.id) != null ? _ref2 : item.code) != null ? _ref : null;
+};
+const getItemLabel = (item, labelKey = 'name') => {
+  var _ref3, _ref4, _item$labelKey;
+  if (item == null || typeof item !== 'object') {
+    return null;
+  }
+  return (_ref3 = (_ref4 = (_item$labelKey = item[labelKey]) != null ? _item$labelKey : item.label) != null ? _ref4 : item.name) != null ? _ref3 : null;
+};
+const resolveItemFromNode = (item, node, {
+  valueKey: _valueKey = 'id',
+  labelKey: _labelKey = 'name'
+} = {}) => {
+  const id = getItemId(item, _valueKey);
+  if (id == null) {
+    return item;
+  }
+  if (!node) {
+    const _label = getItemLabel(item, _labelKey);
+    if (typeof item === 'object') {
+      return _label != null && _label !== String(id) ? item : _extends({}, typeof item === 'object' ? item : {}, {
+        [_valueKey]: id,
+        [_labelKey]: _label || String(id)
+      });
+    }
+    return {
+      [_valueKey]: id,
+      [_labelKey]: String(id)
+    };
+  }
+  const label = getItemLabel(item, _labelKey) || node[_labelKey] || node.name;
+  return _extends({}, node, typeof item === 'object' ? item : {}, {
+    [_valueKey]: id,
+    [_labelKey]: label
+  });
+};
+
+/**
+ * 通过扁平 Map 解析 value（推荐，不依赖级联树结构）
+ */
+const resolveCascaderValueFromMap = (value, mapping, {
+  valueKey: _valueKey2 = 'id',
+  labelKey: _labelKey2 = 'name',
+  single: _single = false
+} = {}) => {
+  if (value == null || !(mapping != null && mapping.size)) {
+    return value;
+  }
+  const resolveItem = item => resolveItemFromNode(item, mapping.get(getItemId(item, _valueKey2)), {
+    valueKey: _valueKey2,
+    labelKey: _labelKey2
+  });
+  if (_single) {
+    const current = Array.isArray(value) ? value[0] : value;
+    return current != null ? resolveItem(current) : value;
+  }
+  return Array.isArray(value) ? value.map(resolveItem) : value;
+};
+
+/**
+ * 将仅含编码的 value 解析为含 label 的完整对象（城市选择器）
+ */
+const resolveAddressValue = (value, addressApi, {
+  single: _single2 = false
+} = {}) => {
+  if (value == null || !addressApi) {
+    return value;
+  }
+  const resolveItem = item => {
+    var _item$value, _item$label;
+    if (item == null) {
+      return item;
+    }
+    const code = typeof item === 'object' ? (_item$value = item.value) != null ? _item$value : item.code : item;
+    if (!code) {
+      return typeof item === 'object' ? item : null;
+    }
+    const label = typeof item === 'object' ? (_item$label = item.label) != null ? _item$label : item.name : null;
+    if (label && label !== String(code)) {
+      return typeof item === 'object' ? item : {
+        value: code,
+        label
+      };
+    }
+    const {
+      city
+    } = addressApi.getCity(code);
+    return city ? _extends({
+      value: code,
+      label: city.name
+    }, city) : {
+      value: code,
+      label: String(code)
+    };
+  };
+  if (_single2) {
+    const current = Array.isArray(value) ? value[0] : value;
+    return current != null ? resolveItem(current) : value;
+  }
+  return Array.isArray(value) ? value.map(resolveItem) : value;
+};
+
+/**
+ * 判断是否需要将解析后的 value 同步回 onChange（仅编码 -> 含 label）
+ */
+const shouldSyncSelectValue = (value, resolved, {
+  valueKey: _valueKey3 = 'id',
+  labelKey: _labelKey3 = 'name',
+  single: _single3 = false
+} = {}) => {
+  if (resolved == null || value == null) {
+    return false;
+  }
+  const needSyncItem = (original, resolvedItem) => {
+    const id = getItemId(original, _valueKey3);
+    const resolvedId = getItemId(resolvedItem, _valueKey3);
+    if (id == null || id !== resolvedId) {
+      return false;
+    }
+    const resolvedLabel = getItemLabel(resolvedItem, _labelKey3);
+    if (!resolvedLabel || resolvedLabel === String(id)) {
+      return false;
+    }
+    const valueLabel = getItemLabel(original, _labelKey3);
+    return !valueLabel || valueLabel === String(id);
+  };
+  if (_single3) {
+    const original = Array.isArray(value) ? value[0] : value;
+    const resolvedItem = Array.isArray(resolved) ? resolved[0] : resolved;
+    return needSyncItem(original, resolvedItem);
+  }
+  if (!Array.isArray(value) || !Array.isArray(resolved)) {
+    return false;
+  }
+  return resolved.some((item, index) => needSyncItem(value[index], item));
+};
+
 const _excluded$3 = ["value", "onChange", "single", "placeholder", "isPopup", "overlayWidth", "apis", "onSearch"];
 const defaultFunctionData = () => {
   return import('./function-99219f66.js').then(module => module['__esModule'] ? module.default : module);
@@ -330,6 +587,38 @@ const SelectFunctionInner = _ref => {
     });
   }, []);
   const options = useMemo(() => transformToCascaderData$1(data, locale), [data, locale]);
+  const flatMapping = useMemo(() => {
+    const mapping = new Map();
+    data.forEach(item => {
+      mapping.set(item.code, _extends({}, item, {
+        id: item.code,
+        name: getLabelForLocal$3(item, locale)
+      }));
+    });
+    return mapping;
+  }, [data, locale]);
+  const normalizedValue = useMemo(() => resolveCascaderValueFromMap(value, flatMapping, {
+    valueKey: 'id',
+    labelKey: 'name',
+    single
+  }), [value, flatMapping, single]);
+  useEffect(() => {
+    if (!onChange || !flatMapping.size) {
+      return;
+    }
+    const resolved = resolveCascaderValueFromMap(value, flatMapping, {
+      valueKey: 'id',
+      labelKey: 'name',
+      single
+    });
+    if (shouldSyncSelectValue(value, resolved, {
+      valueKey: 'id',
+      labelKey: 'name',
+      single
+    })) {
+      onChange(resolved);
+    }
+  }, [value, flatMapping, single, onChange]);
   const handleSearch = (searchText, {
     mapping
   }) => {
@@ -340,7 +629,7 @@ const SelectFunctionInner = _ref => {
     });
   };
   return /*#__PURE__*/jsx(SelectCascader, _extends({}, props, {
-    value: value,
+    value: normalizedValue,
     onChange: onChange,
     single: single,
     placeholder: placeholder || formatMessage({
@@ -461,6 +750,38 @@ const SelectIndustryInner = _ref => {
     });
   }, []);
   const options = useMemo(() => transformToCascaderData(data, locale), [data, locale]);
+  const flatMapping = useMemo(() => {
+    const mapping = new Map();
+    data.filter(item => item.code !== '000').forEach(item => {
+      mapping.set(item.code, _extends({}, item, {
+        id: item.code,
+        name: getLabelForLocal$2(item, locale)
+      }));
+    });
+    return mapping;
+  }, [data, locale]);
+  const normalizedValue = useMemo(() => resolveCascaderValueFromMap(value, flatMapping, {
+    valueKey: 'id',
+    labelKey: 'name',
+    single
+  }), [value, flatMapping, single]);
+  useEffect(() => {
+    if (!onChange || !flatMapping.size) {
+      return;
+    }
+    const resolved = resolveCascaderValueFromMap(value, flatMapping, {
+      valueKey: 'id',
+      labelKey: 'name',
+      single
+    });
+    if (shouldSyncSelectValue(value, resolved, {
+      valueKey: 'id',
+      labelKey: 'name',
+      single
+    })) {
+      onChange(resolved);
+    }
+  }, [value, flatMapping, single, onChange]);
   const handleSearch = (searchText, {
     mapping
   }) => {
@@ -471,7 +792,7 @@ const SelectIndustryInner = _ref => {
     });
   };
   return /*#__PURE__*/jsx(SelectCascader, _extends({}, props, {
-    value: value,
+    value: normalizedValue,
     onChange: onChange,
     single: single,
     placeholder: placeholder || formatMessage({
@@ -494,8 +815,8 @@ const SelectIndustry = withLocale(SelectIndustryInner);
 SelectIndustry.defaultData = defaultIndustryData;
 SelectIndustry.Enum = IndustryEnum;
 
-const _excluded$1 = ["data", "name", "children", "displayParent"],
-  _excluded2 = ["displayParent"];
+const _excluded$1 = ["data", "name", "names", "children", "displayParent"],
+  _excluded2$1 = ["displayParent"];
 const getLabelForLocal$1 = (item, locale) => {
   if (locale === 'en-US') {
     return get(item, 'enName') || get(item, 'name');
@@ -523,6 +844,7 @@ const AddressEnumInner = withFetch(_ref => {
   let {
       data,
       name,
+      names,
       children,
       displayParent
     } = _ref,
@@ -531,6 +853,33 @@ const AddressEnumInner = withFetch(_ref => {
     locale
   } = useIntl();
   const addressApi = useMemo(() => createAddressApi(data), [data]);
+  const formatCityData = cityData => {
+    const {
+      city,
+      parent
+    } = cityData;
+    if (!city) {
+      return '';
+    }
+    if (displayParent && parent) {
+      return `${getLabelForLocal$1(parent, locale)}·${getLabelForLocal$1(city, locale)}`;
+    }
+    return getLabelForLocal$1(city, locale);
+  };
+  if (names != null && names.length) {
+    const outputs = names.map(code => addressApi.getCity(code));
+    const labels = outputs.map(formatCityData).filter(Boolean);
+    if (children) {
+      return children(outputs, _extends({
+        displayParent,
+        locale,
+        getLabelForLocal: getLabelForLocal$1,
+        names,
+        labels
+      }, props));
+    }
+    return labels.toString();
+  }
 
   // 获取城市数据
   const cityData = addressApi.getCity(name);
@@ -561,7 +910,7 @@ const AddressEnum = withLocale(props => {
   const {
       displayParent = false
     } = props,
-    restProps = _objectWithoutPropertiesLoose(props, _excluded2);
+    restProps = _objectWithoutPropertiesLoose(props, _excluded2$1);
   return /*#__PURE__*/jsx(AddressEnumInner, _extends({}, addressDefaultApi, {
     displayParent: displayParent
   }, restProps));
@@ -648,9 +997,10 @@ var classnames = createCommonjsModule(function (module) {
 }());
 });
 
-var style = {"address":"_MMoPf","is-popup":"_bYKMf","title":"_pKOHI","scroll-box":"_MObpF","scroll-plus-box":"_iKm8i","content":"_BfCap","col-left":"_BEChX","menu-list":"_gXzFG","menu-item":"_LasXn","col-right":"_1jQmu","search-input":"_YB45l","list":"_Y-MIq","list-item":"_6JEMZ","item-label":"_nlduJ"};
+var style = {"address":"kne-super-select-plus_MMoPf","is-popup":"kne-super-select-plus_bYKMf","title":"kne-super-select-plus_pKOHI","scroll-box":"kne-super-select-plus_MObpF","scroll-plus-box":"kne-super-select-plus_iKm8i","content":"kne-super-select-plus_BfCap","col-left":"kne-super-select-plus_BEChX","menu-list":"kne-super-select-plus_gXzFG","menu-item":"kne-super-select-plus_LasXn","col-right":"kne-super-select-plus_1jQmu","search-input":"kne-super-select-plus_YB45l","list":"kne-super-select-plus_Y-MIq","list-item":"kne-super-select-plus_6JEMZ","item-label":"kne-super-select-plus_nlduJ"};
 
-const _excluded = ["single", "isPopup", "showChinaQuan", "showForeignQuan"];
+const _excluded = ["value", "single", "onChange"],
+  _excluded2 = ["single", "isPopup", "showChinaQuan", "showForeignQuan"];
 const getLabelForLocal = (item, locale) => {
   if (locale === 'en-US') {
     return get(item, 'enName') || get(item, 'name');
@@ -965,21 +1315,53 @@ const SelectAddressInner = /*#__PURE__*/forwardRef((props, ref) => {
   const {
     formatMessage
   } = useIntl();
+  const {
+      value,
+      single,
+      onChange
+    } = props,
+    restProps = _objectWithoutPropertiesLoose(props, _excluded);
+  const [cityData, setCityData] = useState(null);
+  useEffect(() => {
+    defaultCityData().then(setCityData);
+  }, []);
+  const addressApi = useMemo(() => cityData ? createAddressApi(cityData) : null, [cityData]);
+  const normalizedValue = useMemo(() => resolveAddressValue(value, addressApi, {
+    single
+  }), [value, addressApi, single]);
+  useEffect(() => {
+    if (!onChange || !addressApi) {
+      return;
+    }
+    const resolved = resolveAddressValue(value, addressApi, {
+      single
+    });
+    if (shouldSyncSelectValue(value, resolved, {
+      valueKey: 'value',
+      labelKey: 'label',
+      single
+    })) {
+      onChange(resolved);
+    }
+  }, [value, addressApi, single, onChange]);
   return /*#__PURE__*/jsx(SelectInput, _extends({
     ref: ref
-  }, props, {
-    placeholder: props.placeholder || formatMessage({
+  }, restProps, {
+    single: single,
+    value: normalizedValue,
+    onChange: onChange,
+    placeholder: restProps.placeholder || formatMessage({
       id: 'addressPlaceholder'
     }, {
       defaultMessage: '请选择城市'
     }),
     children: contextProps => {
       const {
-        value,
+        value: currentValue,
         setValue
       } = contextProps;
       return /*#__PURE__*/jsx(AddressInner, {
-        value: value,
+        value: currentValue,
         setValue: setValue,
         props: props
       });
@@ -993,7 +1375,7 @@ const SelectAddress = withLocale(_ref => {
       showChinaQuan = false,
       showForeignQuan = false
     } = _ref,
-    props = _objectWithoutPropertiesLoose(_ref, _excluded);
+    props = _objectWithoutPropertiesLoose(_ref, _excluded2);
   return /*#__PURE__*/jsx(SelectAddressInner, _extends({
     single: single,
     isPopup: isPopup,
@@ -1013,8 +1395,12 @@ var index = {
   AddressEnum,
   FunctionEnum,
   IndustryEnum,
-  EnumDisplay
+  EnumDisplay,
+  enumItemsToSelectValue,
+  enumItemToSelectValue,
+  addressEnumToSelectValue,
+  addressEnumToSelectValueSingle
 };
 
-export { AddressEnum, EnumDisplay, FunctionEnum, IndustryEnum, SelectAddress, SelectFunction, SelectIndustry, createAddressApi, index as default };
+export { AddressEnum, EnumDisplay, FunctionEnum, IndustryEnum, SelectAddress, SelectFunction, SelectIndustry, addressEnumToSelectValue, addressEnumToSelectValueSingle, createAddressApi, index as default, enumItemToSelectValue, enumItemsToSelectValue };
 //# sourceMappingURL=index.modern.js.map