antd-management-fast-framework 1.1.49 → 1.1.53

package/lib/customComponents/FunctionComponent/index.js

@@ -830,6 +830,8 @@ function buildCustomGrid(_ref7) {
       column: 3,
       labelStyle: {},
       contentStyle: {},
+      emptyValue: null,
+      emptyStyle: null,
       bordered: false,
       colon: true,
       size: null
@@ -838,6 +840,8 @@ function buildCustomGrid(_ref7) {
         columnSource = _title$column$labelSt.column,
         labelStyleSource = _title$column$labelSt.labelStyle,
         contentStyleSource = _title$column$labelSt.contentStyle,
+        globalEmptyValue = _title$column$labelSt.emptyValue,
+        globalEmptyStyle = _title$column$labelSt.emptyStyle,
         borderedSource = _title$column$labelSt.bordered,
         colonSource = _title$column$labelSt.colon,
         sizeSource = _title$column$labelSt.size;
@@ -922,24 +926,48 @@ function buildCustomGrid(_ref7) {
       } : {
         paddingBottom: paddingBottomNoBorder
       };
+
+      var _key$label$value$empt = _objectSpread(_objectSpread({}, {
+        key: (0, _tools.getGuid)(),
+        label: '',
+        value: '',
+        emptyValue: null,
+        emptyStyle: null,
+        span: 1,
+        canCopy: false,
+        copyData: null,
+        props: null
+      }), item || {}),
+          itemKey = _key$label$value$empt.key,
+          itemLabel = _key$label$value$empt.label,
+          itemValue = _key$label$value$empt.value,
+          itemEmptyValue = _key$label$value$empt.emptyValue,
+          itemEmptyStyle = _key$label$value$empt.emptyStyle,
+          itemSpan = _key$label$value$empt.span,
+          itemCanCopy = _key$label$value$empt.canCopy,
+          itemCopyData = _key$label$value$empt.copyData,
+          itemProps = _key$label$value$empt.props;
+
+      var v = itemValue || itemEmptyValue || globalEmptyValue;
+      var isEmpty = (itemValue || itemEmptyValue || globalEmptyValue) == (itemEmptyValue || globalEmptyValue);
       return /*#__PURE__*/_react["default"].createElement(_col["default"], _extends({
-        key: item.key,
+        key: itemKey,
         style: itemStyle,
-        label: item.label,
-        span: columnSpan * (item.span || 1)
-      }, item.props || {}), /*#__PURE__*/_react["default"].createElement(_FlexBox["default"], {
+        label: itemLabel,
+        span: columnSpan * ((0, _tools.toNumber)(itemSpan) || 1)
+      }, itemProps || {}), /*#__PURE__*/_react["default"].createElement(_FlexBox["default"], {
         flexAuto: "right",
         left: /*#__PURE__*/_react["default"].createElement("div", {
           style: labelStyle
-        }, "".concat(item.label).concat(colon ? '：' : '')),
+        }, "".concat(itemLabel).concat(colon ? '：' : '')),
         right: /*#__PURE__*/_react["default"].createElement("div", {
-          style: contentStyle
-        }, item.value, item.canCopy && (item.canCopy || null) != null ? /*#__PURE__*/_react["default"].createElement("a", {
+          style: _objectSpread(_objectSpread(_objectSpread({}, contentStyle), isEmpty ? globalEmptyStyle || {} : {}), isEmpty ? itemEmptyStyle || {} : {})
+        }, v, itemCanCopy && (itemCanCopy || null) != null ? /*#__PURE__*/_react["default"].createElement("a", {
           style: {
             marginLeft: '10px'
           },
           onClick: function onClick() {
-            (0, _tools.copyToClipboard)(item.copyData || item.value);
+            (0, _tools.copyToClipboard)(itemCopyData || itemValue);
           }
         }, "[\u590D\u5236]") : null)
       }));

package/lib/framework/DataDrawer/Base/index.js

@@ -144,7 +144,7 @@ var Base = /*#__PURE__*/function (_BaseWindow) {
 
       var subText = _this.buildTitleSubText();
 
-      subText = stringIsNullOrWhiteSpace(subText) ? '' : "\uFF1A\u3010".concat(subText, "\u3011");
+      subText = (0, _tools.stringIsNullOrWhiteSpace)(subText) ? '' : "\uFF1A\u3010".concat(subText, "\u3011");
       return "".concat(prevText).concat(_this.buildTitleText() || '信息详情').concat(subText);
     };
 

package/lib/utils/tools.d.ts

@@ -683,6 +683,9 @@ export function removeNearestLocalhostNotifyCache(): void;
 export function trySendNearestLocalhostNotify({ text }: {
     text: any;
 }): void;
+/**
+ * 文本缩略
+ */
 export function ellipsis(value: any, length: any): string;
 export function notifySuccess(text: any): void;
 /**

package/lib/utils/tools.js

@@ -1982,6 +1982,10 @@ function trySendNearestLocalhostNotify(_ref11) {
     }
   }
 }
+/**
+ * 文本缩略
+ */
+
 
 function ellipsis(value, length) {
   if (value && value.length > length) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-management-fast-framework",
-  "version": "1.1.49",
+  "version": "1.1.53",
   "description": "antd-management-fast-framework",
   "keywords": [
     "antd-management-fast-framework"

package/src/customComponents/FunctionComponent/index.jsx

@@ -692,6 +692,8 @@ export function buildCustomGrid({ key = null, list, props }) {
       column: columnSource,
       labelStyle: labelStyleSource,
       contentStyle: contentStyleSource,
+      emptyValue: globalEmptyValue,
+      emptyStyle: globalEmptyStyle,
       bordered: borderedSource,
       colon: colonSource,
       size: sizeSource,
@@ -701,6 +703,8 @@ export function buildCustomGrid({ key = null, list, props }) {
         column: 3,
         labelStyle: {},
         contentStyle: {},
+        emptyValue: null,
+        emptyStyle: null,
         bordered: false,
         colon: true,
         size: null,
@@ -802,29 +806,66 @@ export function buildCustomGrid({ key = null, list, props }) {
                   paddingBottom: paddingBottomNoBorder,
                 };
 
+            const {
+              key: itemKey,
+              label: itemLabel,
+              value: itemValue,
+              emptyValue: itemEmptyValue,
+              emptyStyle: itemEmptyStyle,
+              span: itemSpan,
+              canCopy: itemCanCopy,
+              copyData: itemCopyData,
+              props: itemProps,
+            } = {
+              ...{
+                key: getGuid(),
+                label: '',
+                value: '',
+                emptyValue: null,
+                emptyStyle: null,
+                span: 1,
+                canCopy: false,
+                copyData: null,
+                props: null,
+              },
+              ...(item || {}),
+            };
+
+            const v = itemValue || itemEmptyValue || globalEmptyValue;
+
+            const isEmpty =
+              (itemValue || itemEmptyValue || globalEmptyValue) ==
+              (itemEmptyValue || globalEmptyValue);
+
             return (
               <Col
-                key={item.key}
+                key={itemKey}
                 style={itemStyle}
-                label={item.label}
-                span={columnSpan * (item.span || 1)}
-                {...(item.props || {})}
+                label={itemLabel}
+                span={columnSpan * (toNumber(itemSpan) || 1)}
+                {...(itemProps || {})}
               >
                 <FlexBox
                   flexAuto="right"
                   left={
-                    <div style={labelStyle}>{`${item.label}${
+                    <div style={labelStyle}>{`${itemLabel}${
                       colon ? '：' : ''
                     }`}</div>
                   }
                   right={
-                    <div style={contentStyle}>
-                      {item.value}
-                      {item.canCopy && (item.canCopy || null) != null ? (
+                    <div
+                      style={{
+                        ...contentStyle,
+                        ...(isEmpty ? globalEmptyStyle || {} : {}),
+                        ...(isEmpty ? itemEmptyStyle || {} : {}),
+                      }}
+                    >
+                      {v}
+                      {itemCanCopy && (itemCanCopy || null) != null ? (
                         <a
                           style={{ marginLeft: '10px' }}
                           onClick={() => {
-                            copyToClipboard(item.copyData || item.value);
+                            copyToClipboard(itemCopyData || itemValue);
                           }}
                         >
                           [复制]

package/src/framework/DataDrawer/Base/index.jsx

@@ -6,6 +6,7 @@ import {
   isUndefined,
   isFunction,
   defaultFormState,
+  stringIsNullOrWhiteSpace,
 } from '../../../utils/tools';
 import { formContentConfig, drawerConfig } from '../../../utils/constants';
 import { buildButton } from '../../../customComponents/FunctionComponent';

package/src/utils/tools.js

@@ -1738,6 +1738,9 @@ export function trySendNearestLocalhostNotify({ text }) {
   }
 }
 
+/**
+ * 文本缩略
+ */
 export function ellipsis(value, length) {
   if (value && value.length > length) {
     return `${toString(value).substr(0, length)}...`;