@aleen42/calendar 1.0.0-beta.4 → 1.0.0

package/dist/calendar.css

@@ -1958,7 +1958,7 @@ body p {
   height: 100%;
   table-layout: fixed;
 }
-.m-cal-month .content-wrapper .aside-content > ul > li table td {
+.m-cal-month .content-wrapper .aside-content > ul > li table td:not(.ico) {
   padding-left: 4px;
   overflow: hidden;
   word-wrap: normal;

package/dist/calendar.js

@@ -6287,16 +6287,13 @@ const fmtDate = formatter(DIGI_DATE);
 (__webpack_require__(9363)/* .config */ .$)(language, DIGI_DATE, fmtDate);
 
 // moment adaptors
-const parse = (t, pattern) => (t = moment(t, pattern, /* strict: */true)).isValid() && t;
+const strictDate = t => (t = moment(t, DIGI_DATE, true)).isValid() && t;
 
 /** @return {import('moment').Moment} */// 在英文 locale 下兼容 MM/DD/YYYY 格式的 moment 构造
 const mm = /** number[] | string | Date | Moment? */ t => strictDate(t) || moment(t);
 
 // 严格的 YYYY-MM-DD 或 MM/DD/YYYY (在英文 locale 下) 日期
-const strictDate = mm.date = _.fn(parse, _, DIGI_DATE);
-
-// 自动适配输入时间 (HH:MM => Ah:MM => H => HH => Hmm => HHmm) 的 moment 构造 (TODO: 当没有命中前两种情形时, 提取数字生成的很可能是错误的时间).
-mm.time = t => parse((t = t.trim()), HHMM) || parse(t, AhMM) || parse((t = t.replace(/\D/g, '')), t.length > 2 ? 'Hmm' : 'H');
+mm.date = strictDate;
 
 const now = new Date();
 const date = d => formatter(`D${/[zjka]/.test(language) ? 'o' : 'D'}`)(d).replace(/^0/, '');
@@ -6307,7 +6304,8 @@ _.assign(module.exports = formatter, /** @lends module.exports */ {
     setDefaultTZ,
 
     // common date formats
-
+    HHMM,
+    AhMM,
     // iso date:                                        || 2022-05-25
     i : formatter(ISO_DATE, /* no locale */ 0),
     // iso date & time:                                 || 2022-05-25 13:00:00
@@ -7939,8 +7937,8 @@ module.exports = (target, methodName, after/* (result) */, before/* (...argument
     const prev = target[methodName];
     target[methodName] = function () {
         const self = this;
-        const args = before && before.apply(self, arguments);
-        const result = prev && prev.apply(self, Array.isArray(args) ? args : arguments), hookResult = after && after.call(self, result);
+        before && before.apply(self, arguments);
+        const result = prev && prev.apply(self, arguments), hookResult = after && after.call(self, result);
         return hookResult !== undefined ? hookResult : result;
     };
 }
@@ -10839,15 +10837,15 @@ function Email(name, address) {
  * @return {function(String | Email): Email}
  */
 const parser = loose => email => {
-    const [list, errorKey] = email instanceof Email ? [[email]] : parseAddressList(email, '', !loose)
-    return loose ? list[0] || Email()
+    const [list, errorKey] = email instanceof Email ? [[email]] : parseAddressList(email)
+    return loose ? list[0] || Object.assign(Email(), {rawInput : `${email}`})
         : !errorKey && list[0] && !list[1] && validateAddress(list[0].address || '') ? list[0]
             : undefined;
 };
 
 /**
  * 用于替代旧版的 `new Email(address)` 方法, 如果有多个地址, 只返回第一个, 如果一个地址都没有, 返回空地址
- * @param {String | Email} [email]
+ * @param {String | Email} email
  * @return {Email}
  */
 const of = parser(/* loose= */1);
@@ -10882,13 +10880,13 @@ Object.assign(Email, {
 
 
     /**
-     * @param {String | Email} [email]
+     * @param {String | Email} email
      * @return {boolean}
      */
     test : email => !!forStrict(email),
 
     /**
-     * @param {String | Email} [email]
+     * @param {String | Email} email
      * @return {Email | undefined}
      */
     strict : forStrict,
@@ -10909,13 +10907,12 @@ function validateAddress(address) {
 // -------
 
 /**
- * @param {string} [addressList]
+ * @param {string} addressList
  * @param {string} [separators] - external separators besides "," and ";"
- * @param {boolean | number} [stopOnError]
  * @return {[Email[], String]} [array of {@link Email}, errorKey]
  * @see 实现参考 java 源码: com.tebie.cmapp.ajxvr.lib.FlexAddressParser
  */
-function parseAddressList(addressList, separators = '', stopOnError) {
+function parseAddressList(addressList, separators = '') {
     // 避免传入非字符串类型引发死循环
     addressList = addressList != null ? `${addressList}` : '';
 
@@ -10927,6 +10924,9 @@ function parseAddressList(addressList, separators = '', stopOnError) {
     const TOKEN_RAW_NAME = 6; // foo
     const TOKEN_RAW_ADDR = 7; // foo@bar
 
+    // 控制参数
+    let stopOnError = true;
+
     // 运行时变量
     let token = TOKEN_BLANKS;
     let tokenStart = 0; // inclusive
@@ -10951,7 +10951,9 @@ function parseAddressList(addressList, separators = '', stopOnError) {
     function nextElement() {
         let name;
         let addr;
+        let rawTokenEnd;
 
+        const rawTokenStart = tokenStart;
         const nameIsRaw = token === TOKEN_RAW_NAME;
         if (nameIsRaw || token === TOKEN_QUOTED_NAME) {
             let nameStart = tokenStart, nameEnd = tokenEnd;
@@ -10966,25 +10968,25 @@ function parseAddressList(addressList, separators = '', stopOnError) {
                     break;
                 }
             }
-            name = addressList.slice(nameStart, nameEnd);
+            name = addressList.slice(nameStart, rawTokenEnd = nameEnd);
         }
 
         if (token === TOKEN_TAGGED_ADDR || (name == null && token === TOKEN_RAW_ADDR)) {
-            addr = addressList.slice(tokenStart, tokenEnd);
+            addr = addressList.slice(tokenStart, rawTokenEnd = tokenEnd);
             token = nextToken();
         }
 
         // the raw text should be treated as an address #CM-32730 !1631
-        return nameIsRaw && !addr ? Email(void 0, name) : Email(
-            unquote(name, /^"(.*?)"?$/), // unquote name
-            unquote(addr, /^<(.*?)>?$/), // unquote addr
-        );
+        return Object.assign(nameIsRaw && !addr ? Email(void 0, name) : Email(
+            unquote(name, '"', '"'), // unquote name
+            unquote(addr, '<', '>'), // unquote addr
+        ), {rawInput : addressList.slice(rawTokenStart, rawTokenEnd)});
     }
 
-    function unquote(s, regex) {
-        return regex.test(s)
+    function unquote(s, startSymbol, endSymbol) {
+        return s && s.length > 1 && s.startsWith(startSymbol) && s.endsWith(endSymbol)
             // check and unescape any escaped character
-            ? s.replace(regex, '$1').replace(/\\(.)/g, '$1')
+            ? s.substring(1, s.length - 1).replace(/\\(.)/gi, '$1')
             : s;
     }
 
@@ -29170,7 +29172,7 @@ var handlers = {
 
         break;
 
-      case 'year ed':
+      case 'year picked':
         if (format.hasMonth) {
           this.showView(VIEWS.MONTHS);
         } else {
@@ -32387,18 +32389,6 @@ __webpack_require__.d(__webpack_exports__, {
   Calendar: function() { return /* binding */ Calendar; }
 });
 
-// NAMESPACE OBJECT: ./calendar.hbs
-var calendar_namespaceObject = {};
-__webpack_require__.r(calendar_namespaceObject);
-__webpack_require__.d(calendar_namespaceObject, {
-  "default": function() { return calendar; },
-  eventListTpl: function() { return eventListTpl; },
-  eventTpl: function() { return eventTpl; },
-  monthEventListTpl: function() { return monthEventListTpl; },
-  monthEventsTpl: function() { return monthEventsTpl; },
-  viewTpl: function() { return viewTpl; }
-});
-
 // EXTERNAL MODULE: ./lib/cui/util/js/fn.js
 var js_fn = __webpack_require__(9837);
 // EXTERNAL MODULE: ./lib/i18n.js
@@ -32737,10 +32727,10 @@ var template = __webpack_require__(1937);
 const partials = /* #__PURE__ */ template({
     // partials
     "typeIco": "{{#eq sensitivity 2}}<i class=\"iconfont icon-private\"></i>{{/eq}} {{#if @supportInvite}}<i class=\"iconfont icon-{{if$ attendees.length 'meeting' 'calendar'}}\"></i>{{/if}}",
-    "detailIco": "<i class=\"iconfont icon-remind\" title=\"{{i18n 'cal/tips_alarmclock'}}\"></i> <i class=\"iconfont icon-{{if$ (and @supportExceptions exceptionDate) 'no'}}repeat\" title=\"{{i18n (join 'cal/tips_repeat' (if$ (and @supportExceptions exceptionDate) '_exception'))}}\"></i> {{#if attachments}} <i class=\"iconfont iconacc\"></i> {{/if}}",
+    "detailIco": "{{#if (or reminders reminder)}} <i class=\"iconfont icon-remind\" title=\"{{i18n 'cal/tips_alarmclock'}}\"></i> {{/if}} {{#if (and recurrence (ne recurrence.type -1))}} <i class=\"iconfont icon-{{if$ (and @supportExceptions exceptionDate) 'no'}}repeat\" title=\"{{i18n (join 'cal/tips_repeat' (if$ (and @supportExceptions exceptionDate) '_exception'))}}\"></i> {{/if}} {{#if attachments}} <i class=\"iconfont iconacc\"></i> {{/if}}",
     "ico": "{{>typeIco}} {{>detailIco}}",
     "eventPartial": "<li class=\"event_selection {{if$ exceptionDate 'exception' }} {{if$ isOutOfDate 'out-dated'}}\" data-=\"{{json .}}\" data-uid=\"{{UID}}\"> <span class=\"event_icon f-fr\">{{>ico}} {{{endLabel}}}</span> <p class=\"event_msg f-ellipsis\"> {{{startLabel}}} <a title=\"{{name}}\">{{name}}</a> </p> </li>",})
-/* harmony default export */ var calendar = (/* #__PURE__ */template("", partials));
+/* harmony default export */ var calendar = (/* #__PURE__ */(/* unused pure expression or super */ null && (CTemplate("", partials))));
 const eventTpl = /* #__PURE__ */ template("{{>eventPartial}}", partials);
 const monthEventsTpl = /* #__PURE__ */ template("{{#if .}} <ul class=MonthEvent>{{#each .}} {{>eventPartial startLabel=(join '<span class=event_time>' (if$ allDayEvent (i18n 'cal/lb_all_day') (date$ rangeStart 'T')) '</span>')}} {{/each}}</ul> {{/if}}", partials);
 const monthEventListTpl = /* #__PURE__ */ template("{{#each .}} <li class=\"sidebar clearfix f-csp\" data-=\"{{json .}}\" data-uid=\"{{UID}}\"> <table> <colgroup> <col width=60> <col> <col class=j-attach-col> </colgroup> <tr> <td>{{if$ allDayEvent (i18n 'cal/lb_all_day') (date$ rangeStart 'T')}}</td> <td class=name colspan=2>{{name}}</td> </tr> <tr> <td>{{date$DUR (math duration '*' 1000)}}</td> <td>{{location}}</td> <td class=ico>{{>ico}}</td> </tr> </table> </li> {{/each}}", partials);
@@ -32794,9 +32784,7 @@ const {mm: index_mm, i : isoDate, I : isoDatetime} = util_date, {rcCheck, rcChec
  * @returns {{refreshView, selectedEvents}}
  */
 const Calendar = ([$context, $datePicker], viewType, options) => {
-    const {eventTpl, eventListTpl, viewTpl, monthEventsTpl, monthEventListTpl} = js_fn.mapValues(calendar_namespaceObject, tpl => tpl.config?.({
-        data : {supportExceptions : options.supportExceptions ?? 0, supportInvite : options.supportInvite ?? 0},
-    }));
+    const templateData = {supportExceptions : options.supportExceptions ?? 0, supportInvite : options.supportInvite ?? 0};
 
     let dialog, refreshView, adjustContainer, adjustNow, selectedEvents;
 
@@ -32811,7 +32799,7 @@ const Calendar = ([$context, $datePicker], viewType, options) => {
         // m-cal-month | m-cal-week | m-cal-day | m-cal-list
         .addClass(`m-cal-${viewType.toLowerCase()}`)
         // calMain_MONTH | calMain_WEEK | calMain_DAY | calMain_LIST
-        .addClass(`calMain calMain_${viewType}`).attr({color : colorName || '', firstWeekDay}).html(viewTpl(viewType))
+        .addClass(`calMain calMain_${viewType}`).attr({color : colorName || '', firstWeekDay}).html(viewTpl(viewType, {data : templateData}))
         .off('click');
 
     const $toolbarDatePicker = external_$_('.j-picker', $context), $calendar = external_$_('.calendar', $context);
@@ -33036,7 +33024,7 @@ const Calendar = ([$context, $datePicker], viewType, options) => {
                                 : i === 6 || !isWeek ? '<span class=date-next></span>' // 占位对齐
                                     : '',
                         },
-                    })).toggleClass(VERTICAL_CLASS, !isAllDay);
+                    }, {data : templateData})).toggleClass(VERTICAL_CLASS, !isAllDay);
 
                     if (isAllDay) {
                         external_$_('>ul', external_$_(`>td:eq(${i + 1})`, external_$_('tr', $allDays.height('')))).append($li);
@@ -33250,13 +33238,13 @@ const Calendar = ([$context, $datePicker], viewType, options) => {
                 beforeRender?.(js_fn.flat(cachedList, 'events'));
 
                 // 渲染日历表格数据
-                list.map((item, i) => external_$_(`td:eq(${i})>`, $tbody).append(monthEventsTpl(sort(item.events))));
+                list.map((item, i) => external_$_(`td:eq(${i})>`, $tbody).append(monthEventsTpl(sort(item.events), {data : templateData})));
                 adjustTable();
                 scrollTop && ($scroll[0].scrollTop = scrollTop);
 
                 // 渲染当前所选天的事件列表数据
                 js_fn.map(external_$_('.j-attach-col', external_$_('>ul', $aside)
-                    .html(monthEventListTpl(sort(list[external_$_('td', $tbody).index(external_$_(`td.${CAL_SELECTED_CLASS}`, $tbody)[0])].events)))
+                    .html(monthEventListTpl(sort(list[external_$_('td', $tbody).index(external_$_(`td.${CAL_SELECTED_CLASS}`, $tbody)[0])].events), {data : templateData}))
                 ), col => {
                     const count = external_$_('i', external_$_(col).closest('table')).length;
                     col.width = 20 * count + /** gap = */ 4 * (count - 1) + /** padding-left = */ 4;
@@ -33378,7 +33366,7 @@ const Calendar = ([$context, $datePicker], viewType, options) => {
                 jquery_crc($tbody.html(eventListTpl(list.slice(start, start + _limit).map(event => ({
                     ...event,
                     highlight : (highlightIds || []).includes(event.id),
-                })))));
+                })), {data : templateData})));
                 beforeRender?.(list);
                 $window.resize();
                 onChecked();