@yilianjituan/yilian_dgerm 0.0.1-alpha.25 → 0.0.1-alpha.26

package/README.md

@@ -107,3 +107,7 @@ MIT
 2、PageTemplate 宿主样式调整
 3、dumi框架路由调整（区分业务组件与纯组件）
 4、结构调整后宿主引用测试
+5、ReactEcharts 组件封装
+6、ReactEcharts 宿主引用与调试
+7、PageTemplate 功能扩展
+8、PageTemplate按钮适配

package/dist/components/PageTemplate/index.interface.d.ts

@@ -30,6 +30,7 @@ export interface IPageTemPropsData {
     isExportPermission?: boolean;
     isSearchPermission?: boolean;
     buttonTheme?: string;
+    addNo?: boolean;
 }
 export interface IColumnsProps {
     title: string;

package/dist/components/PageTemplate/index.js

@@ -1,10 +1,17 @@
 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 = ["showTime"];
 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 _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; }
 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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 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); }
@@ -24,6 +31,8 @@ import ExportExcels from "../ExportExcels";
 import { exportCompile } from "../../utils/common";
 import { http } from "../../commonAxios/http";
 import React from 'react';
+import { DropDownSelect } from "../..";
+import dayjs from 'dayjs';
 var FormItem = Form.Item;
 var RangePicker = DatePicker.RangePicker;
 var PageTemplate = function PageTemplate(props) {
@@ -34,6 +43,8 @@ var PageTemplate = function PageTemplate(props) {
     isSearchPermission = _props$isSearchPermis === void 0 ? true : _props$isSearchPermis,
     _props$isExportPermis = props.isExportPermission,
     isExportPermission = _props$isExportPermis === void 0 ? true : _props$isExportPermis,
+    _props$addNo = props.addNo,
+    addNo = _props$addNo === void 0 ? true : _props$addNo,
     toolbar = props.toolbar,
     tableProps = props.tableProps,
     _props$rowKey = props.rowKey,
@@ -103,8 +114,24 @@ var PageTemplate = function PageTemplate(props) {
     }
   }, [props.url && props.url.url]);
   useEffect(function () {
+    if (addNo) {
+      // 默认添加序号
+      var initColumn = {
+        title: "序号",
+        dataIndex: "",
+        key: "rowIndex",
+        width: 70,
+        align: "center",
+        fixed: 'left',
+        render: function render(_, __, index) {
+          return (current - 1) * pageSizeRef.current + index + 1;
+        }
+      };
+      setColumns([initColumn].concat(_toConsumableArray(props.columns)));
+      return;
+    }
     setColumns(props.columns);
-  }, [props.columns]);
+  }, [props.columns, current, pageSizeRef.current]);
   var _onSearch = function _onSearch() {
     var current = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1;
     if (Number.isNaN(Number(current))) current = 1;
@@ -192,10 +219,18 @@ var PageTemplate = function PageTemplate(props) {
       label = item.label;
     switch (component) {
       case 'RangePicker':
-        return /*#__PURE__*/React.createElement(RangePicker, {
-          placeholder: ['请选择', '请选择'],
-          key: key
-        });
+        var _ref = componentOptions || {},
+          showTime = _ref.showTime,
+          rest = _objectWithoutProperties(_ref, _excluded);
+        var initShowTime = {
+          hideDisabledOptions: true,
+          defaultValue: [dayjs("00:00:00", "HH:mm:ss"), dayjs("23:59:59", "HH:mm:ss")]
+        };
+        return /*#__PURE__*/React.createElement(RangePicker, _extends({
+          placeholder: ['开始时间', '结束时间'],
+          key: key,
+          showTime: showTime || initShowTime
+        }, rest));
       case 'Input':
         return /*#__PURE__*/React.createElement(Input, {
           placeholder: "\u8BF7\u8F93\u5165".concat(label),
@@ -217,6 +252,10 @@ var PageTemplate = function PageTemplate(props) {
           },
           reset: reset
         }, componentOptions));
+      case "DorpDownSelect":
+        return /*#__PURE__*/React.createElement(DropDownSelect, _extends({
+          key: key
+        }, componentOptions));
       default:
         return component;
     }
@@ -269,6 +308,16 @@ var PageTemplate = function PageTemplate(props) {
       eleAfterSearchBtn = props.eleAfterSearchBtn,
       extraFilter = props.extraFilter;
     if ((!filter || !filter.length) && !needExport && !eleAfterSearchBtn) return null;
+    var getPlatFormTheme = function getPlatFormTheme() {
+      switch (buttonTheme) {
+        case 'department':
+          return "actions actions-theme";
+        case 'edc':
+          return "actions actions-theme-edc";
+        default:
+          return "actions";
+      }
+    };
     return /*#__PURE__*/React.createElement(Form, {
       layout: "inline",
       form: form,
@@ -282,7 +331,7 @@ var PageTemplate = function PageTemplate(props) {
     /*#__PURE__*/
     // 新增：科室按钮背景色处理
     React.createElement(FormItem, {
-      className: buttonTheme === 'department' ? "actions actions-theme" : "actions"
+      className: getPlatFormTheme()
     }, isSearchPermission && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, {
       type: "primary",
       htmlType: "submit"

package/dist/components/PageTemplate/index.scss

@@ -82,6 +82,18 @@
         background: #03b1a6;
       }
     }
+
+    // EDC主题颜色
+    .actions-theme-edc {
+      .ant-btn {
+        margin-right: 8px;
+        background: #01a267;
+      }
+
+      .ant-btn:hover {
+        background: #1eb076;
+      }
+    }
   }
 
   .radioInfos {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yilianjituan/yilian_dgerm",
-  "version": "0.0.1-alpha.25",
+  "version": "0.0.1-alpha.26",
   "description": "A react library developed with dumi",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",