zmdms-webui 0.0.90 → 0.0.92

package/dist/es/detaillist/item.d.ts

@@ -6,6 +6,8 @@ interface IProps extends ColProps {
     colon?: boolean;
     span: number;
     titleSpan?: number;
+    titleStyle?: React__default.CSSProperties;
+    isContentMerge?: boolean;
     titleProps?: any;
     /** 多余得属性 */
     textProps?: any;

package/dist/es/detaillist/item.js

@@ -1,18 +1,30 @@
 import { __assign } from '../_virtual/_tslib.js';
-import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
+import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
 import classNames from '../node_modules/classnames/index.js';
 import { Col } from 'antd';
 
 var Item = function (_a) {
-    var children = _a.children, className = _a.className, title = _a.title, _b = _a.colon, colon = _b === void 0 ? true : _b, span = _a.span, titleSpan = _a.titleSpan, titleProps = _a.titleProps, textProps = _a.textProps, showDiff = _a.showDiff, _c = _a.isEllipsis, isEllipsis = _c === void 0 ? true : _c, isBlod = _a.isBlod, isFlex = _a.isFlex, isRequired = _a.isRequired, titleVerticalCenter = _a.titleVerticalCenter;
+    var children = _a.children, className = _a.className, title = _a.title, _b = _a.colon, colon = _b === void 0 ? true : _b, span = _a.span, titleSpan = _a.titleSpan, titleStyle = _a.titleStyle, isContentMerge = _a.isContentMerge, titleProps = _a.titleProps, textProps = _a.textProps, showDiff = _a.showDiff, _c = _a.isEllipsis, isEllipsis = _c === void 0 ? true : _c, isBlod = _a.isBlod, isFlex = _a.isFlex, isRequired = _a.isRequired, titleVerticalCenter = _a.titleVerticalCenter;
     var classes = classNames("ztxk-grid-item", className, {
         "ztxk-grid-item--flex": isFlex,
     });
-    return (jsxs(Fragment, { children: [jsxs(Col, __assign({ className: classes +
+    return isContentMerge ? (jsxs(Col, __assign({ span: span, className: "ztxk-grid-item--merge" }, { children: [jsxs("div", __assign({ className: classes +
+                    " ztxk-grid-item--title" +
+                    "".concat(titleVerticalCenter ? " ztxk-grid-item--title-vertical-center" : ""), title: title, style: titleStyle }, titleProps, { children: [isRequired && (jsx("span", __assign({ className: "ztxk-grid-item--title-required" }, { children: "*" }))), jsx("span", __assign({ className: "ztxk-grid-item--title-text" }, { children: title })), jsx("span", __assign({ className: "ztxk-grid-item--title-colon" }, { children: colon && "：" }))] })), jsx("div", __assign({ className: showDiff
+                    ? classes +
+                        " ztxk-grid-item--text ztxk-grid-item--diff" +
+                        "".concat(isEllipsis
+                            ? " ztxk-grid-item--text-ellipsis"
+                            : " ztxk-grid-item--text-noellipsis")
+                    : classes +
+                        " ztxk-grid-item--text" +
+                        "".concat(isEllipsis
+                            ? " ztxk-grid-item--text-ellipsis"
+                            : " ztxk-grid-item--text-noellipsis"), title: typeof children === "string" ? children : undefined, style: { fontWeight: isBlod ? "bold" : "normal" } }, textProps, { children: children }))] }))) : (jsxs(Fragment, { children: [jsxs(Col, __assign({ className: classes +
                     " ztxk-grid-item--title" +
                     "".concat(titleVerticalCenter ? " ztxk-grid-item--title-vertical-center" : ""), 
                 // span={titleSpan ? titleSpan : Math.ceil(span * 0.3)}
-                span: titleSpan ? titleSpan : 3, title: title }, titleProps, { children: [isRequired && (jsx("span", __assign({ className: "ztxk-grid-item--title-required" }, { children: "*" }))), jsx("span", __assign({ className: "ztxk-grid-item--title-text" }, { children: title })), jsx("span", __assign({ className: "ztxk-grid-item--title-colon" }, { children: colon && "：" }))] })), jsx(Col, __assign({ className: showDiff
+                span: titleSpan ? titleSpan : 3, title: title, style: titleStyle }, titleProps, { children: [isRequired && (jsx("span", __assign({ className: "ztxk-grid-item--title-required" }, { children: "*" }))), jsx("span", __assign({ className: "ztxk-grid-item--title-text" }, { children: title })), jsx("span", __assign({ className: "ztxk-grid-item--title-colon" }, { children: colon && "：" }))] })), jsx(Col, __assign({ className: showDiff
                     ? classes +
                         " ztxk-grid-item--text ztxk-grid-item--diff" +
                         "".concat(isEllipsis

package/dist/es/detaillist/list.d.ts

@@ -6,6 +6,7 @@ interface IListProps extends RowProps {
     border?: boolean;
     isBg?: boolean;
     isFlex?: boolean;
+    size?: "default" | "large";
 }
 interface ListComponent extends React__default.FC<IListProps> {
     Item: typeof Item;

package/dist/es/detaillist/list.js

@@ -5,8 +5,8 @@ import Item from './item.js';
 import { Row } from 'antd';
 
 var List = function (_a) {
-    var children = _a.children, className = _a.className, border = _a.border, isBg = _a.isBg, isFlex = _a.isFlex, restProps = __rest(_a, ["children", "className", "border", "isBg", "isFlex"]);
-    var classes = classNames("ztxk-grid", className, {
+    var children = _a.children, className = _a.className, border = _a.border, isBg = _a.isBg, isFlex = _a.isFlex, _b = _a.size, size = _b === void 0 ? "default" : _b, restProps = __rest(_a, ["children", "className", "border", "isBg", "isFlex", "size"]);
+    var classes = classNames("ztxk-grid", "ztxk-grid--".concat(size), className, {
         "ztxk-grid--border": border,
         "ztxk-grid--background": isBg,
         "ztxk-grid--flex": isFlex,

package/dist/es/table/useDynamicListByColumns.js

@@ -4,7 +4,7 @@ import { TABLE_DYNAMIC_KEY } from './constant.js';
 import isEqual from 'lodash/isEqual';
 
 // 处理列信息
-function parseColumn(column, index) {
+function parseColumn(column, index, indexs) {
     var _a = column, key = _a.key, dataIndex = _a.dataIndex, title = _a.title, dynamicTitle = _a.dynamicTitle, dynamicDisabled = _a.dynamicDisabled, width = _a.width, fixed = _a.fixed;
     // 动态列配置 title必须为一个字符串
     if (title && !dynamicTitle && typeof title !== "string") {
@@ -24,6 +24,8 @@ function parseColumn(column, index) {
         label: dynamicTitle ? dynamicTitle : title,
         disabled: dynamicDisabled === true ? true : false,
         checked: true,
+        // 记录递归的索引，在做比对查找时，用这个值添加一个比对条件
+        indexs: indexs,
         width: width,
         fixed: fixed,
     };
@@ -35,13 +37,15 @@ function parseColumn(column, index) {
     // }
 }
 // 将多级表头统一提取出来处理
-function recursionColumns(columns, result) {
+function recursionColumns(columns, result, indexs) {
     if (Array.isArray(columns)) {
         columns.forEach(function (column, index) {
-            var item = parseColumn(column, index);
+            var newIndexs = indexs ? indexs.slice() : [];
+            newIndexs.push(index);
+            var item = parseColumn(column, index, newIndexs);
             if (column.children && Array.isArray(column.children)) {
                 var columnChildrenResult = [];
-                recursionColumns(column.children, columnChildrenResult);
+                recursionColumns(column.children, columnChildrenResult, newIndexs);
                 item.children = columnChildrenResult;
             }
             result.push(item);

package/dist/es/table/utils.js

@@ -2,24 +2,53 @@ import { __spreadArray, __assign } from '../_virtual/_tslib.js';
 import { message } from 'antd';
 
 // 递归处理columns
-function recursionColumns(columns, currentDynamicList, newColumns) {
+function recursionColumns(columns, currentDynamicList, newColumns, columnsIndexs) {
     if (Array.isArray(currentDynamicList) &&
         currentDynamicList.length > 0 &&
         columns) {
-        currentDynamicList.forEach(function (item) {
-            var key = item.key, checked = item.checked, width = item.width, fixed = item.fixed, dynamicChildrenList = item.children;
+        currentDynamicList.forEach(function (item, index) {
+            var key = item.key, checked = item.checked, width = item.width, fixed = item.fixed, indexs = item.indexs, dynamicChildrenList = item.children;
             // 这里肯定是能找到的 因为之前就以columns过滤了一遍dynamicList了
-            var result = columns.find(function (column) {
-                return ((column.key === key ||
+            var currentIndex = null;
+            var result = columns.find(function (column, index) {
+                // return (
+                //   (column.key === key ||
+                //     ((column as any)?.dataIndex as string) === key) &&
+                //   checked
+                // );
+                // 找到对应的key，加一个条件 indexs也必须相同 indexs为递归列的索引
+                if ((column.key === key ||
                     (column === null || column === void 0 ? void 0 : column.dataIndex) === key) &&
-                    checked);
+                    checked &&
+                    (!indexs ||
+                        "".concat(columnsIndexs ? columnsIndexs.concat([index]) : [index]) ===
+                            "".concat(indexs))) {
+                    currentIndex = index;
+                    return true;
+                }
+                return false;
             });
-            if (result) {
+            // 如果最终都没有找到递归列的索引，那么可能是更改了原始的排列。
+            // 这里再兜底一次，不依照索引来查找
+            if (!result) {
+                result = columns.find(function (column, index) {
+                    if ((column.key === key ||
+                        (column === null || column === void 0 ? void 0 : column.dataIndex) === key) &&
+                        checked) {
+                        currentIndex = index;
+                        return true;
+                    }
+                    return false;
+                });
+            }
+            if (result && currentIndex != null) {
                 var newColumn = __assign(__assign({}, result), { width: width ? width : result.width, fixed: fixed != null ? fixed : result.fixed });
                 // 如果有子元素
                 if (result.children) {
                     newColumn.children = [];
-                    recursionColumns(result.children, dynamicChildrenList, newColumn.children);
+                    recursionColumns(result.children, dynamicChildrenList, newColumn.children, columnsIndexs
+                        ? columnsIndexs.concat([currentIndex])
+                        : [currentIndex]);
                 }
                 newColumns.push(newColumn);
             }

package/dist/es/tabs/interface.d.ts

@@ -5,6 +5,8 @@ import { TabsProps } from 'antd/lib/tabs';
 interface ITabsProps extends TabsProps {
     isHeader?: boolean;
     isContent?: boolean;
+    /** 多tab列表，flex模式 */
+    isFlex?: boolean;
     marginTop?: boolean;
     marginBottom?: boolean;
 }

package/dist/es/tabs/tabs.js

@@ -6,12 +6,13 @@ import classNames from '../node_modules/classnames/index.js';
 
 var Tabs = function (props) {
     var _a;
-    var className = props.className, isHeader = props.isHeader, isContent = props.isContent, _b = props.marginTop, marginTop = _b === void 0 ? false : _b, _c = props.marginBottom, marginBottom = _c === void 0 ? true : _c, resetProps = __rest(props, ["className", "isHeader", "isContent", "marginTop", "marginBottom"]);
+    var className = props.className, isHeader = props.isHeader, isContent = props.isContent, isFlex = props.isFlex, _b = props.marginTop, marginTop = _b === void 0 ? false : _b, _c = props.marginBottom, marginBottom = _c === void 0 ? true : _c, resetProps = __rest(props, ["className", "isHeader", "isContent", "isFlex", "marginTop", "marginBottom"]);
     var classes = classNames("ztxk-tabs", className, (_a = {},
         _a["ztxk-tabs--header"] = isHeader,
         _a["ztxk-tabs--content"] = isContent,
         _a["ztxk-tabs--marginTop"] = marginTop,
         _a["ztxk-tabs--marginBottom"] = marginBottom,
+        _a["ztxk-tabs--isFlex"] = isFlex,
         _a));
     return (jsx(Tabs$1, __assign({ type: isHeader ? "editable-card" : isContent ? "card" : undefined, hideAdd: isHeader ? true : undefined, className: classes }, resetProps)));
 };

package/dist/es/title/interface.d.ts

@@ -3,6 +3,7 @@ import React__default from 'react';
 interface ITitleProps {
     children?: React__default.ReactNode;
     title: React__default.ReactNode;
+    titleStyle?: React__default.CSSProperties;
     className?: string;
     /** 是否展示边框 */
     bordered?: boolean;

package/dist/es/title/title.js

@@ -3,7 +3,7 @@ import { jsxs, jsx } from 'react/jsx-runtime';
 import classNames from '../node_modules/classnames/index.js';
 
 var Title = function (props) {
-    var title = props.title, className = props.className, bordered = props.bordered, showBg = props.showBg, _a = props.justifyContent, justifyContent = _a === void 0 ? "space-between" : _a, children = props.children, isTopMargin = props.isTopMargin, isBottomMargin = props.isBottomMargin;
+    var title = props.title, className = props.className, bordered = props.bordered, showBg = props.showBg, _a = props.justifyContent, justifyContent = _a === void 0 ? "space-between" : _a, children = props.children, isTopMargin = props.isTopMargin, isBottomMargin = props.isBottomMargin, titleStyle = props.titleStyle;
     // 主容器类名
     var classes = classNames("ztxk-title", className, {
         "ztxk-title--bordered": bordered,
@@ -11,7 +11,7 @@ var Title = function (props) {
         "ztxk-title--marginTop": isTopMargin,
         "ztxk-title--marginBottom": isBottomMargin,
     });
-    return (jsxs("div", __assign({ className: classes, style: { justifyContent: justifyContent } }, { children: [jsx("div", __assign({ className: "ztxk-title--title" }, { children: title })), jsx("div", __assign({ className: "ztxk-title--extra" }, { children: children }))] })));
+    return (jsxs("div", __assign({ className: classes, style: { justifyContent: justifyContent } }, { children: [jsx("div", __assign({ className: "ztxk-title--title", style: titleStyle }, { children: title })), jsx("div", __assign({ className: "ztxk-title--extra" }, { children: children }))] })));
 };
 var TitleCom = Title;
 TitleCom.displayName = "ZTXK_WEBUI_Title";