Merge remote-tracking branch 'origin/master'

wayne

2021-11-19 e05f762bc8bd7e93db954a748bf15dd2dcb4b0d9

 PAMapp/plugins/filters/date.filter.ts

@@ -24,12 +24,14 @@
    return compareDate.getFullYear() === today.getFullYear();
  };

  const minutes = date.getMinutes() > 10 ?  date.getMinutes() : `0${date.getMinutes()}`;

  if (isThisYear(date)) {
    return isToday(date)
          ? `今天 ${date.getHours()}:${date.getMinutes()}`
          : `${date.getMonth() + 1}月${date.getDate()}日 ${date.getHours()}:${date.getMinutes()}`;
          ? `今天 ${date.getHours()}:${minutes}`
          : `${date.getMonth() + 1}月${date.getDate()}日 ${date.getHours()}:${minutes}`;
  } else {
    return `${date.getFullYear()}年${date.getMonth() + 1}月${date.getDate()}日 ${date.getHours()}:${date.getMinutes()}`;
    return `${date.getFullYear()}年${date.getMonth() + 1}月${date.getDate()}日 ${date.getHours()}:${minutes}`;
  };

})