antd-management-fast-framework 1.12.88 → 1.12.91

package/es/customComponents/FunctionComponent/index.d.ts

@@ -292,9 +292,10 @@ export function buildFormOnlyShowText({ label, value, helper, formItemLayout, re
     formItemLayout?: {} | undefined;
     requiredForShow?: boolean | undefined;
 }): JSX.Element;
-export function buildSyntaxHighlighter({ language, value }: {
+export function buildSyntaxHighlighter({ language, value, other }: {
     language: any;
     value: any;
+    other?: {} | undefined;
 }): JSX.Element;
 export function buildJsonView({ value, theme }: {
     value: any;
@@ -315,13 +316,14 @@ export function buildFormButton({ config, formItemLayout }: {
     config: any;
     formItemLayout?: {} | undefined;
 }): JSX.Element;
-export function buildFormOnlyShowSyntaxHighlighter({ language, label, value, helper, formItemLayout, requiredForShow, }: {
+export function buildFormOnlyShowSyntaxHighlighter({ language, label, value, helper, formItemLayout, requiredForShow, otherProps, }: {
     language: any;
     label: any;
     value: any;
     helper?: null | undefined;
     formItemLayout?: {} | undefined;
     requiredForShow?: boolean | undefined;
+    otherProps?: {} | undefined;
 }): JSX.Element;
 export function buildFormOnlyShowTextarea({ label, value, helper, textAreaProps, formItemLayout, }: {
     label: any;

package/es/customComponents/FunctionComponent/index.js

@@ -165,7 +165,9 @@ var _reactJsonView = _interopRequireDefault(require("react-json-view"));
 
 var _reactPlayer = _interopRequireDefault(require("react-player"));
 
-var _reactSyntaxHighlighter = _interopRequireDefault(require("react-syntax-highlighter"));
+var _reactSyntaxHighlighter = require("react-syntax-highlighter");
+
+var _prism = require("react-syntax-highlighter/dist/esm/styles/prism");
 
 var _constants = require("../../utils/constants");
 
@@ -2474,28 +2476,22 @@ function buildFormOnlyShowText(_ref37) {
 
 function buildSyntaxHighlighter(_ref38) {
   var language = _ref38.language,
-      value = _ref38.value;
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (0, _tools.isObject)(value) ? /*#__PURE__*/_react.default.createElement(_reactSyntaxHighlighter.default, {
+      value = _ref38.value,
+      _ref38$other = _ref38.other,
+      other = _ref38$other === void 0 ? {} : _ref38$other;
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (0, _tools.isObject)(value) ? /*#__PURE__*/_react.default.createElement(_reactSyntaxHighlighter.Prism, _extends({
     showLineNumbers: true,
     wrapLines: true,
-    lineProps: {
-      style: {
-        paddingBottom: 8
-      }
-    },
-    language: language // style={docco}
-
-  }, language === 'javascript' ? JSON.stringify(value || {}, null, '    ') : value) : /*#__PURE__*/_react.default.createElement(_reactSyntaxHighlighter.default, {
+    wrapLongLines: true,
+    language: language,
+    style: _prism.oneDark
+  }, other), language === 'javascript' ? JSON.stringify(value || {}, null, '    ') : value) : /*#__PURE__*/_react.default.createElement(_reactSyntaxHighlighter.Prism, _extends({
     showLineNumbers: true,
     wrapLines: true,
-    lineProps: {
-      style: {
-        paddingBottom: 8
-      }
-    },
-    language: language // style={docco}
-
-  }, language === 'javascript' ? JSON.stringify(JSON.parse(value || null), null, '    ') : value));
+    wrapLongLines: true,
+    language: language,
+    style: _prism.oneDark
+  }, other), language === 'javascript' ? JSON.stringify(JSON.parse(value || null), null, '    ') : value));
 }
 
 function buildJsonView(_ref39) {
@@ -2581,12 +2577,15 @@ function buildFormOnlyShowSyntaxHighlighter(_ref43) {
       _ref43$formItemLayout = _ref43.formItemLayout,
       formItemLayout = _ref43$formItemLayout === void 0 ? {} : _ref43$formItemLayout,
       _ref43$requiredForSho = _ref43.requiredForShow,
-      requiredForShow = _ref43$requiredForSho === void 0 ? false : _ref43$requiredForSho;
+      requiredForShow = _ref43$requiredForSho === void 0 ? false : _ref43$requiredForSho,
+      _ref43$otherProps = _ref43.otherProps,
+      otherProps = _ref43$otherProps === void 0 ? {} : _ref43$otherProps;
   return buildFormInnerComponent({
     label: label,
     innerComponent: buildSyntaxHighlighter({
       language: language,
-      value: value
+      value: value,
+      other: otherProps || {}
     }),
     helper: helper,
     formItemLayout: formItemLayout,
@@ -3157,21 +3156,25 @@ function buildColumnItem(_ref52) {
           val = d.formatValue(value, record, index);
         }
 
-        var _imageWidth$circle$pr = _objectSpread(_objectSpread({}, {
+        var _imageWidth$circle$bo = _objectSpread(_objectSpread({}, {
           imageWidth: '30px',
           circle: true,
+          borderRadius: '3px',
           previewSimpleMask: true
         }), facadeConfig),
-            imageWidth = _imageWidth$circle$pr.imageWidth,
-            circle = _imageWidth$circle$pr.circle,
-            previewSimpleMask = _imageWidth$circle$pr.previewSimpleMask;
+            imageWidth = _imageWidth$circle$bo.imageWidth,
+            borderRadius = _imageWidth$circle$bo.borderRadius,
+            circle = _imageWidth$circle$bo.circle,
+            previewSimpleMask = _imageWidth$circle$bo.previewSimpleMask;
 
         return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_row.default, null, /*#__PURE__*/_react.default.createElement(_col.default, {
           flex: "auto"
         }), /*#__PURE__*/_react.default.createElement(_col.default, null, /*#__PURE__*/_react.default.createElement("div", {
-          style: {
+          style: _objectSpread(_objectSpread({}, {
             width: imageWidth
-          }
+          }), circle ? {} : {
+            borderRadius: borderRadius
+          })
         }, /*#__PURE__*/_react.default.createElement(_ImageBox.default, {
           src: val || _constants.defaultEmptyImage,
           circle: circle,

package/es/customComponents/NumberInfo/index.js

@@ -9,7 +9,7 @@ var _react = _interopRequireDefault(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _constants = require("../../../utils/constants");
+var _constants = require("../../utils/constants");
 
 var _index = _interopRequireDefault(require("./index.less"));
 

package/es/framework/Common/index.d.ts

@@ -100,12 +100,12 @@ declare class Common extends Core {
     renderFormSwitch: (label: any, name: any, required?: boolean, helper?: null, otherProps?: {}, canOperate?: boolean, formItemLayout?: {}, hidden?: boolean) => JSX.Element;
     renderFormPassword: (label: any, name: any, required?: boolean, helper?: null, icon?: JSX.Element, inputProps?: {}, canOperate?: boolean, formItemLayout?: {}) => JSX.Element;
     renderFormOnlyShowText: (label: any, value: any, helper?: null, formItemLayout?: {}, requiredForShow?: boolean) => JSX.Element;
-    renderSyntaxHighlighter: (language: any, value: any) => JSX.Element;
+    renderSyntaxHighlighter: (language: any, value: any, other?: {}) => JSX.Element;
     renderJsonView: (value: any, theme?: string) => JSX.Element;
     renderFormInnerComponent: (label: any, innerComponent: any, helper?: null, formItemLayout?: {}, requiredForShow?: boolean) => JSX.Element;
     renderFormButton: (config: any, formItemLayout?: {}) => JSX.Element;
     renderFormActionItem: (component: any, formItemLayout?: {}) => JSX.Element | null;
-    renderFormOnlyShowSyntaxHighlighter: (language: any, label: any, value: any, helper?: null, formItemLayout?: {}, requiredForShow?: boolean) => JSX.Element;
+    renderFormOnlyShowSyntaxHighlighter: (language: any, label: any, value: any, helper?: null, formItemLayout?: {}, requiredForShow?: boolean, otherProps?: {}) => JSX.Element;
     renderFormOnlyShowTextarea: (label: any, value: any, helper?: null, textAreaProps?: {
         disabled: boolean;
     }, formItemLayout?: {}) => JSX.Element;

package/es/framework/Common/index.js

@@ -789,9 +789,11 @@ var Common = /*#__PURE__*/function (_Core) {
     };
 
     _this.renderSyntaxHighlighter = function (language, value) {
+      var other = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
       return (0, _FunctionComponent.buildSyntaxHighlighter)({
         language: language,
-        value: value
+        value: value,
+        other: other
       });
     };
 
@@ -836,13 +838,15 @@ var Common = /*#__PURE__*/function (_Core) {
       var helper = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
       var formItemLayout = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
       var requiredForShow = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
+      var otherProps = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : {};
       return (0, _FunctionComponent.buildFormOnlyShowSyntaxHighlighter)({
         language: language,
         label: label,
         value: value,
         helper: helper,
         formItemLayout: formItemLayout,
-        requiredForShow: requiredForShow
+        requiredForShow: requiredForShow,
+        otherProps: otherProps
       });
     };
 
@@ -2206,7 +2210,7 @@ var Common = /*#__PURE__*/function (_Core) {
         }, _this.buildByExtraBuildType({
           keyPrefix: "form_card_".concat(contentIndex, "_action_key"),
           configList: contentItem.config || []
-        })) : null, type === _constants.cardConfig.contentItemType.component ? contentItem.component || null : null, type === _constants.cardConfig.contentItemType.jsonView ? _this.renderJsonView(contentItem.value) : null, type === _constants.cardConfig.contentItemType.nowTime ? _this.renderFormNowTimeField({
+        })) : null, type === _constants.cardConfig.contentItemType.component ? contentItem.component || null : null, type === _constants.cardConfig.contentItemType.jsonView ? _this.renderJsonView(contentItem.value) : null, type === _constants.cardConfig.contentItemType.syntaxHighlighterView ? _this.renderFormOnlyShowSyntaxHighlighter(contentItem.language, fieldData.label, contentItem.value, fieldData.helper, formItemLayout, require, _objectSpread(_objectSpread({}, {}), contentItem.otherProps || {})) : null, type === _constants.cardConfig.contentItemType.nowTime ? _this.renderFormNowTimeField({
           formItemLayout: formItemLayout
         }) : null);
       }) : null);

package/es/framework/DataListView/Base/index.d.ts

@@ -16,6 +16,7 @@ declare class ListBase extends AuthorizationWrapper {
     columnOperateVisible: boolean;
     columnOperateWidth: number;
     columnOperateFixed: string;
+    showListViewItemActionSelect: boolean;
     lastLoadParams: any;
     columnsOtherConfig: any[];
     state: any;

package/es/framework/DataListView/Base/index.js

@@ -176,6 +176,7 @@ var ListBase = /*#__PURE__*/function (_AuthorizationWrapper) {
     _this.columnOperateVisible = true;
     _this.columnOperateWidth = 106;
     _this.columnOperateFixed = 'right';
+    _this.showListViewItemActionSelect = false;
 
     _this.afterDidMount = function () {
       var pageSize = _this.state.pageSize;
@@ -1122,13 +1123,11 @@ var ListBase = /*#__PURE__*/function (_AuthorizationWrapper) {
     };
 
     _this.renderListViewItemActions = function (record, index) {
-      var showListViewItemActionSelect = _this.state.showListViewItemActionSelect;
-
       var actionOthers = _this.renderListViewItemActionOthers(record, index);
 
       var actionSelect = null;
 
-      if (showListViewItemActionSelect || false) {
+      if (_this.showListViewItemActionSelect || false) {
         actionSelect = _this.renderListViewItemActionSelect(record, index);
       }
 
@@ -1508,8 +1507,7 @@ var ListBase = /*#__PURE__*/function (_AuthorizationWrapper) {
       avatarImageLoadResult: _DecorateAvatar.avatarImageLoadResultCollection.wait,
       showPageHeaderAvatar: false,
       tableSize: _constants.listViewConfig.tableSize.middle,
-      counterSetColumnsOtherConfig: 0,
-      showListViewItemActionSelect: false
+      counterSetColumnsOtherConfig: 0
     });
     return _this;
   }

package/es/framework/DataMultiPageView/MultiPageDrawer/index.js

@@ -452,8 +452,7 @@ var MultiPageDrawer = /*#__PURE__*/function (_MultiPage) {
     _this.state = _objectSpread(_objectSpread({}, s), {
       visible: false,
       reloadAnimalShow: false,
-      listViewMode: _constants.listViewConfig.viewMode.table,
-      showListViewItemActionSelect: true
+      listViewMode: _constants.listViewConfig.viewMode.table
     });
     return _this;
   } // eslint-disable-next-line @typescript-eslint/no-unused-vars

package/es/framework/DataMultiPageView/MultiPageSelectDrawer/index.js

@@ -62,6 +62,7 @@ var MultiPageSelectDrawer = /*#__PURE__*/function (_MultiPageDrawer) {
     }
 
     _this = _super.call.apply(_super, [this].concat(args));
+    _this.showListViewItemActionSelect = true;
 
     _this.selectRecord = function (_ref) {
       var handleData = _ref.handleData;

package/es/framework/DataSinglePageView/SinglePageDrawer/index.js

@@ -430,8 +430,7 @@ var SinglePageDrawer = /*#__PURE__*/function (_SinglePage) {
     _this.state = _objectSpread(_objectSpread({}, s), {
       visible: false,
       reloadAnimalShow: false,
-      listViewMode: _constants.listViewConfig.viewMode.table,
-      showListViewItemActionSelect: true
+      listViewMode: _constants.listViewConfig.viewMode.table
     });
     return _this;
   } // eslint-disable-next-line @typescript-eslint/no-unused-vars

package/es/framework/DataSinglePageView/SinglePageSelectDrawer/index.js

@@ -62,6 +62,7 @@ var SinglePageSelectDrawer = /*#__PURE__*/function (_SinglePageDrawer) {
     }
 
     _this = _super.call.apply(_super, [this].concat(args));
+    _this.showListViewItemActionSelect = true;
 
     _this.selectRecord = function (_ref) {
       var handleData = _ref.handleData;

package/es/utils/constants.d.ts

@@ -290,6 +290,7 @@ export namespace cardConfig {
         export const datePicker: string;
         export const timePicker: string;
         export const jsonView: string;
+        export const syntaxHighlighterView: string;
         export const flexText: string;
         export const onlyShowTextByFlexText: string;
         const divider_1: string;

package/es/utils/constants.js

@@ -613,6 +613,11 @@ var cardConfig = _objectSpread(_objectSpread({}, contentConfig), {}, {
      */
     jsonView: 'jsonView',
 
+    /**
+     * json可视化展示
+     */
+    syntaxHighlighterView: 'syntaxHighlighterView',
+
     /**
      * flex类型文字
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-management-fast-framework",
-  "version": "1.12.88",
+  "version": "1.12.91",
   "description": "antd-management-fast-framework",
   "keywords": [
     "antd-management-fast-framework"
@@ -142,6 +142,7 @@
     "@types/react": "^18.0.14",
     "@types/react-document-title": "^2.0.5",
     "@types/react-helmet": "^6.1.5",
+    "@types/react-syntax-highlighter": "^15.5.2",
     "@types/uuid": "^8.3.4",
     "@typescript-eslint/eslint-plugin": "^5.29.0",
     "@umijs/fabric": "^2.12.0",
@@ -221,7 +222,7 @@
     "src/framework",
     "src/utils"
   ],
-  "gitHead": "8b6a6ae564383796c9fe6f8061a36273e6f55022",
+  "gitHead": "76a4d08c1c6321e32020b2dec5d95a10d61e72a9",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }