ls-pro-common 1.1.0 → 1.1.2

package/lib/components/Loading.js

@@ -1,40 +1,28 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
 require("antd/es/spin/style");
-
 var _spin = _interopRequireDefault(require("antd/es/spin"));
-
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-
 var _react = _interopRequireDefault(require("react"));
-
 require("./common.less");
-
 var _excluded = ["Text", "className"];
-
 var _default = function _default(props) {
   var _props$Text = props.Text,
-      Text = _props$Text === void 0 ? '加载中...' : _props$Text,
-      className = props.className,
-      rest = (0, _objectWithoutProperties2.default)(props, _excluded);
+    Text = _props$Text === void 0 ? '加载中...' : _props$Text,
+    className = props.className,
+    rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var cls = "loading";
-
   if (className) {
     cls += " " + className;
   }
-
   return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
     className: cls
   }, rest), " ", /*#__PURE__*/_react.default.createElement(_spin.default, null), Text);
 };
-
 exports.default = _default;

package/lib/components/common.less

@@ -82,6 +82,69 @@ body {
   // --ant-info-color-deprecated-border        : #ccebff;
 }
 
+
+body.theme-yellow {
+  --ant-primary-color: #fa8500;
+  --ant-primary-color-hover: #ffa229;
+  --ant-primary-color-active: #d46a00;
+  --ant-primary-color-outline: rgba(250, 133, 0, 0.2);
+  --ant-primary-bg: #fff;
+  --ant-primary-side: #fff7e6;
+  --ant-primary-0: #ffd9ad;
+  --ant-primary-1: #fff7e6;
+  --ant-primary-2: #ffe0a3;
+  --ant-primary-3: #ffce7a;
+  --ant-primary-4: #ffba52;
+  --ant-primary-5: #ffa229;
+  --ant-primary-6: #fa8500;
+  --ant-primary-7: #d46a00;
+  --ant-primary-color-deprecated-pure: #ffd9ad;
+  --ant-primary-color-deprecated-l-35: #ffd9ad;
+  --ant-primary-color-deprecated-l-20: #ffb561;
+  --ant-primary-color-deprecated-t-20: #fb9d33;
+  --ant-primary-color-deprecated-t-50: #fdc280;
+  --ant-primary-color-deprecated-f-12: rgba(250, 133, 0, 0.12);
+  --ant-primary-color-active-deprecated-f-30: rgba(255, 247, 230, 0.3);
+  --ant-primary-color-active-deprecated-d-02: #fff4dc;
+  --ant-success-color: #52c41a;
+  --ant-success-color-hover: #73d13d;
+  --ant-success-color-active: #389e0d;
+  --ant-success-color-outline: rgba(82, 196, 26, 0.2);
+  --ant-success-color-deprecated-bg: #f6ffed;
+  --ant-success-color-deprecated-border: #b7eb8f;
+  --ant-error-color: #ff4d4f;
+  --ant-error-color-hover: #ff7875;
+  --ant-error-color-active: #d9363e;
+  --ant-error-color-outline: rgba(255, 77, 79, 0.2);
+  --ant-error-color-deprecated-bg: #fff2f0;
+  --ant-error-color-deprecated-border: #ffccc7;
+  --ant-warning-color: #faad14;
+  --ant-warning-color-hover: #ffc53d;
+  --ant-warning-color-active: #d48806;
+  --ant-warning-color-outline: rgba(250, 173, 20, 0.2);
+  --ant-warning-color-deprecated-bg: #fffbe6;
+  --ant-warning-color-deprecated-border: #ffe58f;
+  --ant-info-color: #fa8500;
+  --ant-info-color-deprecated-bg: #fff7e6;
+  --ant-info-color-deprecated-border: #ffce7a;
+  --antd-wave-shadow-color: #fa8500;
+
+  .ant-table-cell,
+  .ant-pro-table-alert-info-content {
+    a {
+      color: var(--ant-primary-color);
+    }
+
+    a:hover {
+      color: var(--ant-primary-color-hover);
+    }
+
+    a:active {
+      color: var(--ant-primary-color-active);
+    }
+  }
+}
+
 .dtl-layout {
   position      : absolute;
   top           : 0;
@@ -351,4 +414,98 @@ a:hover {
 
 .ant-row {
   width: 100%;
-}
+}
+
+.ant-popover {
+  max-width: min-content !important;
+}
+//-------------------省市区组件样式-----------
+//最外层盒子
+.ls-area-cascaded-box {
+  width: 600px;
+  display: flex;
+  flex-direction: column;
+  transition: all 0.3s;
+
+  .ls-area-cascaded-header {
+    width: 100%;
+    padding: 2px 0 6px;
+    border-bottom: 1px solid #f0f0f0;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-around;
+    justify-content: center;
+
+    .ls-word-box-display {
+      margin: 0 10px;
+      font-size: 14px;
+      font-weight: 100;
+
+      button {
+        border: none;
+        background-color: var(--ant-primary-2, #f0f9ff);
+
+        &[disabled] {
+          background-color: #fafafa !important;
+
+          .ls-myself-select-title-style {
+            color: var(--ant-primary-4, #a3d7ff);
+            transition: all 0.3s;
+          }
+        }
+      }
+
+      .ls-myself-select-title-style {
+        color: var(--ant-primary-color, rgb(69, 154, 220));
+        font-size: 14px;
+        font-weight: 600;
+        transition: all 0.3s;
+      }
+    }
+
+    .ls-icon-box-display {
+      display: flex;
+      align-items: center;
+    }
+  }
+
+  .ls-area-cascaded-body {
+    width: 100%;
+    min-height: 100px;
+    max-height: 350px;
+    overflow: auto;
+    padding: 8px 12px 4px;
+    display: grid;
+    grid-template-columns: repeat(4, 1fr);
+    gap: 4px;
+    justify-content: start;
+    align-content: flex-start;
+    align-items: center;
+
+    .ls-area-cascaded-span {
+      text-align: center;
+      padding: 6px 10px;
+
+      //文字不换行，超出省略
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      cursor: pointer;
+
+      &.ls-area-selected,
+      &:hover {
+        color: var(--ant-primary-color, rgb(69, 154, 220));
+        transition: all 0.3s;
+      }
+    }
+  }
+}
+
+//手动指定盒子位置
+.ls-area-box-position {
+  .ls-ant-select-dropdown {
+    top: 36px !important;
+  }
+}
+
+//-------------------省市区组件样式-----------

package/lib/hooks/useDtl/index.d.ts

@@ -19,6 +19,8 @@ export declare type DtlParamType = SingleParamType & {
     billType?: string;
     /**@name 动态编码规则字段,主从表一起保存传参 */
     codeRuleDynamicField?: string;
+    /**@是否查询历史数据 */
+    ifHistoryData?: 0 | 1;
 };
 declare function useDtl(dtlParam: DtlParamType): {
     formRef: import("react").MutableRefObject<ProFormInstance<any> | undefined>;