antd-management-fast-framework 1.12.5 → 1.12.10

package/CHANGELOG.md

@@ -2,6 +2,28 @@
 
 All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+### [1.12.10](https://github.com/kityandhero/antd-management-fast-framework/compare/antd-management-fast-framework@1.12.9...antd-management-fast-framework@1.12.10) (2021-12-29)
+
+**Note:** Version bump only for package antd-management-fast-framework
+
+### [1.12.9](https://github.com/kityandhero/antd-management-fast-framework/compare/antd-management-fast-framework@1.12.8...antd-management-fast-framework@1.12.9) (2021-12-28)
+
+**Note:** Version bump only for package antd-management-fast-framework
+
+### [1.12.8](https://github.com/kityandhero/antd-management-fast-framework/compare/antd-management-fast-framework@1.12.7...antd-management-fast-framework@1.12.8) (2021-12-28)
+
+### Performance Improvements
+
+- **antd-management-fast-framework:** update ([344a956](https://github.com/kityandhero/antd-management-fast-framework/commit/344a9564dd868d5b38197cecf521ecc475a85f68))
+
+### [1.12.7](https://github.com/kityandhero/antd-management-fast-framework/compare/antd-management-fast-framework@1.12.6...antd-management-fast-framework@1.12.7) (2021-12-28)
+
+**Note:** Version bump only for package antd-management-fast-framework
+
+### [1.12.6](https://github.com/kityandhero/antd-management-fast-framework/compare/antd-management-fast-framework@1.12.5...antd-management-fast-framework@1.12.6) (2021-12-25)
+
+**Note:** Version bump only for package antd-management-fast-framework
+
 ### [1.12.5](https://github.com/kityandhero/antd-management-fast-framework/compare/antd-management-fast-framework@1.12.4...antd-management-fast-framework@1.12.5) (2021-12-25)
 
 **Note:** Version bump only for package antd-management-fast-framework

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

@@ -362,6 +362,15 @@ export function buildFormDatePicker({ label, name, required, helper, datePickerP
     canOperate?: boolean | undefined;
     formItemLayout?: {} | undefined;
 }): JSX.Element;
+export function buildFormTimePicker({ label, name, required, helper, timePickerProps, canOperate, formItemLayout, }: {
+    label: any;
+    name: any;
+    required?: boolean | undefined;
+    helper?: any;
+    timePickerProps?: {} | undefined;
+    canOperate?: boolean | undefined;
+    formItemLayout?: {} | undefined;
+}): JSX.Element;
 export function buildColumnList({ columnList, attachedTargetName }: {
     columnList: any;
     attachedTargetName?: string | undefined;

package/es/customComponents/FunctionComponent/index.js

@@ -38,6 +38,7 @@ exports.buildFormSelect = buildFormSelect;
 exports.buildFormSwitch = buildFormSwitch;
 exports.buildFormText = buildFormText;
 exports.buildFormTextArea = buildFormTextArea;
+exports.buildFormTimePicker = buildFormTimePicker;
 exports.buildFormUpdateTimeField = buildFormUpdateTimeField;
 exports.buildJsonView = buildJsonView;
 exports.buildListViewItemActionSelect = buildListViewItemActionSelect;
@@ -63,6 +64,10 @@ require("antd/es/badge/style");
 
 var _badge = _interopRequireDefault(require("antd/es/badge"));
 
+require("antd/es/time-picker/style");
+
+var _timePicker = _interopRequireDefault(require("antd/es/time-picker"));
+
 require("antd/es/date-picker/style");
 
 var _datePicker = _interopRequireDefault(require("antd/es/date-picker"));
@@ -2642,10 +2647,58 @@ function buildFormDatePicker(_ref47) {
   }), /*#__PURE__*/_react.default.createElement(_datePicker.default, otherDatePickerProps));
 }
 
-function buildColumnList(_ref48) {
-  var columnList = _ref48.columnList,
-      _ref48$attachedTarget = _ref48.attachedTargetName,
-      attachedTargetName = _ref48$attachedTarget === void 0 ? '' : _ref48$attachedTarget;
+function buildFormTimePicker(_ref48) {
+  var label = _ref48.label,
+      name = _ref48.name,
+      _ref48$required = _ref48.required,
+      required = _ref48$required === void 0 ? false : _ref48$required,
+      _ref48$helper = _ref48.helper,
+      helper = _ref48$helper === void 0 ? null : _ref48$helper,
+      _ref48$timePickerProp = _ref48.timePickerProps,
+      timePickerProps = _ref48$timePickerProp === void 0 ? {} : _ref48$timePickerProp,
+      _ref48$canOperate = _ref48.canOperate,
+      canOperate = _ref48$canOperate === void 0 ? true : _ref48$canOperate,
+      _ref48$formItemLayout = _ref48.formItemLayout,
+      formItemLayout = _ref48$formItemLayout === void 0 ? {} : _ref48$formItemLayout;
+  var title = label;
+
+  var otherTimePickerProps = _objectSpread(_objectSpread({}, {
+    style: {
+      width: '100%'
+    },
+    inputReadOnly: true,
+    placeholder: (0, _tools.buildFieldDescription)(title, '选择')
+  }), timePickerProps || {});
+
+  var resultCheck = (0, _tools.checkFromConfig)({
+    label: title,
+    name: name,
+    helper: helper
+  });
+
+  if (!canOperate) {
+    return /*#__PURE__*/_react.default.createElement(FormItem, _extends({}, formItemLayout, {
+      label: resultCheck.label,
+      name: resultCheck.name,
+      extra: (0, _tools.stringIsNullOrWhiteSpace)(resultCheck.helper || '') ? null : (0, _tools.buildFieldHelper)(resultCheck.helper)
+    }), /*#__PURE__*/_react.default.createElement(_timePicker.default, otherTimePickerProps));
+  }
+
+  return /*#__PURE__*/_react.default.createElement(FormItem, _extends({}, formItemLayout, {
+    label: resultCheck.label,
+    name: resultCheck.name,
+    extra: (0, _tools.stringIsNullOrWhiteSpace)(resultCheck.helper || '') ? null : (0, _tools.buildFieldHelper)(resultCheck.helper),
+    rules: [{
+      required: required,
+      message: (0, _tools.buildFieldDescription)(resultCheck.label)
+    }]
+  }), /*#__PURE__*/_react.default.createElement(_timePicker.default, otherTimePickerProps));
+}
+
+function buildColumnList(_ref49) {
+  var columnList = _ref49.columnList,
+      _ref49$attachedTarget = _ref49.attachedTargetName,
+      attachedTargetName = _ref49$attachedTarget === void 0 ? '' : _ref49$attachedTarget;
   return ((0, _tools.isArray)(columnList) ? columnList : []).map(function (o) {
     return buildColumnItem({
       column: o,
@@ -2654,10 +2707,10 @@ function buildColumnList(_ref48) {
   });
 }
 
-function buildColumnItem(_ref49) {
-  var columnConfig = _ref49.column,
-      _ref49$attachedTarget = _ref49.attachedTargetName,
-      attachedTargetName = _ref49$attachedTarget === void 0 ? '' : _ref49$attachedTarget;
+function buildColumnItem(_ref50) {
+  var columnConfig = _ref50.column,
+      _ref50$attachedTarget = _ref50.attachedTargetName,
+      attachedTargetName = _ref50$attachedTarget === void 0 ? '' : _ref50$attachedTarget;
 
   var d = _objectSpread({}, columnConfig);
 
@@ -2957,29 +3010,29 @@ function buildColumnItem(_ref49) {
  */
 
 
-function buildColorText(_ref50) {
-  var _ref50$canCopy = _ref50.canCopy,
-      canCopy = _ref50$canCopy === void 0 ? false : _ref50$canCopy,
-      _ref50$randomSeed = _ref50.randomSeed,
-      randomSeed = _ref50$randomSeed === void 0 ? 0 : _ref50$randomSeed,
-      _ref50$seedOffset = _ref50.seedOffset,
-      seedOffset = _ref50$seedOffset === void 0 ? 0 : _ref50$seedOffset,
-      _ref50$randomColor = _ref50.randomColor,
-      randomColor = _ref50$randomColor === void 0 ? false : _ref50$randomColor,
-      _ref50$color = _ref50.color,
-      color = _ref50$color === void 0 ? '' : _ref50$color,
-      _ref50$textPrefix = _ref50.textPrefix,
-      textPrefix = _ref50$textPrefix === void 0 ? null : _ref50$textPrefix,
-      _ref50$textPrefixStyl = _ref50.textPrefixStyle,
-      textPrefixStyle = _ref50$textPrefixStyl === void 0 ? null : _ref50$textPrefixStyl,
-      _ref50$text = _ref50.text,
-      text = _ref50$text === void 0 ? '' : _ref50$text,
-      _ref50$separator = _ref50.separator,
-      separator = _ref50$separator === void 0 ? '：' : _ref50$separator,
-      _ref50$separatorStyle = _ref50.separatorStyle,
-      separatorStyle = _ref50$separatorStyle === void 0 ? null : _ref50$separatorStyle,
-      _ref50$wrapperBuilder = _ref50.wrapperBuilder,
-      wrapperBuilder = _ref50$wrapperBuilder === void 0 ? null : _ref50$wrapperBuilder;
+function buildColorText(_ref51) {
+  var _ref51$canCopy = _ref51.canCopy,
+      canCopy = _ref51$canCopy === void 0 ? false : _ref51$canCopy,
+      _ref51$randomSeed = _ref51.randomSeed,
+      randomSeed = _ref51$randomSeed === void 0 ? 0 : _ref51$randomSeed,
+      _ref51$seedOffset = _ref51.seedOffset,
+      seedOffset = _ref51$seedOffset === void 0 ? 0 : _ref51$seedOffset,
+      _ref51$randomColor = _ref51.randomColor,
+      randomColor = _ref51$randomColor === void 0 ? false : _ref51$randomColor,
+      _ref51$color = _ref51.color,
+      color = _ref51$color === void 0 ? '' : _ref51$color,
+      _ref51$textPrefix = _ref51.textPrefix,
+      textPrefix = _ref51$textPrefix === void 0 ? null : _ref51$textPrefix,
+      _ref51$textPrefixStyl = _ref51.textPrefixStyle,
+      textPrefixStyle = _ref51$textPrefixStyl === void 0 ? null : _ref51$textPrefixStyl,
+      _ref51$text = _ref51.text,
+      text = _ref51$text === void 0 ? '' : _ref51$text,
+      _ref51$separator = _ref51.separator,
+      separator = _ref51$separator === void 0 ? '：' : _ref51$separator,
+      _ref51$separatorStyle = _ref51.separatorStyle,
+      separatorStyle = _ref51$separatorStyle === void 0 ? null : _ref51$separatorStyle,
+      _ref51$wrapperBuilder = _ref51.wrapperBuilder,
+      wrapperBuilder = _ref51$wrapperBuilder === void 0 ? null : _ref51$wrapperBuilder;
 
   var colorText = /*#__PURE__*/_react.default.createElement(_ColorText.default, {
     canCopy: canCopy || false,
@@ -3001,9 +3054,9 @@ function buildColorText(_ref50) {
   return wrapperBuilder(colorText);
 }
 
-function adjustTableExpandConfig(_ref51) {
-  var list = _ref51.list,
-      config = _ref51.config;
+function adjustTableExpandConfig(_ref52) {
+  var list = _ref52.list,
+      config = _ref52.config;
 
   if ((config || null) != null) {
     var _checkNeedExpander$ro = _objectSpread(_objectSpread({}, {
@@ -3020,10 +3073,10 @@ function adjustTableExpandConfig(_ref51) {
       animalType: _constants.listViewConfig.expandAnimalType.none,
       expandIconRotate: true,
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      expandIcon: function expandIcon(_ref52) {
-        var expanded = _ref52.expanded,
-            onExpand = _ref52.onExpand,
-            record = _ref52.record;
+      expandIcon: function expandIcon(_ref53) {
+        var expanded = _ref53.expanded,
+            onExpand = _ref53.onExpand,
+            record = _ref53.record;
         return /*#__PURE__*/_react.default.createElement(_icons.RightCircleOutlined, null);
       },
       expandedRowRender: null
@@ -3053,11 +3106,11 @@ function adjustTableExpandConfig(_ref51) {
 
     var expandableConfig = checkNeedExpanderResult ? {
       rowExpandable: rowExpandable,
-      expandIcon: function expandIcon(_ref53) {
-        var canExpand = _ref53.expandable,
-            expanded = _ref53.expanded,
-            onExpand = _ref53.onExpand,
-            record = _ref53.record;
+      expandIcon: function expandIcon(_ref54) {
+        var canExpand = _ref54.expandable,
+            expanded = _ref54.expanded,
+            onExpand = _ref54.onExpand,
+            record = _ref54.record;
 
         if (!canExpand && (expandPlaceholderIcon || null) != null) {
           return expandPlaceholderIcon || null;

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

@@ -99,6 +99,7 @@ declare class Common extends Core {
     renderFormInputNumber: (label: any, name: any, required?: boolean, helper?: any, icon?: JSX.Element, inputNumberProps?: {}, canOperate?: boolean, formItemLayout?: {}) => JSX.Element;
     renderFormTextArea: (label: any, name: any, required?: boolean, helper?: any, textAreaProps?: {}, canOperate?: boolean, formItemLayout?: {}) => JSX.Element;
     renderFormDatePicker: (label: any, name: any, required?: boolean, helper?: any, datePickerProps?: {}, canOperate?: boolean, formItemLayout?: {}) => JSX.Element;
+    renderFormTimePicker: (label: any, name: any, required?: boolean, helper?: any, timePickerProps?: {}, canOperate?: boolean, formItemLayout?: {}) => JSX.Element;
     renderFormSelect: (label: any, name: any, renderItemFunction: any, helper?: any, onChangeCallback?: any, formItemLayout?: any, required?: boolean, otherProps?: any) => JSX.Element;
     renderFormRadio: (label: any, name: any, renderItemFunction: any, helper?: any, onChangeCallback?: any, formItemLayout?: any, required?: boolean, otherProps?: any) => JSX.Element;
     renderSearchFormSelect: (label: any, name: any, options: any, helper?: any) => JSX.Element;

package/es/framework/Common/index.js

@@ -950,6 +950,23 @@ var Common = /*#__PURE__*/function (_Core) {
       });
     };
 
+    _this.renderFormTimePicker = function (label, name) {
+      var required = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+      var helper = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
+      var timePickerProps = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
+      var canOperate = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
+      var formItemLayout = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : {};
+      return (0, _FunctionComponent.buildFormTimePicker)({
+        label: label,
+        name: name,
+        required: required,
+        helper: helper,
+        timePickerProps: timePickerProps,
+        canOperate: canOperate,
+        formItemLayout: formItemLayout
+      });
+    };
+
     _this.renderFormSelect = function (label, name, renderItemFunction) {
       var helper = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
       var onChangeCallback = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
@@ -2106,7 +2123,7 @@ var Common = /*#__PURE__*/function (_Core) {
           icon: null,
           textPrefix: fieldData.label || '',
           text: contentItem.value || ''
-        }) : null, type === _constants.cardConfig.contentItemType.datePicker ? _this.renderFormDatePicker(fieldData.label, fieldData.name, require, fieldData.helper, _objectSpread(_objectSpread({}, {}), contentItem.otherProps || {}), canOperate, formItemLayout) : null, type === _constants.cardConfig.contentItemType.textarea ? _this.renderFormTextArea(fieldData.label, fieldData.name, require, fieldData.helper, _objectSpread(_objectSpread({}, {
+        }) : null, type === _constants.cardConfig.contentItemType.datePicker ? _this.renderFormDatePicker(fieldData.label, fieldData.name, require, fieldData.helper, _objectSpread(_objectSpread({}, {}), contentItem.otherProps || {}), canOperate, formItemLayout) : null, type === _constants.cardConfig.contentItemType.timePicker ? _this.renderFormTimePicker(fieldData.label, fieldData.name, require, fieldData.helper, _objectSpread(_objectSpread({}, {}), contentItem.otherProps || {}), canOperate, formItemLayout) : null, type === _constants.cardConfig.contentItemType.textarea ? _this.renderFormTextArea(fieldData.label, fieldData.name, require, fieldData.helper, _objectSpread(_objectSpread({}, {
           autoSize: {
             minRows: 3,
             maxRows: 5

package/es/utils/constants.d.ts

@@ -399,6 +399,10 @@ export namespace cardConfig {
          * 日期选择项，仅用于单页详情或表单上下文环境显示单项内容区域
          */
         datePicker: string;
+        /**
+         * 时间选择项，仅用于单页详情或表单上下文环境显示单项内容区域
+         */
+        timePicker: string;
         /**
          * json可视化展示
          */

package/es/utils/constants.js

@@ -597,6 +597,11 @@ var cardConfig = _objectSpread(_objectSpread({}, contentConfig), {}, {
      */
     datePicker: 'datePicker',
 
+    /**
+     * 时间选择项，仅用于单页详情或表单上下文环境显示单项内容区域
+     */
+    timePicker: 'timePicker',
+
     /**
      * json可视化展示
      */

package/es/utils/tools.d.ts

@@ -411,10 +411,12 @@ export function getValueByKey({ data, key, defaultValue, convert, convertBuilder
     format?: any;
     formatBuilder?: any;
 }): any;
-export function convertTarget({ target, convert }: {
-    target: any;
-    convert: any;
-}): any;
+/**
+ * convertTarget
+ * @param {*} param0
+ * @returns
+ */
+export function convertTarget({ target, convert }: any): any;
 export function formatTarget({ target, format }: {
     target: any;
     format: any;

package/es/utils/tools.js

@@ -1059,6 +1059,12 @@ function getValueByKey(_ref14) {
 
   return result;
 }
+/**
+ * convertTarget
+ * @param {*} param0
+ * @returns
+ */
+
 
 function convertTarget(_ref15) {
   var target = _ref15.target,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-management-fast-framework",
-  "version": "1.12.5",
+  "version": "1.12.10",
   "description": "antd-management-fast-framework",
   "keywords": [
     "antd-management-fast-framework"
@@ -30,14 +30,14 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@ant-design/pro-layout": "^6.31.7",
+    "@ant-design/pro-layout": "^6.32.1",
     "@antv/data-set": "^0.11.8",
     "@tinymce/tinymce-react": "^3.13.0",
-    "antd": "^4.17.4",
+    "antd": "^4.18.0",
     "array-move": "^4.0.0",
     "bizcharts": "^4.1.15",
     "browserslist": "^4.19.1",
-    "caniuse-lite": "^1.0.30001292",
+    "caniuse-lite": "^1.0.30001294",
     "classnames": "^2.3.1",
     "copy-to-clipboard": "^3.3.1",
     "enquire-js": "^0.2.1",
@@ -84,15 +84,15 @@
     "@babel/plugin-proposal-decorators": "^7.16.5",
     "@babel/plugin-syntax-jsx": "^7.16.5",
     "@babel/preset-react": "^7.16.5",
-    "@commitlint/cli": "^15.0.0",
-    "@commitlint/config-conventional": "^15.0.0",
-    "@commitlint/config-lerna-scopes": "^15.0.0",
-    "@commitlint/cz-commitlint": "^15.0.0",
+    "@commitlint/cli": "^16.0.1",
+    "@commitlint/config-conventional": "^16.0.0",
+    "@commitlint/config-lerna-scopes": "^16.0.0",
+    "@commitlint/cz-commitlint": "^16.0.0",
     "@testing-library/react": "^12.1.2",
     "@testing-library/react-hooks": "^7.0.2",
     "@types/jest": "^27.0.3",
-    "@types/node": "^17.0.4",
-    "@typescript-eslint/eslint-plugin": "^5.8.0",
+    "@types/node": "^17.0.5",
+    "@typescript-eslint/eslint-plugin": "^5.8.1",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.5.20",
     "@umijs/test-utils": "^3.5.20",
@@ -103,12 +103,12 @@
     "commitizen": "^4.2.4",
     "cross-env": "^7.0.3",
     "eslint": "^8.5.0",
-    "eslint-config-airbnb": "^19.0.2",
+    "eslint-config-airbnb": "^19.0.4",
     "eslint-config-airbnb-typescript": "^16.1.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-import": "^2.25.3",
-    "eslint-plugin-jest": "^25.3.0",
+    "eslint-plugin-jest": "^25.3.2",
     "eslint-plugin-jsx-a11y": "^6.5.1",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-react": "^7.28.0",
@@ -122,7 +122,7 @@
     "import-sort-parser-typescript": "^6.0.0",
     "import-sort-style-module": "^6.0.0",
     "lerna": "^4.0.0",
-    "lint-staged": "^12.1.3",
+    "lint-staged": "^12.1.4",
     "npm-run-all": "^4.1.5",
     "pify": "^5.0.0",
     "postcss": "^8.4.5",