@vtx/modals2 6.0.0-beta.12 → 6.0.0-beta.14

package/lib/_util/iconSvgHtml.js

@@ -810,7 +810,9 @@ export function ContractIcon(props) {
     children: /*#__PURE__*/_jsx("path", {
       d: "M4.82316875,12.941502C4.30343485,12.951171,3.87399985,12.538216,3.86333515,12.018501C3.86333515,11.507168,4.29233505,11.093334,4.82316875,11.093334L16.32600175,11.093334C16.85466975,11.093334,17.28366875,11.507168,17.28366875,12.0185C17.27300075,12.537355,16.84489675,12.949962,16.32600175,12.941501L4.82100295,12.941501L4.82316875,12.941502ZM4.82316875,8.3200006C4.30260515,8.3296623,3.87282085,7.915401,3.86333515,7.394834C3.86333515,6.8856673,4.29233505,6.4718337,4.82316875,6.4718337L18.24133675,6.4718337C18.77216875,6.4718337,19.20116975,6.8835006,19.20116975,7.394834C19.19168275,7.9154,18.76189975,8.3296623,18.24133675,8.3200006L4.82316875,8.3200006ZM13.73033475,17.833834C13.97585775,17.59341,14.32923875,17.498903,14.66200175,17.584667C14.99783475,17.669167,15.26000175,17.920502,15.34666775,18.245501C15.43323675,18.569584,15.33313175,18.914951,15.08666775,19.142502L12.19200275,21.928835C11.76270275,22.338182,11.07093575,22.274923,10.72300275,21.7945L9.44033625,19.983168L7.41450215,21.917999C6.98227885,22.328838,6.28631685,22.26129,5.94116875,21.775L4.67366885,19.939833L2.62400225,21.915833C2.44210675,22.090031,2.19985845,22.187086,1.94800225,22.186666C1.11383545,22.186666,0.48983544,21.820499,0.20816877,21.140165C0.043502118,20.739332,0.021835437,20.442499,0.02833543811,19.645164L0.02833543811,2.7733335C0.0305018902,1.2415001,1.31966855,0,2.90783525,0L20.16100075,0C21.74916875,0,23.03616875,1.2415001,23.03616875,2.7733335L23.03616875,12.0185C23.02549975,12.537354,22.59739675,12.949961,22.07850275,12.941501C21.55960875,12.949961,21.13150375,12.537354,21.12083475,12.0185L21.12083475,2.7733335C21.11134875,2.2527671,20.68156475,1.8385054,20.16100075,1.8481669L2.90566845,1.8481669C2.38594485,1.8397157,1.95749245,2.2536278,1.94800185,2.7733335L1.94800185,19.955002L4.14500185,17.836002C4.57680945,17.422989,5.27462105,17.489595,5.62050195,17.976837L6.89016815,19.816338L8.90733525,17.888004C9.33641915,17.480339,10.02626995,17.543514,10.37416875,18.022337L11.65466875,19.831503L13.73033475,17.836004L13.73033475,17.833834ZM24.03066875,15.186168L25.40866675,16.471001C26.16931175,17.167906,26.19105375,18.359816,25.45633275,19.084L19.13616575,25.428001C18.68347375,25.87487,18.04213675,26.074379,17.41583475,25.963167L15.02383375,25.542833L14.50383375,23.252668C14.36925875,22.645517,14.55673775,22.011854,14.99999975,21.575668L21.31800075,15.231668C21.67673675,14.876896,22.15901375,14.674976,22.66350175,14.668334C23.16797475,14.657775,23.65702075,14.842526,24.02850175,15.184001L24.03066875,15.186168ZM17.75816875,24.143167L24.07616775,17.799168L22.69816775,16.514334L16.37800175,22.860502L16.62500175,23.943836L17.75816875,24.143167ZM0.98816973,24.034836L9.61583615,24.034836C10.14450275,24.034836,10.57350375,24.448668,10.57350375,24.960001C10.56401275,25.479708,10.13555975,25.89362,9.61583615,25.885168L0.98816848,25.885168C0.46844533,25.89362,0.039992822,25.479708,0.0305018146,24.960001C0.0305018146,24.448668,0.4595018,24.034836,0.98816973,24.034836Z",
       fillOpacity: "1",
-      style: "mix-blend-mode:passthrough"
+      style: {
+        'mixBlendMode': 'passthrough'
+      }
     })
   }));
 }
