@vtx/modals2 5.0.12 → 5.0.14

package/lib/vtx-restaurant-modal/components/Basic/index.less

@@ -1,16 +1,16 @@
-.vtx-restaurant-rule_item {
-  border-radius: 8px 8px 8px 8px;
-  border: 1px solid var(--gray-line-color);
-  padding: 16px 16px  8px;
-  margin-top: 12px;
-  position: relative;
-  .vtx-restaurant-border {
-    width: 100%;
-    position: absolute;
-    left: 0;
-    top: -2px;
-    height: 44px;
-    border-radius: 8px 8px 0px 0px;
-    border-top: 2px solid var(--blue-color);
-  }
-}
+.vtx-restaurant-rule_item {
+  border-radius: 8px 8px 8px 8px;
+  border: 1px solid var(--gray-line-color);
+  padding: 16px 16px  8px;
+  margin-top: 12px;
+  position: relative;
+  .vtx-restaurant-border {
+    width: 100%;
+    position: absolute;
+    left: 0;
+    top: -2px;
+    height: 44px;
+    border-radius: 8px 8px 0px 0px;
+    border-top: 2px solid var(--blue-color);
+  }
+}

package/lib/vtx-restaurant-modal/config.js

@@ -60,108 +60,108 @@ export var QD_DETAIL_FIELDS = [{
   label: '二维码'
 }];
 export var RestaurantConfigureEnum = {
-  /**
-   * 编号
+  /**
+   * 编号
    */
   CODE: 'code',
-  /**
-   * 产生单位名称
+  /**
+   * 产生单位名称
    */
   NAME: 'name',
-  /**
-   * 店铺名称
+  /**
+   * 店铺名称
    */
   SHORT_NAME: 'shortName',
-  /**
-   * 行政区划名称
+  /**
+   * 行政区划名称
    */
   DIVISION_NAME: 'divisionId',
-  /**
-   * 联系人
+  /**
+   * 联系人
    */
   CONTACT_PERSON: 'contactPerson',
-  /**
-   * 联系方式
+  /**
+   * 联系方式
    */
   CONTACT_PHONE: 'contactPhone',
-  /**
-   * 身份证号
+  /**
+   * 身份证号
    */
   CARD_ID: 'cardId',
-  /**
-   * 商户地址
+  /**
+   * 商户地址
    */
   ADDRESS: 'address',
-  /**
-   * 经纬度
+  /**
+   * 经纬度
    */
   LOCATION: 'location',
-  /**
-   * 产生单位状态
+  /**
+   * 产生单位状态
    */
   SIGNED_STATUS: 'signedStatus',
-  /**
-   * 签约状态
+  /**
+   * 签约状态
    */
   IS_SIGN: 'isSign',
-  /**
-   * 收集类型
+  /**
+   * 收集类型
    */
   COLLECT_STATUS: 'collectStatus',
-  /**
-   * 收集点
+  /**
+   * 收集点
    */
   SY_POINT_NAME: 'syPointId',
-  /**
-   * 商户类型名称
+  /**
+   * 商户类型名称
    */
   CLASSES_NAME: 'classesId',
-  /**
-   * 规模名称
+  /**
+   * 规模名称
    */
   SCALE_NAME: 'scaleId',
-  /**
-   * 垃圾桶个数
+  /**
+   * 垃圾桶个数
    */
   TRASH_CAN_NUM: 'trashCanNum',
-  /**
-   * 统一社会信用代码
+  /**
+   * 统一社会信用代码
    */
   CREDIT_CODE: 'creditCode',
-  /**
-   * 行业名称
+  /**
+   * 行业名称
    */
   INDUSTRY_NAME: 'industryId',
-  /**
-   * 经营范围
+  /**
+   * 经营范围
    */
   BUSINESS_SCOPE: 'businessScope',
-  /**
-   * 注册资金
+  /**
+   * 注册资金
    */
   REGISTER_MONEY: 'registerMoney',
-  /**
-   * 企业成立时间
+  /**
+   * 企业成立时间
    */
   ESTABLISHED_TIME: 'establishedTime',
-  /**
-   * 建议收集时间
+  /**
+   * 建议收集时间
    */
   SUGGEST_COLLECT_TIME: 'suggestCollectTime',
-  /**
-   * 营业时间段
+  /**
+   * 营业时间段
    */
   BUSINESS_TIME: 'businessTime',
-  /**
-   * 垃圾桶摆放位置图片
+  /**
+   * 垃圾桶摆放位置图片
    */
   TRASH_BIN_LOCATION_PHOTO: 'trashBinLocationPhoto',
-  /**
-   * 商户图片
+  /**
+   * 商户图片
    */
   PHOTO_IDS: 'photoIds',
-  /**
-   * 证件图片
+  /**
+   * 证件图片
    */
   PAPER_FILE_IDS: 'paperFileIds'
 };

package/lib/vtx-road-modal/components/BaseInfo/index.less

@@ -1,13 +1,13 @@
-@import "../../../style";
+@import '../../../style/index';
 
 .vtx-road-rule-wrap {
   --bg-color: rgba(236, 240, 245, 0.52);
-  --time-color: #5E6169;
+  --time-color: #5e6169;
   --blue-bg-color: rgba(22, 119, 255, 0.15);
   --green-bg-color: rgba(15, 185, 100, 0.15);
   &.vtx-road-rule-wrap-dark {
-    --bg-color: rgba(11, 88, 142, 0.30);
-    --time-color: #6BA6DE;
+    --bg-color: rgba(11, 88, 142, 0.3);
+    --time-color: #6ba6de;
     --blue-bg-color: rgba(0, 183, 255, 0.1);
     --green-bg-color: rgba(28, 239, 134, 0.15);
   }
@@ -29,37 +29,38 @@
     color: var(--time-color);
     font-size: 12px;
   }
-  &-number, &-unit {
+  &-number,
+  &-unit {
     font-size: 20px;
     font-weight: bold;
     &.blue {
       color: var(--blue-color);
       &.dark {
-        .white_blue()
+        .white_blue();
       }
     }
     &.green {
       color: var(--green-color);
       &.dark {
-        .white_green()
+        .white_green();
       }
     }
     &.purple {
-      color: #B894F9;
+      color: #b894f9;
       &.dark {
-        .white_purple()
+        .white_purple();
       }
     }
     &.orange {
-      color: #FF8746;
+      color: #ff8746;
       &.dark {
-        .white_green()
+        .white_green();
       }
     }
     &.yellow {
-      color: #FFAA00;
+      color: #ffaa00;
       &.dark {
-        .white_yellow()
+        .white_yellow();
       }
     }
   }
@@ -86,20 +87,19 @@
       background: var(--green-bg-color);
     }
     &.purple {
-      color: #B894F9;
-      border-color: #B894F9;
+      color: #b894f9;
+      border-color: #b894f9;
       background: rgba(184, 148, 249, 0.15);
     }
     &.orange {
-      background: rgba(255, 135, 70, 0.10);
-      border-color: #FF8746;
-      color: #FF8746;
-
+      background: rgba(255, 135, 70, 0.1);
+      border-color: #ff8746;
+      color: #ff8746;
     }
     &.yellow {
       background: rgba(255, 170, 0, 0.1);
-      border-color: #FFAA00;
-      color: #FFAA00;
+      border-color: #ffaa00;
+      color: #ffaa00;
     }
   }
 }
@@ -125,12 +125,13 @@
     .left-info-label {
       color: var(--vm-calendar-cell-font-color);
     }
-    .left-info-value,.left-info-unit {
+    .left-info-value,
+    .left-info-unit {
       font-weight: bold;
       color: var(--vm-calendar-cell-font-color);
       font-size: 18px !important;
       &.dark {
-        .white_blue()
+        .white_blue();
       }
     }
     .left-info-unit {
@@ -139,9 +140,10 @@
     }
     &:last-child {
       margin-bottom: 0;
-      .left-info-value,.left-info-unit {
+      .left-info-value,
+      .left-info-unit {
         &.dark {
-          .white_cyan()
+          .white_cyan();
         }
       }
     }
@@ -178,30 +180,31 @@
           color: var(--vm-calendar-cell-font-color);
           font-size: 14px;
           font-weight: 600;
-          .work-rate-value, .work-rate-unit {
+          .work-rate-value,
+          .work-rate-unit {
             &.blue {
               &.dark {
-                .white_blue()
+                .white_blue();
               }
             }
             &.green {
               &.dark {
-                .white_green()
+                .white_green();
               }
             }
             &.purple {
               &.dark {
-                .white_purple()
+                .white_purple();
               }
             }
             &.orange {
               &.dark {
-                .white_green()
+                .white_green();
               }
             }
             &.yellow {
               &.dark {
-                .white_yellow()
+                .white_yellow();
               }
             }
           }

package/lib/vtx-road-modal/components/Statistical/index.less

@@ -1,32 +1,32 @@
-.road-statistic-summary-main-rate {
-  --bg-color: linear-gradient(180deg, #E4EFFF 0%, #F5FBFF 100%);
-  &-dark {
-    --bg-color: linear-gradient(180deg, #1C7CBF 0%, #0B588E 100%);
-  }
-  width: 100%;
-  height: 130px;
-  display: flex;
-  align-items: center;
-  justify-content: space-around;
-  padding: 0 24px;
-  background: var(--bg-color);
-  border-radius: 8px;
-  &--block {
-    width: 8px;
-    height: 8px;
-    border-radius: 50%;
-  }
-  &--label {
-    display: flex;
-    gap: 4px;
-    align-items: center;
-    font-size: 16px;
-    color: var(--img-text-color);
-  }
-  &--value {
-    margin-left: 12px;
-    font-weight: bold;
-    font-size: 24px;
-    color: #1F1F1F;
-  }
-}
+.road-statistic-summary-main-rate {
+  --bg-color: linear-gradient(180deg, #E4EFFF 0%, #F5FBFF 100%);
+  &-dark {
+    --bg-color: linear-gradient(180deg, #1C7CBF 0%, #0B588E 100%);
+  }
+  width: 100%;
+  height: 130px;
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+  padding: 0 24px;
+  background: var(--bg-color);
+  border-radius: 8px;
+  &--block {
+    width: 8px;
+    height: 8px;
+    border-radius: 50%;
+  }
+  &--label {
+    display: flex;
+    gap: 4px;
+    align-items: center;
+    font-size: 16px;
+    color: var(--img-text-color);
+  }
+  &--value {
+    margin-left: 12px;
+    font-weight: bold;
+    font-size: 24px;
+    color: #1F1F1F;
+  }
+}

package/lib/vtx-wr-modal/components/Base/Ptss.js

@@ -191,12 +191,6 @@ export default (function (props) {
             })]
           }), showKeys.includes('womanAccessibilityNums') && /*#__PURE__*/_jsxs("div", {
             children: [/*#__PURE__*/_jsx("span", {
-              style: {
-                color: '#1CE548',
-                fontSize: '24px'
-              },
-              children: "1"
-            }), /*#__PURE__*/_jsx("span", {
               style: {
                 fontSize: '24px'
               },

package/lib/vtx-wr-modal/components/Base/Sjjg.js

@@ -154,14 +154,11 @@ export default (function (props) {
                   }), "\xA0", (_each$unit = each.unit) !== null && _each$unit !== void 0 ? _each$unit : '--']
                 }), /*#__PURE__*/_jsxs("div", {
                   className: "each-factor-value",
+                  title: each.factorName || each.name,
                   children: [/*#__PURE__*/_jsx("img", {
                     src: require("./assets/".concat(theme, "/").concat(getImg(each.factorCode), ".png")),
                     alt: "rll"
-                  }), /*#__PURE__*/_jsx("div", {
-                    className: "each-factor-text",
-                    title: each.factorName || each.name,
-                    children: each.factorName || each.name
-                  })]
+                  }), each.factorName || each.name]
                 })]
               }, each.factorName);
             })

package/lib/vtx-wr-modal/components/Base/index.less

@@ -314,22 +314,17 @@
           font-weight: bold;
         }
         .each-factor-value {
-          flex: 1;
-          display: flex;
-          align-items: center;
+          width: 120px;
+          text-align: center;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
           img {
             width: 16px;
             height: 16px;
             vertical-align: middle;
             margin-right: 4px;
           }
-          .each-factor-text {
-            width: 100px;
-            text-overflow: ellipsis;
-            overflow: hidden;
-            white-space: nowrap;
-            padding-left: 2px;
-          }
         }
       }
     }

package/lib/vtx-wr-modal/components/Build/index.js

@@ -9,6 +9,7 @@ import { getVtxToken, request } from '@vtx/utils';
 import { Button, Space, Tooltip } from 'antd';
 import Base64 from 'base-64';
 import { useEffect, useState } from 'react';
+import { VmEmpty } from "../../../_components";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 var preview = function preview() {
   var item = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
@@ -114,7 +115,7 @@ export default (function (props) {
       children: "\u5EFA\u8BBE\u4FE1\u606F"
     }), /*#__PURE__*/_jsx("div", {
       className: "wr-build-inner",
-      children: list.map(function (item) {
+      children: list.length ? list.map(function (item) {
         return /*#__PURE__*/_jsxs("div", {
           className: "wr-build-panel",
           children: [/*#__PURE__*/_jsxs("div", {
@@ -163,7 +164,7 @@ export default (function (props) {
             }), getFileComponents(item.fileJson)]
           })]
         }, item.id);
-      })
+      }) : /*#__PURE__*/_jsx(VmEmpty, {})
     })]
   });
 });

package/lib/vtx-wr-modal/components/Score/index.js

@@ -15,7 +15,7 @@ import { useSetState } from 'ahooks';
 import dayjs from 'dayjs';
 import { useEffect } from 'react';
 import { TagCloud } from 'react-tagcloud';
-import { VmTable } from "../../../_components";
+import { VmEmpty, VmTable } from "../../../_components";
 import { VMRangePicker } from "../../../_components/vm-filter";
 
 //公厕详情
@@ -38,7 +38,7 @@ export default (function (props) {
     theme = props.theme;
   var _useSetState = useSetState({
       detail: {
-        evaluateLabelCountList: [{}]
+        evaluateLabelCountList: []
       },
       startDate: '',
       endDate: '',
@@ -164,14 +164,14 @@ export default (function (props) {
           })
         }), /*#__PURE__*/_jsx("div", {
           className: "score-text",
-          children: !!data.length && /*#__PURE__*/_jsx(TagCloud, {
+          children: !!data.length ? /*#__PURE__*/_jsx(TagCloud, {
             tags: data,
             minSize: 25,
             maxSize: 50,
             colorOptions: {
               colors: ['red', 'orange', 'yellow', 'green', 'blue', 'purple']
             }
-          })
+          }) : /*#__PURE__*/_jsx(VmEmpty, {})
         })]
       })]
     }), /*#__PURE__*/_jsxs("div", {

package/lib/vtx-wr-modal/index.js

@@ -12,6 +12,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { request } from '@vtx/utils';
 import { useEffect, useState } from 'react';
+import VmCustom from "../_components/vm-custom";
 import VtxBaseModal from "../vtx-base-modal";
 import { Appraise, Base, Build, File, Score } from "./components";
 import "./style";
@@ -54,10 +55,10 @@ export default (function (props) {
         setConfig((res.data.popupConfigJson || []).filter(function (item) {
           return item.display;
         }).map(function (item) {
-          return {
+          return _objectSpread(_objectSpread({}, item), {}, {
             key: item.code,
             title: item.name
-          };
+          });
         }));
       }
     });
@@ -72,6 +73,18 @@ export default (function (props) {
     });
   }, [id]);
   var contentList = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, 'wr-base', /*#__PURE__*/_jsx(Base, _objectSpread({}, props))), 'wr-appraise', /*#__PURE__*/_jsx(Appraise, _objectSpread({}, props))), 'wr-score', /*#__PURE__*/_jsx(Score, _objectSpread({}, props))), 'wr-build', /*#__PURE__*/_jsx(Build, _objectSpread({}, props))), 'wr-file', /*#__PURE__*/_jsx(File, _objectSpread({}, props)));
+
+  // 自定义页签可配置多个，
+  if (config !== null && config !== void 0 && config.length) {
+    config.forEach(function (ele) {
+      if (ele.url) {
+        contentList[ele.key] = /*#__PURE__*/_jsx(VmCustom, {
+          id: id,
+          url: ele === null || ele === void 0 ? void 0 : ele.url
+        });
+      }
+    });
+  }
   return /*#__PURE__*/_jsx(_Fragment, {
     children: visible && /*#__PURE__*/_jsx(VtxBaseModal, {
       type: "wr",