fan-standard-comp 4.1.0 → 4.1.2

package/es/StandardFilter/style/FilterStyle.js

@@ -28,7 +28,7 @@ var StandardFilterStyleFunc = function StandardFilterStyleFunc(prefix) {
         },
         '.filter-btns .ant-btn': {
           marginLeft: token.paddingXS,
-          marginTop: token.paddingXS,
+          // marginTop: token.paddingXS,
           // marginBottom: token.paddingMD,
           marginBottom: token.paddingXS
         },
@@ -36,9 +36,18 @@ var StandardFilterStyleFunc = function StandardFilterStyleFunc(prefix) {
           // lineHeight: token.controlHeight - 2 + 'px' // 去除样式
         },
         '&.filter-grid-horizontal': {
-          '.filter-btn': {
-            '.spec-button-group': {
-              paddingTop: token.paddingMD
+          // '.filter-btn': {
+          //   '.spec-button-group': {
+          //     paddingTop: token.paddingMD
+          //   },
+          //
+          // },
+          '.filter-btns-horizontal': {
+            '&.filter-btns-horizontal-right .spec-button-group': {
+              justifyContent: 'end'
+            },
+            '&.filter-btns-horizontal-left .spec-button-group': {
+              justifyContent: 'start'
             }
           }
         }

package/es/StandardFilter/style/index.less

@@ -33,10 +33,17 @@
       text-align: left;
 
       .spec-button-group {
-        display: block;
+        display: flex;
+        flex-wrap: wrap;
         padding-left: 0;
         //padding-top: @padding-md;
-
+        //&:before {
+        //  content: '';
+        //  float: left;
+        //}
+        //&:after {
+        //  clear: both;
+        //}
         .ant-btn:first-child {
           margin-left: 0;
         }

package/es/StandardForm/StepForm.js

@@ -90,7 +90,7 @@ var StepForm = /*#__PURE__*/React.forwardRef(function (props, ref) {
         var valitorGroup = curentFields && Array.isArray(curentFields) ? curentFields.filter(function (fItem) {
           return fItem.rules;
         }).map(function (matchItem) {
-          return matchItem.filedName;
+          return matchItem.filedName || matchItem.fieldName;
         }) : [];
         formChild && formChild.validateFields(valitorGroup).then(function (values) {
           if (stepClick) stepClick(type, formChild, values);

package/es/StandardModal/index.js

@@ -307,7 +307,7 @@ var StandardModal = function StandardModal(props) {
         // console.log('执行下一步骤，需要优先进行校验')
         var currentFields = (formItemGroup || [])[current].fields;
         var validatorGroup = currentFields && Array.isArray(currentFields) ? currentFields.map(function (fItem) {
-          return fItem.rules ? fItem.filedName : null;
+          return fItem.rules ? fItem.filedName || fItem.filedName : null;
         }) : [];
         formChild.validateFields(validatorGroup).then(function () {
           // if (stepClick) stepClick(type, formChild, values);

package/es/StandardTable/index.d.ts

@@ -4,7 +4,7 @@ interface StandardTableDataProps {
     list?: object[];
     pagination?: any;
 }
-interface StandardTableProps {
+export interface StandardTableProps {
     columns?: any[];
     data: StandardTableDataProps;
     rowKey?: string;
@@ -20,8 +20,9 @@ interface StandardTableProps {
     buttonGroup?: any[];
     title?: React.ReactNode | string;
     min?: number;
-    buttonGroupConfig?: any[];
+    buttonGroupConfig?: any;
     batchButtonGroup?: any[];
+    buttonGroupPlacement?: string | 'left' | 'right' | 'bottomLeft' | 'bottomRight';
     [k: string]: any;
 }
 declare const StandardTable: FC<StandardTableProps>;

package/es/StandardTable/index.js

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["data", "rowKey", "rowSelection", "columns", "hideOrderNumber", "orderNumber", "className", "emptyText", "codes", "permissionCodes", "columnsConfig", "title", "buttonGroup", "buttonGroupConfig", "min", "batchButtonGroup"];
+var _excluded = ["data", "rowKey", "rowSelection", "columns", "hideOrderNumber", "orderNumber", "className", "emptyText", "codes", "permissionCodes", "columnsConfig", "title", "buttonGroup", "buttonGroupConfig", "min", "batchButtonGroup", "buttonGroupPlacement"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(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 t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -52,6 +52,8 @@ var StandardTable = function StandardTable(props) {
     buttonGroupConfig = _providerConfig$props.buttonGroupConfig,
     min = _providerConfig$props.min,
     batchButtonGroup = _providerConfig$props.batchButtonGroup,
+    _providerConfig$props5 = _providerConfig$props.buttonGroupPlacement,
+    buttonGroupPlacement = _providerConfig$props5 === void 0 ? 'right' : _providerConfig$props5,
     rest = _objectWithoutProperties(_providerConfig$props, _excluded);
   // 加上类型修复 TS:2322 报警
   var resetColumns = [_objectSpread(_objectSpread({
@@ -143,8 +145,8 @@ var StandardTable = function StandardTable(props) {
   }
   var RenderExtraButtonGroup = function RenderExtraButtonGroup(exProps) {
     // @ts-ignore
-    var _providerConfig$props5 = _objectSpread(_objectSpread({}, providerConfig), props),
-      rowSelection = _providerConfig$props5.rowSelection;
+    var _providerConfig$props6 = _objectSpread(_objectSpread({}, providerConfig), props),
+      rowSelection = _providerConfig$props6.rowSelection;
     var buttonGroup = exProps.buttonGroup,
       batchButtonGroup = exProps.batchButtonGroup;
     // 只有配置rowSelection才显示对应的批量按钮组
@@ -156,14 +158,19 @@ var StandardTable = function StandardTable(props) {
       permissionCodes: permissionCodes
     }, buttonGroupConfig));
   };
+  // 根据placement判断按钮组显示在左边还是右边，
+  var placeButtonGroup = batchButtonGroup || buttonGroup ? /*#__PURE__*/React.createElement(RenderExtraButtonGroup, {
+    buttonGroup: buttonGroup,
+    batchButtonGroup: batchButtonGroup
+  }) : null;
+  var placeTitle = title ? /*#__PURE__*/React.createElement("span", {
+    className: 'ant-card-head-title-name'
+  }, title) : null;
   return wrapSSR( /*#__PURE__*/React.createElement(Card, {
     className: classNames(componentName, 'standard-table', className, hashId),
     bordered: false,
-    title: title,
-    extra: batchButtonGroup || buttonGroup ? /*#__PURE__*/React.createElement(RenderExtraButtonGroup, {
-      buttonGroup: buttonGroup,
-      batchButtonGroup: batchButtonGroup
-    }) : null
+    title: buttonGroupPlacement === 'left' ? /*#__PURE__*/React.createElement(React.Fragment, null, placeTitle, placeButtonGroup) : placeTitle,
+    extra: buttonGroupPlacement === 'left' ? null : placeButtonGroup
   }, /*#__PURE__*/React.createElement(Table, _extends({
     rowKey: rowKey || 'id',
     rowSelection: rowSelection ? _objectSpread({

package/es/StandardTable/style/index.js

@@ -33,6 +33,11 @@ var StandardTableStyleFunc = function StandardTableStyleFunc(prefix) {
         'li a[disabled]': {
           color: token.colorBgContainerDisabled
         }
+      },
+      '.ant-card-head': {
+        '.ant-card-head-title-name + .spec-button-group': {
+          marginLeft: token.margin
+        }
       }
     }), '.ant-table', {
       // 固定右侧列的样式

package/es/StandardTablePro/index.d.ts

@@ -0,0 +1,9 @@
+import React from 'react';
+import { StandardTableProps } from '../StandardTable';
+interface StandardTableProType extends StandardTableProps {
+    filterForm?: any;
+    modalForm?: any;
+    [k: string]: any;
+}
+declare const StandardTablePro: React.ForwardRefExoticComponent<React.RefAttributes<StandardTableProType>>;
+export default StandardTablePro;

package/es/StandardTablePro/index.js

@@ -0,0 +1,147 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+var _excluded = ["proClassname", "filterForm", "modalForm", "codes", "permissionCodes", "onChange", "children", "className"];
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(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 t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+import React, { useContext, useImperativeHandle, forwardRef, useState } from 'react';
+// import { FanContext } from "fan-standard-comp";
+import { FanContext } from "../ConfigContext";
+import useStyle from "./style/index";
+import StandardTable from "../StandardTable";
+import StandardFilter from "../StandardFilter";
+import StandardModal from "../StandardModal";
+import classNames from "classnames";
+var StandardTablePro = /*#__PURE__*/forwardRef(function (props, ref) {
+  var InitFanContext = useContext(FanContext);
+  var providerConfig = InitFanContext['StandardTablePro'] || {}; // 使用上下文（全局配置）设置扩展的配置项
+  var _providerConfig$props = _objectSpread(_objectSpread({}, providerConfig), props),
+    proClassname = _providerConfig$props.proClassname,
+    filterForm = _providerConfig$props.filterForm,
+    modalForm = _providerConfig$props.modalForm,
+    codes = _providerConfig$props.codes,
+    permissionCodes = _providerConfig$props.permissionCodes,
+    onChange = _providerConfig$props.onChange,
+    children = _providerConfig$props.children,
+    className = _providerConfig$props.className,
+    others = _objectWithoutProperties(_providerConfig$props, _excluded);
+  var commonConfig = {
+    codes: codes,
+    permissionCodes: permissionCodes
+  };
+  var componentName = 'spec-standard-table-pro';
+  var _useStyle = useStyle(componentName),
+    _useStyle2 = _slicedToArray(_useStyle, 2),
+    wrapSSR = _useStyle2[0],
+    hashId = _useStyle2[1];
+  var handleChange = function handleChange(targetKey, data, defaultParam) {
+    onChange && onChange(targetKey, data, defaultParam);
+  };
+  var _useState = useState({}),
+    _useState2 = _slicedToArray(_useState, 2),
+    filterFormFields = _useState2[0],
+    setFilterFormFields = _useState2[1];
+  var _useState3 = useState(),
+    _useState4 = _slicedToArray(_useState3, 2),
+    filterFormInstance = _useState4[0],
+    setFilterFormInstance = _useState4[1];
+  var _useState5 = useState({}),
+    _useState6 = _slicedToArray(_useState5, 2),
+    modalFormFields = _useState6[0],
+    setModalFormFields = _useState6[1];
+  var _useState7 = useState(),
+    _useState8 = _slicedToArray(_useState7, 2),
+    modalFormInstance = _useState8[0],
+    setModalFormInstance = _useState8[1];
+  var _useState9 = useState(false),
+    _useState10 = _slicedToArray(_useState9, 2),
+    modalVisible = _useState10[0],
+    setModalVisible = _useState10[1];
+
+  // ref 的转发
+  useImperativeHandle(ref, function () {
+    return _objectSpread(_objectSpread({}, filterForm), {}, {
+      filterFormFields: filterFormFields,
+      filterFormInstance: filterFormInstance,
+      modalFormFields: modalFormFields,
+      modalFormInstance: modalFormInstance
+      // dataSource: resDataSource,
+      // setDataSource: setResDataSource,
+      // reload: (filter) => loadData('refresh', {}, filter) // 更新列表
+    });
+  });
+  return wrapSSR( /*#__PURE__*/React.createElement("div", {
+    className: classNames(componentName, proClassname, hashId)
+  }, /*#__PURE__*/React.createElement(StandardFilter, _extends({}, commonConfig, filterForm, {
+    getFormFields: function getFormFields(fieldValues, form) {
+      setFilterFormFields(fieldValues); // 获取表单内部控件值
+      setFilterFormInstance(form); // 获取表单实例
+    },
+    onFilterSearch: function onFilterSearch(values) {
+      return handleChange('filterSearch', values);
+    },
+    onFilterReset: function onFilterReset(values) {
+      return handleChange('filterReset', values);
+    },
+    className: classNames('spec-standard-table-pro-filter', filterForm === null || filterForm === void 0 ? void 0 : filterForm.className)
+  })), /*#__PURE__*/React.createElement(StandardModal, _extends({}, commonConfig, modalForm, {
+    getFormFields: function getFormFields(fields, form) {
+      setModalFormFields(fields);
+      setModalFormInstance(form);
+    },
+    className: classNames('spec-standard-table-pro-modal', modalForm === null || modalForm === void 0 ? void 0 : modalForm.className)
+  })), /*#__PURE__*/React.createElement(StandardTable, _extends({}, commonConfig, others, {
+    // @ts-ignore
+    onChange: function onChange(pagination, filters, sorter, extra) {
+      console.log('表格筛选条件', pagination, filters, sorter, extra);
+      // console.log(' pagination, filters, sorter', pagination, filters, sorter)
+      // loadData('table', {
+      //   page: pagination.current,
+      //   size: pagination.pageSize
+      // }, filters, sorter)
+
+      console.log('pagination', pagination);
+      console.log('filters', filters);
+      console.log('sorter', sorter);
+      console.log('extra', extra);
+      var orders = [];
+      if (Array.isArray(sorter)) {
+        // 多个条件
+        orders = sorter.map(function (item) {
+          return {
+            column: item.columnKey,
+            asc: item.order === 'ascend'
+          };
+        });
+      } else {
+        // 单个条件
+        orders.push({
+          column: sorter.columnKey,
+          asc: sorter.order === 'ascend'
+        });
+      }
+      console.log('orders', orders);
+      handleChange('tableChange', {
+        page: pagination.current,
+        size: pagination.pageSize
+      }, {
+        pagination: pagination,
+        filters: filters,
+        sorter: sorter,
+        extra: extra
+      });
+    },
+    className: classNames('spec-standard-table-pro-table', className)
+  })), children));
+});
+export default StandardTablePro;

package/es/StandardTablePro/style/index.d.ts

@@ -0,0 +1,6 @@
+import { GlobalToken } from "antd";
+export interface StandardTableTokenType extends GlobalToken {
+    [k: string]: any;
+}
+declare const StandardTableProStyleFunc: (prefix: string) => any;
+export default StandardTableProStyleFunc;

package/es/StandardTablePro/style/index.js

@@ -0,0 +1,28 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import { createStyleHook } from "../../theme/utils/genStyleHook";
+var StandardTableProStyleFunc = function StandardTableProStyleFunc(prefix) {
+  var prepareComponentToken = function prepareComponentToken(token) {
+    return {
+      // fontWeight: 400,
+    };
+  };
+  return createStyleHook(prefix, function (token) {
+    var prefixCls = ".".concat(prefix);
+    var rowTd = {
+      '> td': {
+        // borderColor: new TinyColor(token.colorPrimary).setAlpha(0.5).toRgbString(), // fade(@primary-color, 50%),
+        // '&::before': {
+        //   borderTop: `1px solid ${new TinyColor(token.colorPrimary).setAlpha(0.5).toRgbString()}`,
+        // }
+      }
+    };
+    return [_defineProperty({}, prefixCls, {
+      '.spec-standard-table-pro': {}
+    })];
+  }, prepareComponentToken // 当前组件扩展的变量
+  );
+};
+export default StandardTableProStyleFunc;

package/es/data/city.data.d.ts

@@ -0,0 +1,20 @@
+declare const _default: ({
+    value: string;
+    label: string;
+    children: {
+        value: string;
+        label: string;
+    }[];
+} | {
+    value: string;
+    label: string;
+    children: {
+        value: string;
+        label: string;
+        children: {
+            value: string;
+            label: string;
+        }[];
+    }[];
+})[];
+export default _default;