@@ -855,7 +857,9 @@ export function PointIcon(props) {
     }), /*#__PURE__*/_jsx("path", {
       d: "M15.363120125,5.8500242687499995C14.742929425,5.20358991875,13.885618225,4.83851003647,12.989787125,4.8393573760986C12.146656525000001,4.83840680122,11.338169125,5.17471646875,10.744452955,5.77335762875C10.144453045,6.37335776875,9.814453125,7.17202426875,9.814453125,8.02002426875C9.814453125,8.33077666875,10.066367625,8.58269116875,10.377119545,8.58269116875C10.687871935,8.58269116875,10.939786425,8.33077666875,10.939786425,8.02002426875C10.941246525,6.88695286875,11.858054124999999,5.96805976875,12.991119825,5.96402426875L12.995786625000001,5.96402426875C13.582453725,5.96402426875,14.147786125,6.2046909687500005,14.545786825,6.62535766875C14.899120325,6.99669076875,15.079119725,7.46869086875,15.052453025,7.958024468750001C15.030452725,8.373357768750001,15.009786625,8.76535796875,13.807119325,9.968691368750001C13.083786025,10.692024668750001,12.429119125,11.412691568749999,12.341119325000001,12.29402496875C12.311284024999999,12.60308506875,12.536863825000001,12.87813186875,12.845786125,12.90935896875C12.864452825,12.91069216875,12.883786225,12.91269106875,12.902452925,12.91269106875C13.191775325,12.91234586875,13.433677625,12.69264456875,13.461786225,12.40469126875C13.507119225,11.944024568749999,13.931786525,11.43602416875,14.601786624999999,10.76535746875C15.999119725,9.36869096875,16.138453525,8.72202446875,16.175120325,8.02002386875C16.221119925,7.21735716875,15.931787525,6.44669056875,15.363120125,5.8500242687499995ZM12.214453725,14.48135756875C12.202481725,14.86245546875,12.508168225,15.17789446875,12.889453925,15.17789446875C13.270739525,15.17789446875,13.576426525,14.86245546875,13.564454125000001,14.48135756875C13.552996625,14.11682126875,13.254170425,13.82723806875,12.889453925,13.82723806875C12.524737325,13.82723806875,12.225911625,14.11681936875,12.214453725,14.48135756875Z",
       fillOpacity: "1",
-      style: "mix-blend-mode:passthrough"
+      style: {
+        'mixBlendMode': 'passthrough'
+      }
     })]
   }));
 }
@@ -875,7 +879,9 @@ export function CollectionIcon(props) {
     children: /*#__PURE__*/_jsx("path", {
       d: "M8.5979662,7.4920964C8.5979662,7.0073862,8.2177906,6.6078672,7.7336779,6.5838313L5.7543974,6.5838313C4.1351061,6.5714412,2.5988955,7.2995858,1.5833125,8.5608745C0.55927664,9.8209248,0,11.5893574,0,13.648614L0,19.946068C0,20.449417,0.44015074,20.825811,0.93958473,20.825811L2.99213,20.825811C3.3836236,22.193243,4.6621299,23.2307,6.1738548,23.2307C7.6855798,23.2307,8.9618492,22.192684,9.3555794,20.825811L16.46175,20.825811C16.858276,22.193243,18.131748,23.2307,19.643475,23.2307C21.155201,23.2307,22.433704,22.192684,22.827995,20.825811L25.116556,20.825811C25.609859,20.838156,26.015345,20.43951,26.011396,19.946068L26.011396,5.6515172C26.006363,3.6610515,24.399561,2,22.408537,2L13.925989,2C11.937761,2,10.290691,3.6610515,10.290691,5.6515172L10.294922,6.5837402L5.7543974,6.5838313C5.5628862,6.5837965,5.5628972,8.400373,5.7543974,8.400362000000001L10.294922,8.4003906L10.295165,19.008722L9.353343,19.008722C8.9417601,17.591361,7.6475,16.613101,6.171618,16.603832C4.661571,16.603832,3.3836238,17.641289999999998,2.9893339,19.008722L1.8120563,19.008722L1.8120563,13.648614C1.8120563,10.4691267,3.378031,8.400362000000001,5.7543974,8.400362000000001C6.4020724,8.2848897,8.5979662,8.342354799999999,8.5979662,7.4920964ZM6.1716175,21.451082C5.3401318,21.45232,4.6651917,20.779051,4.6643672,19.947563C4.6635427,19.116077,5.3371463,18.441471,6.1686335,18.441057C7.0001211,18.440647,7.6743937,19.114584,7.6743937,19.94607C7.6743946,20.776392,7.0019398,21.449848,6.1716175,21.451082ZM19.639,21.451082C18.809416,21.447067,18.140017,20.771578,18.143515,19.941992C18.147013,19.112406,18.822086,18.442583,19.651674,18.44556C20.48126,18.44854,21.151505,19.123192,21.149046,19.95278C21.146584,20.78384,20.470053,21.455109,19.639,21.451082ZM24.193188,19.008722L22.823521,19.008722C22.411322,17.590593,21.115793,16.612235,19.639,16.603832C18.128952,16.603832,16.853243,17.641289999999998,16.457273,19.008722L12.109457,19.008722L12.109457,5.6515172C12.109457,4.6548862,12.933831,3.8142934,13.928224,3.8142934L22.410772,3.8142934C23.407404,3.8142934,24.193188,4.6532083,24.193188,5.6515172L24.193188,19.008722Z",
       fillOpacity: "1",
-      style: "mix-blend-mode:passthrough"
+      style: {
+        'mixBlendMode': 'passthrough'
+      }
     })
   }));
 }
@@ -895,7 +901,9 @@ export function FactoryIcon(props) {
     children: /*#__PURE__*/_jsx("path", {
       d: "M8.6463909,0C9.3159323,0.0000090988951,9.8816862,0.49643576,9.9687262,1.1602947L12.95215,23.832714C13.056844,24.631304,12.43522,25.339764,11.629816,25.339766L1.3338681,25.339766C0.52845418,25.339756,-0.093172394,24.631294,0.011532409,23.832716L2.9949565,1.1602957C3.0820065,0.49642721,3.6477618,0,4.3172917,0L8.6463909,0ZM21.286932,12.003047C21.868433,12.002933,22.382977,12.379599,22.55859,12.933949L25.936781,23.603323C26.209028,24.462711,25.567934,25.339037,24.666456,25.339766L16.317673,25.339766C15.646761,25.339874,15.080209,24.841572,14.99467,24.176138L13.622321,13.506763C13.519822,12.709434,14.140766,12.003317,14.944657,12.003047L21.286932,12.003047ZM8.0609093,2.0005076L4.9021072,2.0005076L2.0940607,23.339258L10.868956,23.339258L8.0609093,2.0005076ZM20.798141,14.003554L15.702183,14.003554L16.902485,23.339258L23.754225,23.339258L20.798141,14.003554ZM17.449961,6.6683583L16.484381,10.669375L14.483873,10.669375L15.44945,6.6683598L17.449961,6.6683583ZM21.450975,6.6683583L20.485395,10.669375L18.484888,10.669375L19.450468,6.6683598L21.450975,6.6683583Z",
       fillOpacity: "1",
-      style: "mix-blend-mode:passthrough"
+      style: {
+        'mixBlendMode': 'passthrough'
+      }
     })
   }));
 }
@@ -915,7 +923,9 @@ export function AssetIcon(props) {
     children: /*#__PURE__*/_jsx("path", {
       d: "M24.998001,1C25.550287,1,25.998003,1.44771549,25.998001,2L26.000002,11C26.000002,11.552285,25.552284,12.000002,25,12L1,12C0.44771549,12.000002,2.9343826e-7,11.552285,0,11L0,2C-0.000001173753,1.44849515,0.44649625,1.0011030345,0.99799997,1L24.998001,1ZM23.998001,3L1.998,3L2,10L24,10L24,3L23.998001,3ZM10.998,5.5L10.998,7.5000005L4.9980001,7.5000005L4.9980001,5.5L10.998,5.5ZM25,14.000001C25.552284,14.000001,26.000002,14.447716,26.000002,15.000001L26.000002,24C26.000002,24.552286,25.552284,25.000004,25,25L1,25C0.44771579,25.000004,2.9343826e-7,24.552286,0,24L0,15.000001C2.9343826e-7,14.447716,0.44771519,14.000001,1,14.000001L25,14.000001ZM24,16.000000999999997L2,16.000000999999997L2,23L24,23L24,16.000000999999997ZM11,18.5L11,20.5L4.9980001,20.5L4.9980001,18.5L10.998,18.5L11,18.5Z",
       fillOpacity: "1",
-      style: "mix-blend-mode:passthrough"
+      style: {
+        'mixBlendMode': 'passthrough'
+      }
     })
   }));
 }

package/lib/vtx-restaurant-modal/components/DetailInfo/index.js

@@ -33,6 +33,7 @@ var DetailInfo = function DetailInfo() {
       return item.dataKey !== 'location';
     }).map(function (item) {
       var formItem = getFormItem(item, info);
+      if (!formItem) return null;
       if (item.dataKey === RestaurantConfigureEnum.DIVISION_NAME) {
         formItem.isAddress = false;
       }
@@ -58,6 +59,8 @@ var DetailInfo = function DetailInfo() {
           });
         }
       } : {});
+    }).filter(function (item) {
+      return !!item;
     });
   };
   var _ref = info !== null && info !== void 0 && (_info$location = info.location) !== null && _info$location !== void 0 && _info$location.lngLats ? info.location.lngLats.split(',') : [],

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

@@ -163,7 +163,11 @@ export var RestaurantConfigureEnum = {
   /**
    * 证件图片
    */
-  PAPER_FILE_IDS: 'paperFileIds'
+  PAPER_FILE_IDS: 'paperFileIds',
+  /**
+   * 排序号
+   */
+  ORDER_INDEX: 'orderIndex'
 };
 export var getFormItem = function getFormItem(item, data) {
   var _formItemMap;
@@ -192,7 +196,8 @@ export var getFormItem = function getFormItem(item, data) {
     businessTime = data.businessTime,
     trashBinLocationPhoto = data.trashBinLocationPhoto,
     signedStatusValue = data.signedStatusValue,
-    suggestCollectTime = data.suggestCollectTime;
+    suggestCollectTime = data.suggestCollectTime,
+    orderIndex = data.orderIndex;
   var dataKey = item.dataKey;
   var formItemMap = (_formItemMap = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_formItemMap, RestaurantConfigureEnum.CODE, {
     label: "t('vtxrestaurantmodal.unit')",
@@ -256,7 +261,7 @@ export var getFormItem = function getFormItem(item, data) {
   }), RestaurantConfigureEnum.REGISTER_MONEY, {
     label: "t('vtxrestaurantmodal.registerMoney')",
     value: registerMoney
-  }), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_formItemMap, RestaurantConfigureEnum.ESTABLISHED_TIME, {
+  }), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_formItemMap, RestaurantConfigureEnum.ESTABLISHED_TIME, {
     label: "t('vtxrestaurantmodal.enterpriseHours')",
     value: establishedTime
   }), RestaurantConfigureEnum.SUGGEST_COLLECT_TIME, {
@@ -277,6 +282,9 @@ export var getFormItem = function getFormItem(item, data) {
     label: "t('vtxrestaurantmodal.image2')",
     value: paperFileIds,
     type: 'img'
+  }), RestaurantConfigureEnum.ORDER_INDEX, {
+    label: '排序号',
+    value: orderIndex
   }));
   return formItemMap[dataKey];
 };

package/lib/vtx-shxq-modal/api.js

@@ -201,14 +201,14 @@ var ThrowService = {
       loading: loading
     };
   },
-  usePage: function usePage(id, startTime, endTime, page, size, source) {
+  usePage: function usePage(id, startTime, endTime, page, size, source, sort) {
     var _useRequest8 = useRequest(function () {
         return request.get('/cloud/ljfljc/api/v101/trow/record/detail/page', {
-          data: _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, source === 'tfd' ? 'throwPointId' : 'subjectId', id), "startTime", startTime), "endTime", endTime), "desensitization", true), "page", page), "size", size)
+          data: _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, source === 'tfd' ? 'throwPointId' : 'subjectId', id), "startTime", startTime), "endTime", endTime), "desensitization", true), "page", page), "size", size), "sort", sort)
         });
       }, {
         ready: !!id,
-        refreshDeps: [id, startTime, endTime, page, size]
+        refreshDeps: [id, startTime, endTime, page, size, source, sort]
       }),
       pageRes = _useRequest8.data,
       loading = _useRequest8.loading;

