@yilianjituan/yilian_dgerm 0.0.1-alpha.21 → 0.0.1-alpha.23

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

@@ -56,7 +56,11 @@ export interface DropDownSelectProps extends SelectProps {
     */
     onChange?: (value: any) => void;
     /**
-    * @description 表单对象 -- 因form表单的某个值改变时，需要传到接口中，所以需要传入form对象
+    * @description 动态参数，执行查询需要执行之前处理的参数
     */
-    formInfo?: any;
+    dynamicParameter?: any;
+    /**
+     * @description 动态参数，处理动态参数的方法
+     */
+    beforeSearch?: (params: any) => void;
 }

package/dist/components/DropDownSelect/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 = ["url", "method", "handleSelect", "showValue", "customInput", "searchValue", "additionalParameters", "formInfo", "filterOptionsCallback", "onChange", "mode"];
+var _excluded = ["url", "method", "handleSelect", "showValue", "customInput", "searchValue", "additionalParameters", "dynamicParameter", "beforeSearch", "filterOptionsCallback", "onChange", "mode"];
 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 _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."); }
@@ -25,7 +25,6 @@ import React, { useEffect, useState, useRef } from 'react';
 import { Select, Spin } from "antd";
 import { http } from "../../commonAxios/http";
 import _ from 'lodash';
-import { caleParmsData } from "../../commonType/globalFun";
 var Option = Select.Option;
 var Index = function Index(props) {
   var url = props.url,
@@ -37,8 +36,9 @@ var Index = function Index(props) {
     customInput = _props$customInput === void 0 ? false : _props$customInput,
     searchValue = props.searchValue,
     additionalParameters = props.additionalParameters,
-    _props$formInfo = props.formInfo,
-    formInfo = _props$formInfo === void 0 ? undefined : _props$formInfo,
+    _props$dynamicParamet = props.dynamicParameter,
+    dynamicParameter = _props$dynamicParamet === void 0 ? undefined : _props$dynamicParamet,
+    beforeSearch = props.beforeSearch,
     filterOptionsCallback = props.filterOptionsCallback,
     _onChange = props.onChange,
     _props$mode = props.mode,
@@ -92,11 +92,11 @@ var Index = function Index(props) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             setSelectState(true);
-            // 这个逻辑caleParmsData 用于方案中查询随访、满意度、用药反馈等表单时，将form表单中的值转化为接口所需参数
-            _additionalParameters = formInfo ? caleParmsData(formInfo) : additionalParameters;
-            _context2.next = 4;
+            _additionalParameters = dynamicParameter && beforeSearch ? beforeSearch(dynamicParameter) : additionalParameters;
+            console.log("🚀 ~ getStoreList ~ _additionalParameters:", _additionalParameters, beforeSearch, additionalParameters);
+            _context2.next = 5;
             return inquireDiseases(_objectSpread(_defineProperty(_defineProperty(_defineProperty({}, searchValue, paramsRef.current), "pageNo", pageRef.current), "pageSize", 10), _additionalParameters ? _additionalParameters : {}));
-          case 4:
+          case 5:
             data = _context2.sent;
             if (data.code === "OK") {
               target = data.result;
@@ -106,7 +106,7 @@ var Index = function Index(props) {
               setStoreList(storeListRef.current || []);
               setSelectState(false);
             }
-          case 6:
+          case 7:
           case "end":
             return _context2.stop();
         }

package/dist/components/PageTemplate/index.scss

@@ -1,6 +1,6 @@
-.page-template{
+.page-template {
 
-  .ant-form-inline{
+  .ant-form-inline {
 
     .ant-form-item {
 
@@ -8,21 +8,23 @@
       //   width: 80px;
       // }
 
-      .ant-select{
+      .ant-select {
         top: 0;
       }
 
-      .ant-input-group-addon{
+      .ant-input-group-addon {
 
-        .ant-select{
+        .ant-select {
           width: auto;
         }
       }
 
-      .ant-select,.ant-input,.ant-input-number{
+      .ant-select,
+      .ant-input,
+      .ant-input-number {
         width: 200px;
 
-        &.ant-calendar-picker-input{
+        &.ant-calendar-picker-input {
           width: auto;
           min-width: 200px;
         }
@@ -42,36 +44,47 @@
         margin-bottom: 5px;
       }
     }
+
     .extra-filter-box {
       display: flex;
       flex-wrap: wrap;
+
       & .ant-form-item {
         margin-bottom: 5px;
       }
     }
   }
 
-  .ant-table-thead > tr > th,   .ant-table-tbody > tr > td{
+  .ant-table-thead>tr>th,
+  .ant-table-tbody>tr>td {
     text-align: center;
     min-width: 80px;
     max-width: 230px;
   }
-  
-  &__filter{
 
-    .actions{
+  &__filter {
 
-      .ant-btn{
+    .actions {
+
+      .ant-btn {
         margin-right: 8px;
       }
     }
 
     // 科室主题颜色
-    .actions-theme{
-      background: #00998F;
+    .actions-theme {
+      .ant-btn {
+        margin-right: 8px;
+        background: #00998F;
+      }
+
+      .ant-btn:hover {
+        background: #03b1a6;
+      }
     }
   }
-  .radioInfos{
+
+  .radioInfos {
     margin-left: 10px;
   }
-}
+}

package/package.json

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