@hw-component/table 0.0.8-beta-v3 → 0.0.8-beta-v6

package/lib/HTableBody/Options/utils.js

@@ -1,36 +1,52 @@
 'use strict';
 
+var _Object$keys = require('@babel/runtime-corejs3/core-js/object/keys');
+var _Object$getOwnPropertySymbols = require('@babel/runtime-corejs3/core-js/object/get-own-property-symbols');
+var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/filter');
+var _Object$getOwnPropertyDescriptor = require('@babel/runtime-corejs3/core-js/object/get-own-property-descriptor');
+var _Object$getOwnPropertyDescriptors = require('@babel/runtime-corejs3/core-js/object/get-own-property-descriptors');
+var _Object$defineProperties = require('@babel/runtime-corejs3/core-js/object/define-properties');
+var _Object$defineProperty = require('@babel/runtime-corejs3/core-js/object/define-property');
 var _toConsumableArray = require('@babel/runtime-corejs3/helpers/toConsumableArray');
+var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
+var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
 require('core-js/modules/es.object.to-string.js');
 require('core-js/modules/es.regexp.to-string.js');
 var _forEachInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/for-each');
 var _keysInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/keys');
 var React = require('react');
 
-var getTitle = function getTitle(title) {
-  return /*#__PURE__*/React.isValidElement(title) ? title.props.children : title;
+var _excluded = ["dataIndex", "title", "titleStr"];
+function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
+var getItemValue = function getItemValue(data) {
+  var dataIndex = data.dataIndex,
+    title = data.title,
+    titleStr = data.titleStr,
+    oData = _objectWithoutProperties(data, _excluded);
+  var resultTitle = /*#__PURE__*/React.isValidElement(title) ? title.props.children : title;
+  if (titleStr) {
+    resultTitle = titleStr;
+  }
+  return _objectSpread({
+    title: resultTitle,
+    dataIndex: dataIndex
+  }, oData);
 };
 var childDataIndexProvider = function childDataIndexProvider(data, title) {
   var keys = [];
   var cols = [];
-  var titleStr = getTitle(title);
   _forEachInstanceProperty(data).call(data, function (value) {
     if (typeof value === "string") {
       keys.push(value);
-      cols.push({
-        title: titleStr,
+      cols.push(getItemValue({
+        title: title,
         dataIndex: value
-      });
+      }));
       return;
     }
-    var dataIndex = value.dataIndex,
-      title = value.title,
-      cuTitleStr = value.titleStr;
-    keys.push(dataIndex);
-    cols.push({
-      title: getTitle(cuTitleStr || title),
-      dataIndex: dataIndex
-    });
+    keys.push(value.dataIndex);
+    cols.push(getItemValue(value));
   });
   return {
     keys: keys,
@@ -60,10 +76,7 @@ var defaultKeys = function defaultKeys(cols) {
       return;
     }
     allKeys.push(dataIndex.toString());
-    checkCols.push({
-      title: getTitle(titleStr || title),
-      dataIndex: dataIndex
-    });
+    checkCols.push(getItemValue(value));
   });
   return {
     keys: keys,
@@ -73,4 +86,5 @@ var defaultKeys = function defaultKeys(cols) {
 };
 
 exports.defaultKeys = defaultKeys;
+exports.getItemValue = getItemValue;
 // powered by h

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/table",
-  "version": "0.0.8-beta-v3",
+  "version": "0.0.8-beta-v6",
   "description": "基于antd二次开发table组件",
   "keywords": [
     "table"

package/src/components/HTableBody/Options/Content.tsx

@@ -3,6 +3,7 @@ import { useMemo } from "react";
 import type { ConfigDataModal } from "../../modal";
 import { Tree } from "antd";
 import type { ItemProps } from "./modal";
+import {getItemValue} from "./utils";
 
 export const ColsSettingContent = ({
   columns,
@@ -14,10 +15,14 @@ export const ColsSettingContent = ({
   const treeClass = useClassName("hw-table-body-option-tree");
   const contentTreeData = useMemo(() => {
     const treeData: ConfigDataModal = [];
-    columns.forEach(({ dataIndex, title }) => {
+    columns.forEach(({ dataIndex, title,titleStr }) => {
       if (dataIndex) {
+        const {title:cuTitleStr}=getItemValue({
+          titleStr,
+          title,
+        })
         treeData.push({
-          title: <div className={titleClass}>{title}</div>,
+          title: <div className={titleClass}>{cuTitleStr}</div>,
           key: dataIndex.toString(),
         });
       }

package/src/components/HTableBody/Options/utils.ts

@@ -1,7 +1,16 @@
 import type { ConfigDataModal, ConfigItemModal } from "../../modal";
 import React from "react";
-const getTitle= ( title?: string|React.ReactNode) => {
-  return React.isValidElement(title)?title.props.children:title;
+export const getItemValue= (data:ConfigItemModal) => {
+  const {dataIndex,title,titleStr,...oData}=data;
+  let resultTitle=React.isValidElement(title)?title.props.children:title;
+  if (titleStr){
+    resultTitle =titleStr;
+  }
+  return {
+    title:resultTitle,
+    dataIndex,
+    ...oData
+  }
 }
 const childDataIndexProvider = (
   data: ConfigItemModal[] | string[],
@@ -9,22 +18,17 @@ const childDataIndexProvider = (
 ) => {
   const keys: string[] = [];
   const cols: ConfigDataModal = [];
-  const titleStr=getTitle(title);
   data.forEach((value) => {
     if (typeof value === "string") {
       keys.push(value);
-      cols.push({
-        title:titleStr,
-        dataIndex: value,
-      });
+      cols.push(getItemValue({
+        title,
+        dataIndex:value
+      }));
       return;
     }
-    const {dataIndex,title,titleStr:cuTitleStr}=value;
-    keys.push(dataIndex);
-    cols.push({
-      title:getTitle(cuTitleStr||title),
-      dataIndex
-    });
+    keys.push(value.dataIndex);
+    cols.push(getItemValue(value));
   });
   return {
     keys,
@@ -51,10 +55,7 @@ export const defaultKeys = (cols: ConfigDataModal) => {
       return;
     }
     allKeys.push(dataIndex.toString());
-    checkCols.push({
-      title:getTitle(titleStr||title),
-      dataIndex
-    });
+    checkCols.push(getItemValue(value));
   });
   return {
     keys,

package/src/pages/Table/index.tsx

@@ -23,7 +23,7 @@ const configData = [
     },
   },
   {
-    title:<div>座位</div>,
+    title:<div>座位fff</div>,
     titleStr:"座位",
     showSearch: true,
     dataIndex: "name2",