iep-ui 1.4.27 → 1.4.28

package/es/multiple-data/main.js

@@ -46,7 +46,8 @@ export default {
     textColor: PropTypes.string,
     chartType: PropTypes.oneOf(['bar', 'line']),
     isInteraction: PropTypes.bool.def(false), // 联动图
-    isExpand: PropTypes.bool.def(false) // 展开图
+    isExpand: PropTypes.bool.def(false), // 展开图
+    newStandard: PropTypes.oneOfType([PropTypes.bool, PropTypes.string]).def(true) // 是否是新标
   },
   data: function data() {
     return {
@@ -151,6 +152,7 @@ export default {
     window.addEventListener('resize', this.handleWindowResize);
     // this.$el.onclick =() => this.params6NameTooltipShow = false;
     this.watchData = this.$watch('chartOptions', function (e) {
+      console.log(2222);
       if (!isEmpty(e.axis) && !isEmpty(e.time) && !isEmpty(e.data)) {
         if (_this2.chart) {
           _this2.chart.clear();
@@ -1029,7 +1031,7 @@ export default {
               color: function color(params) {
                 var v = params.value;
                 var t = params.seriesName;
-                return _this4.ignoreTag.includes(t) || t === 'windDirection' || t === 'weather' ? 'transparent' : _this4.mode === 'air' ? _this4.airToColor(v, t, moment(params.name).format('x')) : _this4.waterToColor(v, t);
+                return _this4.ignoreTag.includes(t) || t === 'windDirection' || t === 'weather' ? 'transparent' : _this4.mode === 'air' ? _this4.airToColor(v, t, _this4.newStandard) : _this4.waterToColor(v, t);
               }
             }
           },
@@ -1327,5 +1329,13 @@ export default {
       },
       [this.isEmpty(this.chartOptions.data) ? this.$slots.empty ? this.$slots.empty : h('empty', { props: emptyProps }) : [buttonsNodes, chartNodes]]
     );
+  },
+
+  watch: {
+    newStandard: {
+      handler: function handler() {
+        this.renderChartView();
+      }
+    }
   }
 };

package/es/pollute-calendar/PolluteCalendar.js

@@ -34,7 +34,8 @@ export default {
     factor: PropTypes.string,
     factorList: PropTypes.array.def([]), // zxw新加 因子列表
     mode: PropTypes.string.def('air'),
-    type: PropTypes.string.def('hour') //默认是小时对应的色值   传 day  是去24小时数据色值
+    type: PropTypes.string.def('hour'), //默认是小时对应的色值   传 day  是去24小时数据色值
+    newStandard: PropTypes.oneOfType([PropTypes.bool, PropTypes.string]).def(true) // 是否是新标
   },
   inject: {
     configProvider: { 'default': function _default() {
@@ -69,12 +70,14 @@ export default {
       var _$props = this.$props,
           year = _$props.year,
           data = _$props.data,
-          factor = _$props.factor;
+          factor = _$props.factor,
+          newStandard = _$props.newStandard;
 
       return {
         year: year,
         data: data,
-        factor: factor
+        factor: factor,
+        newStandard: newStandard
       };
     }
   },
@@ -135,7 +138,8 @@ export default {
       var _$props2 = this.$props,
           factor = _$props2.factor,
           year = _$props2.year,
-          mode = _$props2.mode;
+          mode = _$props2.mode,
+          newStandard = _$props2.newStandard;
 
       var structureData = groupBy(e, function (item) {
         return Moment(item.time).format('M');
@@ -146,7 +150,7 @@ export default {
           monthsData[item[0]] = item[1].map(function (f) {
             if (f.hasOwnProperty('time')) {
               if (parseInt(moment(f.time).format('YYYY')) === year) {
-                return (mode === 'air' ? _this3.formatValueToColor(f[factor], factor, moment(f.time).format('x')) : toolkits.waterLevel.formatWaterValueToColor(f[factor], factor)).replace('#', '');
+                return (mode === 'air' ? _this3.formatValueToColor(f[factor], factor, newStandard) : toolkits.waterLevel.formatWaterValueToColor(f[factor], factor)).replace('#', '');
               } else {
                 return '#8a97a0';
               }
@@ -193,7 +197,8 @@ export default {
         formatData = this.formatData,
         factorLists = this.factorLists;
     var type = $props.type,
-        mode = $props.mode;
+        mode = $props.mode,
+        newStandard = $props.newStandard;
 
     var factor = $props.factor || factorLists[0];
     var getPrefixCls = this.configProvider.getPrefixCls;
@@ -215,8 +220,8 @@ export default {
           {
             'class': prefixCls + '-left-item-cell',
             style: {
-              '--bg-color': timeDiff(e.date) ? mode === 'air' ? toolkits.pollutionFactors.formatValueToColor(formatData[e.timestamp][factor], factor, e.timestamp) : toolkits.waterLevel.formatWaterValueToColor(formatData[e.timestamp][factor], factor) : 'rgba(157, 171, 198, 0.25)',
-              '--text-color': timeDiff(e.date) ? toolkits.pollutionFactors.formatValueToFontColor(formatData[e.timestamp][factor], factor, e.timestamp) : '#8a97a0'
+              '--bg-color': timeDiff(e.date) ? mode === 'air' ? toolkits.pollutionFactors.formatValueToColor(formatData[e.timestamp][factor], factor, newStandard) : toolkits.waterLevel.formatWaterValueToColor(formatData[e.timestamp][factor], factor) : 'rgba(157, 171, 198, 0.25)',
+              '--text-color': timeDiff(e.date) ? toolkits.pollutionFactors.formatValueToFontColor(formatData[e.timestamp][factor], factor, newStandard) : '#8a97a0'
             }
           },
           [e.d]

package/es/toolkits/pollutionFactors.js

@@ -3605,12 +3605,14 @@ export var factorDict = {
 /**
  * 将污染因子值转化为对应颜色
  */
-export var formatValueToColor = function formatValueToColor(v, t, timestamp) {
+export var formatValueToColor = function formatValueToColor(v, t) {
+  var isNew = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+
   if (t === 'windDirection') return '#333';
   if (v == null) return '#8a97a0';
   if (isEmpty(v.toString())) return '#8a97a0';
-  // 在2026-03-01 00:00:00之后的用新的规则
-  if (timestamp && timestamp >= 1772294400000 || !timestamp) {
+  // 新规则
+  if (isNew === true || isNew === 'true' || isNew === undefined) {
     if (t === 'pm25') {
       t = 'pm25-new';
     }
@@ -3639,10 +3641,10 @@ export var formatValueToColor = function formatValueToColor(v, t, timestamp) {
 /**
  * 将污染因子值背景转化为对应字体的颜色
  */
-export var formatValueToFontColor = function formatValueToFontColor(v, t, timestamp) {
+export var formatValueToFontColor = function formatValueToFontColor(v, t, isNew) {
   var colorForFont = factorDict.colorForFont;
 
-  return colorForFont[formatValueToColor(v, t.toLowerCase(), timestamp)];
+  return colorForFont[formatValueToColor(v, t.toLowerCase(), isNew)];
 };
 
 /**

package/lib/multiple-data/main.js

@@ -93,7 +93,8 @@ exports['default'] = {
     textColor: _vueTypes2['default'].string,
     chartType: _vueTypes2['default'].oneOf(['bar', 'line']),
     isInteraction: _vueTypes2['default'].bool.def(false), // 联动图
-    isExpand: _vueTypes2['default'].bool.def(false) // 展开图
+    isExpand: _vueTypes2['default'].bool.def(false), // 展开图
+    newStandard: _vueTypes2['default'].oneOfType([_vueTypes2['default'].bool, _vueTypes2['default'].string]).def(true) // 是否是新标
   },
   data: function data() {
     return {
@@ -198,6 +199,7 @@ exports['default'] = {
     window.addEventListener('resize', this.handleWindowResize);
     // this.$el.onclick =() => this.params6NameTooltipShow = false;
     this.watchData = this.$watch('chartOptions', function (e) {
+      console.log(2222);
       if (!(0, _isEmpty2['default'])(e.axis) && !(0, _isEmpty2['default'])(e.time) && !(0, _isEmpty2['default'])(e.data)) {
         if (_this2.chart) {
           _this2.chart.clear();
@@ -1076,7 +1078,7 @@ exports['default'] = {
               color: function color(params) {
                 var v = params.value;
                 var t = params.seriesName;
-                return _this4.ignoreTag.includes(t) || t === 'windDirection' || t === 'weather' ? 'transparent' : _this4.mode === 'air' ? _this4.airToColor(v, t, (0, _moment2['default'])(params.name).format('x')) : _this4.waterToColor(v, t);
+                return _this4.ignoreTag.includes(t) || t === 'windDirection' || t === 'weather' ? 'transparent' : _this4.mode === 'air' ? _this4.airToColor(v, t, _this4.newStandard) : _this4.waterToColor(v, t);
               }
             }
           },
@@ -1374,5 +1376,13 @@ exports['default'] = {
       },
       [this.isEmpty(this.chartOptions.data) ? this.$slots.empty ? this.$slots.empty : h('empty', { props: emptyProps }) : [buttonsNodes, chartNodes]]
     );
+  },
+
+  watch: {
+    newStandard: {
+      handler: function handler() {
+        this.renderChartView();
+      }
+    }
   }
 };

package/lib/pollute-calendar/PolluteCalendar.js

@@ -65,7 +65,8 @@ exports['default'] = {
     factor: _vueTypes2['default'].string,
     factorList: _vueTypes2['default'].array.def([]), // zxw新加 因子列表
     mode: _vueTypes2['default'].string.def('air'),
-    type: _vueTypes2['default'].string.def('hour') //默认是小时对应的色值   传 day  是去24小时数据色值
+    type: _vueTypes2['default'].string.def('hour'), //默认是小时对应的色值   传 day  是去24小时数据色值
+    newStandard: _vueTypes2['default'].oneOfType([_vueTypes2['default'].bool, _vueTypes2['default'].string]).def(true) // 是否是新标
   },
   inject: {
     configProvider: { 'default': function _default() {
@@ -100,12 +101,14 @@ exports['default'] = {
       var _$props = this.$props,
           year = _$props.year,
           data = _$props.data,
-          factor = _$props.factor;
+          factor = _$props.factor,
+          newStandard = _$props.newStandard;
 
       return {
         year: year,
         data: data,
-        factor: factor
+        factor: factor,
+        newStandard: newStandard
       };
     }
   },
@@ -166,7 +169,8 @@ exports['default'] = {
       var _$props2 = this.$props,
           factor = _$props2.factor,
           year = _$props2.year,
-          mode = _$props2.mode;
+          mode = _$props2.mode,
+          newStandard = _$props2.newStandard;
 
       var structureData = (0, _lodash.groupBy)(e, function (item) {
         return (0, _moment2['default'])(item.time).format('M');
@@ -177,7 +181,7 @@ exports['default'] = {
           monthsData[item[0]] = item[1].map(function (f) {
             if (f.hasOwnProperty('time')) {
               if (parseInt(moment(f.time).format('YYYY')) === year) {
-                return (mode === 'air' ? _this3.formatValueToColor(f[factor], factor, moment(f.time).format('x')) : _toolkits2['default'].waterLevel.formatWaterValueToColor(f[factor], factor)).replace('#', '');
+                return (mode === 'air' ? _this3.formatValueToColor(f[factor], factor, newStandard) : _toolkits2['default'].waterLevel.formatWaterValueToColor(f[factor], factor)).replace('#', '');
               } else {
                 return '#8a97a0';
               }
@@ -224,7 +228,8 @@ exports['default'] = {
         formatData = this.formatData,
         factorLists = this.factorLists;
     var type = $props.type,
-        mode = $props.mode;
+        mode = $props.mode,
+        newStandard = $props.newStandard;
 
     var factor = $props.factor || factorLists[0];
     var getPrefixCls = this.configProvider.getPrefixCls;
@@ -246,8 +251,8 @@ exports['default'] = {
           {
             'class': prefixCls + '-left-item-cell',
             style: {
-              '--bg-color': timeDiff(e.date) ? mode === 'air' ? _toolkits2['default'].pollutionFactors.formatValueToColor(formatData[e.timestamp][factor], factor, e.timestamp) : _toolkits2['default'].waterLevel.formatWaterValueToColor(formatData[e.timestamp][factor], factor) : 'rgba(157, 171, 198, 0.25)',
-              '--text-color': timeDiff(e.date) ? _toolkits2['default'].pollutionFactors.formatValueToFontColor(formatData[e.timestamp][factor], factor, e.timestamp) : '#8a97a0'
+              '--bg-color': timeDiff(e.date) ? mode === 'air' ? _toolkits2['default'].pollutionFactors.formatValueToColor(formatData[e.timestamp][factor], factor, newStandard) : _toolkits2['default'].waterLevel.formatWaterValueToColor(formatData[e.timestamp][factor], factor) : 'rgba(157, 171, 198, 0.25)',
+              '--text-color': timeDiff(e.date) ? _toolkits2['default'].pollutionFactors.formatValueToFontColor(formatData[e.timestamp][factor], factor, newStandard) : '#8a97a0'
             }
           },
           [e.d]

package/lib/toolkits/pollutionFactors.js

@@ -3619,12 +3619,14 @@ var factorDict = exports.factorDict = {
 /**
  * 将污染因子值转化为对应颜色
  */
-var formatValueToColor = exports.formatValueToColor = function formatValueToColor(v, t, timestamp) {
+var formatValueToColor = exports.formatValueToColor = function formatValueToColor(v, t) {
+  var isNew = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+
   if (t === 'windDirection') return '#333';
   if (v == null) return '#8a97a0';
   if ((0, _lodash.isEmpty)(v.toString())) return '#8a97a0';
-  // 在2026-03-01 00:00:00之后的用新的规则
-  if (timestamp && timestamp >= 1772294400000 || !timestamp) {
+  // 新规则
+  if (isNew === true || isNew === 'true' || isNew === undefined) {
     if (t === 'pm25') {
       t = 'pm25-new';
     }
@@ -3653,10 +3655,10 @@ var formatValueToColor = exports.formatValueToColor = function formatValueToColo
 /**
  * 将污染因子值背景转化为对应字体的颜色
  */
-var formatValueToFontColor = exports.formatValueToFontColor = function formatValueToFontColor(v, t, timestamp) {
+var formatValueToFontColor = exports.formatValueToFontColor = function formatValueToFontColor(v, t, isNew) {
   var colorForFont = factorDict.colorForFont;
 
-  return colorForFont[formatValueToColor(v, t.toLowerCase(), timestamp)];
+  return colorForFont[formatValueToColor(v, t.toLowerCase(), isNew)];
 };
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iep-ui",
-  "version": "1.4.27",
+  "version": "1.4.28",
   "title": "Iep UI",
   "description": "An enterprise-class UI design language and Vue-based implementation",
   "keywords": [