package/lib/vtx-shxq-modal/components/ThrowRecord/List.js

@@ -31,19 +31,21 @@ var ListZymx = function ListZymx(props) {
         current: 1,
         pageSize: 10,
         total: 0
-      }
+      },
+      sort: ''
     }),
     _useSetState2 = _slicedToArray(_useSetState, 2),
     state = _useSetState2[0],
     setState = _useSetState2[1];
-  var pagination = state.pagination;
+  var pagination = state.pagination,
+    sort = state.sort;
   var _ThrowService$useThro = ThrowService.useThrowConfig(),
     configObj = _ThrowService$useThro.configObj;
   var weightFlag = JSON.parse(((_configObj$THROW_WEIG = configObj['THROW_WEIGHT']) === null || _configObj$THROW_WEIG === void 0 ? void 0 : _configObj$THROW_WEIG.configValue) || '[]');
   var qualityFlag = JSON.parse(((_configObj$THROW_QUAL = configObj['THROW_QUALITY']) === null || _configObj$THROW_QUAL === void 0 ? void 0 : _configObj$THROW_QUAL.configValue) || '[]');
   var integralFlag = JSON.parse(((_configObj$INTEGRAL_I = configObj['INTEGRAL_INFO']) === null || _configObj$INTEGRAL_I === void 0 ? void 0 : _configObj$INTEGRAL_I.configValue) || '[]');
   var subjectFlag = (_configObj$THROW_SUBJ = configObj['THROW_SUBJECT_DIMENSION']) === null || _configObj$THROW_SUBJ === void 0 ? void 0 : _configObj$THROW_SUBJ.configValue;
-  var _ThrowService$usePage = ThrowService.usePage(id, startTime, endTime, pagination.current - 1, pagination.pageSize, source),
+  var _ThrowService$usePage = ThrowService.usePage(id, startTime, endTime, pagination.current - 1, pagination.pageSize, source, sort),
     data = _ThrowService$usePage.data,
     loading = _ThrowService$usePage.loading;
   var columns = [].concat(_toConsumableArray(subjectFlag === 'THROW_RESIDENT' ? [{
@@ -77,7 +79,8 @@ var ListZymx = function ListZymx(props) {
     title: translateLocaleText("t('vtxshxqmodal.weightKg')"),
     dataIndex: 'weight',
     key: 'weight',
-    width: 120
+    width: 120,
+    align: 'right'
   }, qualityFlag && {
     title: translateLocaleText("t('vtxsdydtfdmodal.classificationQuality')"),
     dataIndex: 'evaluation',
@@ -103,7 +106,8 @@ var ListZymx = function ListZymx(props) {
     title: translateLocaleText("t('vtxshxqmodal.hours4')"),
     dataIndex: 'time',
     key: 'time',
-    width: 120
+    width: 120,
+    sorter: true
   }]);
   var pageChange = function pageChange(page) {
     setState({
@@ -112,6 +116,14 @@ var ListZymx = function ListZymx(props) {
       })
     });
   };
+  var handleTableChange = function handleTableChange(sorter) {
+    setState({
+      pagination: _objectSpread(_objectSpread({}, pagination), {}, {
+        current: 1
+      }),
+      sort: sorter !== null && sorter !== void 0 && sorter.order ? "".concat(sorter.field, ",").concat(sorter.order === 'ascend' ? 'asc' : 'desc') : ''
+    });
+  };
   var tableProps = {
     height: '100%',
     isIndex: false,
@@ -121,7 +133,8 @@ var ListZymx = function ListZymx(props) {
       total: (data === null || data === void 0 ? void 0 : data.total) || 0,
       defaultPageSize: 20,
       onChange: pageChange
-    })
+    }),
+    handleTableChange: handleTableChange
   };
   return /*#__PURE__*/_jsx("div", {
     className: "shxq-thr-table",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtx/modals2",
-  "version": "6.0.0-beta.12",
+  "version": "6.0.0-beta.14",
   "description": "弹窗组件",
   "license": "MIT",
   "module": "lib/index.js",