@kne/super-select-plus 0.1.1 → 0.1.2

package/dist/index.js

@@ -89,17 +89,67 @@ const defaultChildren = output => {
   return get__default["default"](output, 'label', '');
 };
 const getLabels = output => Array.isArray(output) ? output.map(item => get__default["default"](item, 'label', '')).filter(Boolean) : output ? [get__default["default"](output, 'label', '')].filter(Boolean) : [];
+
+/**
+ * 将 EnumDisplay / FunctionEnum / IndustryEnum 解析结果转为选择器 value
+ * @param {Array|Object} items createEnumComponent children 第一个参数
+ * @param {Object} options valueKey / labelKey 字段映射
+ */
+const enumItemsToSelectValue = function (items, _temp) {
+  let _ref = _temp === void 0 ? {} : _temp,
+    _ref$valueKey = _ref.valueKey,
+    valueKey = _ref$valueKey === void 0 ? 'id' : _ref$valueKey,
+    _ref$labelKey = _ref.labelKey,
+    labelKey = _ref$labelKey === void 0 ? 'name' : _ref$labelKey;
+  return (Array.isArray(items) ? items : [items]).filter(Boolean).map(item => {
+    var _item$id, _ref2, _item$label;
+    return {
+      [valueKey]: (_item$id = item.id) != null ? _item$id : item.code,
+      [labelKey]: (_ref2 = (_item$label = item.label) != null ? _item$label : item.name) != null ? _ref2 : 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(_ref3 => {
+    let city = _ref3.city;
+    return _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, _ref) => {
-  let cacheKey = _ref.cacheKey,
-    type = _ref.type,
-    name = _ref.name,
-    names = _ref.names;
+const cacheOutput = (output, _ref4) => {
+  let cacheKey = _ref4.cacheKey,
+    type = _ref4.type,
+    name = _ref4.name,
+    names = _ref4.names;
   if (!cacheKey || !type) {
     return;
   }
@@ -116,13 +166,13 @@ const cacheOutput = (output, _ref) => {
     enumCache.set(cacheKey + "_" + type + "_" + name, output);
   }
 };
-const getCachedOutput = _ref2 => {
+const getCachedOutput = _ref5 => {
   var _enumCache$get;
-  let cacheKey = _ref2.cacheKey,
-    type = _ref2.type,
-    name = _ref2.name,
-    names = _ref2.names,
-    force = _ref2.force;
+  let cacheKey = _ref5.cacheKey,
+    type = _ref5.type,
+    name = _ref5.name,
+    names = _ref5.names,
+    force = _ref5.force;
   if (force) {
     return null;
   }
@@ -163,17 +213,17 @@ const defaultTransformItem = (item, label) => _extends({}, item, {
 /**
  * 内部枚举显示组件
  */
-const EnumDisplayInner = reactFetch.withFetch(_ref3 => {
-  let data = _ref3.data,
-    name = _ref3.name,
-    names = _ref3.names,
-    type = _ref3.type,
-    cacheKey = _ref3.cache,
-    children = _ref3.children,
-    getLabel = _ref3.getLabel,
-    dataFormat = _ref3.dataFormat,
-    transformItem = _ref3.transformItem,
-    props = _objectWithoutPropertiesLoose(_ref3, _excluded$4);
+const EnumDisplayInner = reactFetch.withFetch(_ref6 => {
+  let data = _ref6.data,
+    name = _ref6.name,
+    names = _ref6.names,
+    type = _ref6.type,
+    cacheKey = _ref6.cache,
+    children = _ref6.children,
+    getLabel = _ref6.getLabel,
+    dataFormat = _ref6.dataFormat,
+    transformItem = _ref6.transformItem,
+    props = _objectWithoutPropertiesLoose(_ref6, _excluded$4);
   const _useIntl = reactIntl.useIntl(),
     locale = _useIntl.locale;
 
@@ -343,6 +393,165 @@ const FunctionEnum = createEnumComponent({
   defaultApi: defaultFunctionApi
 });
 
+const getItemId = function (item, valueKey) {
+  var _ref, _ref2, _item$valueKey;
+  if (valueKey === void 0) {
+    valueKey = 'id';
+  }
+  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 = function (item, labelKey) {
+  var _ref3, _ref4, _item$labelKey;
+  if (labelKey === void 0) {
+    labelKey = 'name';
+  }
+  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 = function (item, node, _temp) {
+  let _ref5 = _temp === void 0 ? {} : _temp,
+    _ref5$valueKey = _ref5.valueKey,
+    valueKey = _ref5$valueKey === void 0 ? 'id' : _ref5$valueKey,
+    _ref5$labelKey = _ref5.labelKey,
+    labelKey = _ref5$labelKey === void 0 ? 'name' : _ref5$labelKey;
+  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 = function (value, mapping, _temp2) {
+  let _ref6 = _temp2 === void 0 ? {} : _temp2,
+    _ref6$valueKey = _ref6.valueKey,
+    valueKey = _ref6$valueKey === void 0 ? 'id' : _ref6$valueKey,
+    _ref6$labelKey = _ref6.labelKey,
+    labelKey = _ref6$labelKey === void 0 ? 'name' : _ref6$labelKey,
+    _ref6$single = _ref6.single,
+    single = _ref6$single === void 0 ? false : _ref6$single;
+  if (value == null || !(mapping != null && mapping.size)) {
+    return value;
+  }
+  const resolveItem = item => resolveItemFromNode(item, mapping.get(getItemId(item, valueKey)), {
+    valueKey,
+    labelKey
+  });
+  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 = function (value, addressApi, _temp3) {
+  let _ref8 = _temp3 === void 0 ? {} : _temp3,
+    _ref8$single = _ref8.single,
+    single = _ref8$single === void 0 ? false : _ref8$single;
+  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 _addressApi$getCity = addressApi.getCity(code),
+      city = _addressApi$getCity.city;
+    return city ? _extends({
+      value: code,
+      label: city.name
+    }, city) : {
+      value: code,
+      label: String(code)
+    };
+  };
+  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 同步回 onChange（仅编码 -> 含 label）
+ */
+const shouldSyncSelectValue = function (value, resolved, _temp4) {
+  let _ref9 = _temp4 === void 0 ? {} : _temp4,
+    _ref9$valueKey = _ref9.valueKey,
+    valueKey = _ref9$valueKey === void 0 ? 'id' : _ref9$valueKey,
+    _ref9$labelKey = _ref9.labelKey,
+    labelKey = _ref9$labelKey === void 0 ? 'name' : _ref9$labelKey,
+    _ref9$single = _ref9.single,
+    single = _ref9$single === void 0 ? false : _ref9$single;
+  if (resolved == null || value == null) {
+    return false;
+  }
+  const needSyncItem = (original, resolvedItem) => {
+    const id = getItemId(original, valueKey);
+    const resolvedId = getItemId(resolvedItem, valueKey);
+    if (id == null || id !== resolvedId) {
+      return false;
+    }
+    const resolvedLabel = getItemLabel(resolvedItem, labelKey);
+    if (!resolvedLabel || resolvedLabel === String(id)) {
+      return false;
+    }
+    const valueLabel = getItemLabel(original, labelKey);
+    return !valueLabel || valueLabel === String(id);
+  };
+  if (single) {
+    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 Promise.resolve().then(function () { return require('./function-871311da.js'); }).then(module => module['__esModule'] ? module.default : module);
@@ -407,6 +616,38 @@ const SelectFunctionInner = _ref => {
     });
   }, []);
   const options = react.useMemo(() => transformToCascaderData$1(data, locale), [data, locale]);
+  const flatMapping = react.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 = react.useMemo(() => resolveCascaderValueFromMap(value, flatMapping, {
+    valueKey: 'id',
+    labelKey: 'name',
+    single
+  }), [value, flatMapping, single]);
+  react.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, _ref2) => {
     let mapping = _ref2.mapping;
     if (!searchText) return Array.from(mapping.values());
@@ -416,7 +657,7 @@ const SelectFunctionInner = _ref => {
     });
   };
   return /*#__PURE__*/jsxRuntime.jsx(superSelect.SelectCascader, _extends({}, props, {
-    value: value,
+    value: normalizedValue,
     onChange: onChange,
     single: single,
     placeholder: placeholder || formatMessage({
@@ -539,6 +780,38 @@ const SelectIndustryInner = _ref => {
     });
   }, []);
   const options = react.useMemo(() => transformToCascaderData(data, locale), [data, locale]);
+  const flatMapping = react.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 = react.useMemo(() => resolveCascaderValueFromMap(value, flatMapping, {
+    valueKey: 'id',
+    labelKey: 'name',
+    single
+  }), [value, flatMapping, single]);
+  react.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, _ref2) => {
     let mapping = _ref2.mapping;
     if (!searchText) return Array.from(mapping.values());
@@ -548,7 +821,7 @@ const SelectIndustryInner = _ref => {
     });
   };
   return /*#__PURE__*/jsxRuntime.jsx(superSelect.SelectCascader, _extends({}, props, {
-    value: value,
+    value: normalizedValue,
     onChange: onChange,
     single: single,
     placeholder: placeholder || formatMessage({
@@ -571,8 +844,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__default["default"](item, 'enName') || get__default["default"](item, 'name');
@@ -599,12 +872,38 @@ const addressDefaultApi = {
 const AddressEnumInner = reactFetch.withFetch(_ref => {
   let data = _ref.data,
     name = _ref.name,
+    names = _ref.names,
     children = _ref.children,
     displayParent = _ref.displayParent,
     props = _objectWithoutPropertiesLoose(_ref, _excluded$1);
   const _useIntl = reactIntl.useIntl(),
     locale = _useIntl.locale;
   const addressApi = react.useMemo(() => createAddressApi(data), [data]);
+  const formatCityData = cityData => {
+    const city = cityData.city,
+      parent = cityData.parent;
+    if (!city) {
+      return '';
+    }
+    if (displayParent && parent) {
+      return getLabelForLocal$1(parent, locale) + "\xB7" + 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);
@@ -632,7 +931,7 @@ const AddressEnumInner = reactFetch.withFetch(_ref => {
 const AddressEnum = withLocale(props => {
   const _props$displayParent = props.displayParent,
     displayParent = _props$displayParent === void 0 ? false : _props$displayParent,
-    restProps = _objectWithoutPropertiesLoose(props, _excluded2);
+    restProps = _objectWithoutPropertiesLoose(props, _excluded2$1);
   return /*#__PURE__*/jsxRuntime.jsx(AddressEnumInner, _extends({}, addressDefaultApi, {
     displayParent: displayParent
   }, restProps));
@@ -721,7 +1020,8 @@ var classnames = createCommonjsModule(function (module) {
 
 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__default["default"](item, 'enName') || get__default["default"](item, 'name');
@@ -1036,19 +1336,51 @@ const AddressInner = _ref2 => {
 const SelectAddressInner = /*#__PURE__*/react.forwardRef((props, ref) => {
   const _useIntl2 = reactIntl.useIntl(),
     formatMessage = _useIntl2.formatMessage;
+  const value = props.value,
+    single = props.single,
+    onChange = props.onChange,
+    restProps = _objectWithoutPropertiesLoose(props, _excluded);
+  const _useState4 = react.useState(null),
+    cityData = _useState4[0],
+    setCityData = _useState4[1];
+  react.useEffect(() => {
+    defaultCityData().then(setCityData);
+  }, []);
+  const addressApi = react.useMemo(() => cityData ? createAddressApi(cityData) : null, [cityData]);
+  const normalizedValue = react.useMemo(() => resolveAddressValue(value, addressApi, {
+    single
+  }), [value, addressApi, single]);
+  react.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__*/jsxRuntime.jsx(superSelect.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 = contextProps.value,
+      const currentValue = contextProps.value,
         setValue = contextProps.setValue;
       return /*#__PURE__*/jsxRuntime.jsx(AddressInner, {
-        value: value,
+        value: currentValue,
         setValue: setValue,
         props: props
       });
@@ -1064,7 +1396,7 @@ const SelectAddress = withLocale(_ref4 => {
     showChinaQuan = _ref4$showChinaQuan === void 0 ? false : _ref4$showChinaQuan,
     _ref4$showForeignQuan = _ref4.showForeignQuan,
     showForeignQuan = _ref4$showForeignQuan === void 0 ? false : _ref4$showForeignQuan,
-    props = _objectWithoutPropertiesLoose(_ref4, _excluded);
+    props = _objectWithoutPropertiesLoose(_ref4, _excluded2);
   return /*#__PURE__*/jsxRuntime.jsx(SelectAddressInner, _extends({
     single: single,
     isPopup: isPopup,
@@ -1084,7 +1416,11 @@ var index = {
   AddressEnum,
   FunctionEnum,
   IndustryEnum,
-  EnumDisplay
+  EnumDisplay,
+  enumItemsToSelectValue,
+  enumItemToSelectValue,
+  addressEnumToSelectValue,
+  addressEnumToSelectValueSingle
 };
 
 exports.AddressEnum = AddressEnum;
@@ -1094,6 +1430,10 @@ exports.IndustryEnum = IndustryEnum;
 exports.SelectAddress = SelectAddress;
 exports.SelectFunction = SelectFunction;
 exports.SelectIndustry = SelectIndustry;
+exports.addressEnumToSelectValue = addressEnumToSelectValue;
+exports.addressEnumToSelectValueSingle = addressEnumToSelectValueSingle;
 exports.createAddressApi = createAddressApi;
 exports["default"] = index;
+exports.enumItemToSelectValue = enumItemToSelectValue;
+exports.enumItemsToSelectValue = enumItemsToSelectValue;
 //# sourceMappingURL=index.js.map