@zat-design/sisyphus-react 3.4.5-beta.24 → 3.4.5-beta.26

package/es/ProForm/components/combination/ProCascader/index.js

@@ -15,12 +15,12 @@ import _Typography from "antd/es/typography";
 var _excluded = ["className", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useState, memo, useMemo } from 'react';
-import { tools } from '@zat-design/utils';
+import { isEqual, omit } from 'lodash';
+import { transformDataName } from './utils/index';
 import { useProConfig } from '../../../../ProConfigProvider';
 import useEnum from '../../../../ProEnum/hooks/useEnum';
 import locale from '../../../../locale';
 import ProForm from '../../..';
-var transformDataName = tools.transformDataName;
 var Text = _Typography.Text;
 var filterDataSource = function filterDataSource(dataSource, level) {
   return dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
@@ -94,7 +94,8 @@ var ProCascader = function ProCascader(props) {
     enumDataSource = _ref5$ === void 0 ? [] : _ref5$;
   var realDataSource = useMemo(function () {
     var innerDataSource = dataSource || (addressCode ? enumDataSource : []);
-    return isAddressMode && realLevel === 2 ? filterDataSource(innerDataSource, level) : innerDataSource;
+    var result = isAddressMode && realLevel === 2 ? filterDataSource(innerDataSource, level) : innerDataSource;
+    return isEqual(fieldNames, defaultFieldNames) ? result : transformDataName(result, fieldNames);
   }, [isAddressMode, addressCode, realLevel, dataSource, enumDataSource === null || enumDataSource === void 0 ? void 0 : enumDataSource.length]);
   var _useRequest = _objectSpread({}, useRequest),
     service = _useRequest.service,
@@ -232,7 +233,7 @@ var ProCascader = function ProCascader(props) {
         filter: handlefilter
       },
       onChange: handleChange
-    }, otherProps)), hasDetail && (tooltip && disabled && detail ? _jsx(_Tooltip, {
+    }, omit(otherProps, 'otherProps'))), hasDetail && (tooltip && disabled && detail ? _jsx(_Tooltip, {
       title: detail,
       children: _jsx("span", {
         className: "pro-address-detail",

package/es/ProForm/components/combination/ProCascader/utils/index.d.ts

@@ -0,0 +1,12 @@
+interface DataNode {
+    label: string;
+    value: string;
+    children?: DataNode[];
+}
+interface FieldNames {
+    label: string;
+    value: string;
+    children?: string;
+}
+export declare const transformDataName: (dataSource: any[], fieldNames: FieldNames) => DataNode[];
+export {};

package/es/ProForm/components/combination/ProCascader/utils/index.js

@@ -0,0 +1,19 @@
+export var transformDataName = function transformDataName(dataSource, fieldNames) {
+  var label = fieldNames.label,
+    value = fieldNames.value,
+    children = fieldNames.children;
+  function transformNode(node) {
+    var newNode = {
+      label: node[label],
+      value: node[value]
+    };
+    if (children && Array.isArray(node[children])) {
+      newNode.children = node[children].map(transformNode);
+    }
+    return newNode;
+  }
+  function transformData(data) {
+    return data.map(transformNode);
+  }
+  return transformData(dataSource);
+};

package/lib/ProForm/components/combination/ProCascader/index.js

@@ -14,13 +14,13 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
 var _antd = require("antd");
-var _utils = require("@zat-design/utils");
+var _lodash = require("lodash");
+var _index = require("./utils/index");
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _useEnum = _interopRequireDefault(require("../../../../ProEnum/hooks/useEnum"));
 var _locale = _interopRequireDefault(require("../../../../locale"));
 var _ = _interopRequireDefault(require("../../.."));
 var _excluded = ["className", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator"];
-var transformDataName = _utils.tools.transformDataName;
 var Text = _antd.Typography.Text;
 var filterDataSource = function filterDataSource(dataSource, level) {
   return dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
@@ -94,7 +94,8 @@ var ProCascader = function ProCascader(props) {
     enumDataSource = _ref5$ === void 0 ? [] : _ref5$;
   var realDataSource = (0, _react.useMemo)(function () {
     var innerDataSource = dataSource || (addressCode ? enumDataSource : []);
-    return isAddressMode && realLevel === 2 ? filterDataSource(innerDataSource, level) : innerDataSource;
+    var result = isAddressMode && realLevel === 2 ? filterDataSource(innerDataSource, level) : innerDataSource;
+    return (0, _lodash.isEqual)(fieldNames, defaultFieldNames) ? result : (0, _index.transformDataName)(result, fieldNames);
   }, [isAddressMode, addressCode, realLevel, dataSource, enumDataSource === null || enumDataSource === void 0 ? void 0 : enumDataSource.length]);
   var _useRequest = (0, _objectSpread2.default)({}, useRequest),
     service = _useRequest.service,
@@ -123,7 +124,7 @@ var ProCascader = function ProCascader(props) {
             if (transformResponse) {
               newData = transformResponse(data);
             }
-            transFormData = transformDataName(newData, {
+            transFormData = (0, _index.transformDataName)(newData, {
               label: fieldNames.label,
               value: fieldNames.value,
               children: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'
@@ -232,7 +233,7 @@ var ProCascader = function ProCascader(props) {
         filter: handlefilter
       },
       onChange: handleChange
-    }, otherProps)), hasDetail && (tooltip && disabled && detail ? (0, _jsxRuntime.jsx)(_antd.Tooltip, {
+    }, (0, _lodash.omit)(otherProps, 'otherProps'))), hasDetail && (tooltip && disabled && detail ? (0, _jsxRuntime.jsx)(_antd.Tooltip, {
       title: detail,
       children: (0, _jsxRuntime.jsx)("span", {
         className: "pro-address-detail",

package/lib/ProForm/components/combination/ProCascader/utils/index.d.ts

@@ -0,0 +1,12 @@
+interface DataNode {
+    label: string;
+    value: string;
+    children?: DataNode[];
+}
+interface FieldNames {
+    label: string;
+    value: string;
+    children?: string;
+}
+export declare const transformDataName: (dataSource: any[], fieldNames: FieldNames) => DataNode[];
+export {};

package/lib/ProForm/components/combination/ProCascader/utils/index.js

@@ -0,0 +1,25 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.transformDataName = void 0;
+var transformDataName = exports.transformDataName = function transformDataName(dataSource, fieldNames) {
+  var label = fieldNames.label,
+    value = fieldNames.value,
+    children = fieldNames.children;
+  function transformNode(node) {
+    var newNode = {
+      label: node[label],
+      value: node[value]
+    };
+    if (children && Array.isArray(node[children])) {
+      newNode.children = node[children].map(transformNode);
+    }
+    return newNode;
+  }
+  function transformData(data) {
+    return data.map(transformNode);
+  }
+  return transformData(dataSource);
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.4.5-beta.24",
+  "version": "3.4.5-beta.26",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -58,7 +58,7 @@
     "@dnd-kit/sortable": "^7.0.2",
     "@dnd-kit/utilities": "^3.2.1",
     "@pansy/react-watermark": "^3.1.13",
-    "@zat-design/utils": "^1.1.16",
+    "@zat-design/utils": "^1.1.18",
     "ahooks": "3.7.4",
     "antd": "4.24.8",
     "big.js": "^6.2.1",