@windrun-huaiin/third-ui 7.6.1 → 10.0.0

package/dist/node_modules/.pnpm/{mermaid@11.9.0/node_modules/mermaid/dist/chunks/mermaid.core/ganttDiagram-EK5VF46D.mjs → mermaid@11.12.1/node_modules/mermaid/dist/chunks/mermaid.core/ganttDiagram-LVOFAZNH.mjs}

@@ -1,5 +1,6 @@
-import { utils_default } from './chunk-55PJQP7W.mjs';
-import { __name, getAccDescription, setAccDescription, getDiagramTitle, setDiagramTitle, getAccTitle, setAccTitle, getConfig2, configureSvgSize, log, common_default, clear } from './chunk-3XYRH5AP.mjs';
+import { utils_default } from './chunk-S3R3BYOJ.mjs';
+import { getAccDescription, setAccDescription, getDiagramTitle, setDiagramTitle, getAccTitle, setAccTitle, getConfig2, configureSvgSize, common_default, clear } from './chunk-ABZYJK2D.mjs';
+import { __name, log } from './chunk-AGHRB4JF.mjs';
 import { d as distExports } from '../../../../../../../../_virtual/index.mjs';
 import dayjs2 from '../../../../../../../../_virtual/dayjs.min.mjs';
 import dayjsIsoWeek from '../../../../../../../../_virtual/isoWeek.mjs';
@@ -24,7 +25,7 @@ import { millisecond } from '../../../../../../d3-time@3.1.0/node_modules/d3-tim
 import select from '../../../../../../d3-selection@3.0.0/node_modules/d3-selection/src/select.mjs';
 
 // src/diagrams/gantt/parser/gantt.jison
-var parser = function() {
+var parser = (function() {
   var o = /* @__PURE__ */ __name(function(k, v, o2, l) {
     for (o2 = o2 || {}, l = k.length; l--; o2[k[l]] = v) ;
     return o2;
@@ -331,7 +332,7 @@ var parser = function() {
       return true;
     }, "parse")
   };
-  var lexer = /* @__PURE__ */ function() {
+  var lexer = /* @__PURE__ */ (function() {
     var lexer2 = {
       EOF: 1,
       parseError: /* @__PURE__ */ __name(function parseError(str, hash) {
@@ -741,7 +742,7 @@ var parser = function() {
       conditions: { "acc_descr_multiline": { "rules": [6, 7], "inclusive": false }, "acc_descr": { "rules": [4], "inclusive": false }, "acc_title": { "rules": [2], "inclusive": false }, "callbackargs": { "rules": [21, 22], "inclusive": false }, "callbackname": { "rules": [18, 19, 20], "inclusive": false }, "href": { "rules": [15, 16], "inclusive": false }, "click": { "rules": [24, 25], "inclusive": false }, "INITIAL": { "rules": [0, 1, 3, 5, 8, 9, 10, 11, 12, 13, 14, 17, 23, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52], "inclusive": true } }
     };
     return lexer2;
-  }();
+  })();
   parser2.lexer = lexer;
   function Parser() {
     this.yy = {};
@@ -750,7 +751,7 @@ var parser = function() {
   Parser.prototype = parser2;
   parser2.Parser = Parser;
   return new Parser();
-}();
+})();
 parser.parser = parser;
 var gantt_default = parser;
 dayjs2.extend(dayjsIsoWeek);
@@ -875,7 +876,9 @@ var getTasks = /* @__PURE__ */ __name(function() {
   return tasks;
 }, "getTasks");
 var isInvalidDate = /* @__PURE__ */ __name(function(date, dateFormat2, excludes2, includes2) {
-  if (includes2.includes(date.format(dateFormat2.trim()))) {
+  const formattedDate = date.format(dateFormat2.trim());
+  const dateOnly = date.format("YYYY-MM-DD");
+  if (includes2.includes(formattedDate) || includes2.includes(dateOnly)) {
     return false;
   }
   if (excludes2.includes("weekends") && (date.isoWeekday() === WEEKEND_START_DAY[weekend] || date.isoWeekday() === WEEKEND_START_DAY[weekend] + 1)) {
@@ -884,7 +887,7 @@ var isInvalidDate = /* @__PURE__ */ __name(function(date, dateFormat2, excludes2
   if (excludes2.includes(date.format("dddd").toLowerCase())) {
     return true;
   }
-  return excludes2.includes(date.format(dateFormat2.trim()));
+  return excludes2.includes(formattedDate) || excludes2.includes(dateOnly);
 }, "isInvalidDate");
 var setWeekday = /* @__PURE__ */ __name(function(txt) {
   weekday = txt;
@@ -939,6 +942,9 @@ var fixTaskDates = /* @__PURE__ */ __name(function(startTime, endTime, dateForma
 }, "fixTaskDates");
 var getStartDate = /* @__PURE__ */ __name(function(prevTime, dateFormat2, str) {
   str = str.trim();
+  if ((dateFormat2.trim() === "x" || dateFormat2.trim() === "X") && /^\d+$/.test(str)) {
+    return new Date(Number(str));
+  }
   const afterRePattern = /^after\s+(?<ids>[\d\w- ]+)/;
   const afterStatement = afterRePattern.exec(str);
   if (afterStatement !== null) {
@@ -1716,20 +1722,23 @@ var draw = /* @__PURE__ */ __name(function(text, id, version, diagObj) {
       d = d.add(1, "d");
     }
     const rectangles = svg.append("g").selectAll("rect").data(excludeRanges).enter();
-    rectangles.append("rect").attr("id", function(d2) {
-      return "exclude-" + d2.start.format("YYYY-MM-DD");
-    }).attr("x", function(d2) {
-      return timeScale(d2.start) + theSidePad;
-    }).attr("y", conf.gridLineStartPadding).attr("width", function(d2) {
-      const renderEnd = d2.end.add(1, "day");
-      return timeScale(renderEnd) - timeScale(d2.start);
-    }).attr("height", h2 - theTopPad - conf.gridLineStartPadding).attr("transform-origin", function(d2, i) {
+    rectangles.append("rect").attr("id", (d2) => "exclude-" + d2.start.format("YYYY-MM-DD")).attr("x", (d2) => timeScale(d2.start.startOf("day")) + theSidePad).attr("y", conf.gridLineStartPadding).attr("width", (d2) => timeScale(d2.end.endOf("day")) - timeScale(d2.start.startOf("day"))).attr("height", h2 - theTopPad - conf.gridLineStartPadding).attr("transform-origin", function(d2, i) {
       return (timeScale(d2.start) + theSidePad + 0.5 * (timeScale(d2.end) - timeScale(d2.start))).toString() + "px " + (i * theGap + 0.5 * h2).toString() + "px";
     }).attr("class", "exclude-range");
   }
   __name(drawExcludeDays, "drawExcludeDays");
   function makeGrid(theSidePad, theTopPad, w2, h2) {
-    let bottomXAxis = axisBottom(timeScale).tickSize(-h2 + theTopPad + conf.gridLineStartPadding).tickFormat(timeFormat(diagObj.db.getAxisFormat() || conf.axisFormat || "%Y-%m-%d"));
+    const dateFormat2 = diagObj.db.getDateFormat();
+    const userAxisFormat = diagObj.db.getAxisFormat();
+    let axisFormat2;
+    if (userAxisFormat) {
+      axisFormat2 = userAxisFormat;
+    } else if (dateFormat2 === "D") {
+      axisFormat2 = "%d";
+    } else {
+      axisFormat2 = conf.axisFormat ?? "%Y-%m-%d";
+    }
+    let bottomXAxis = axisBottom(timeScale).tickSize(-h2 + theTopPad + conf.gridLineStartPadding).tickFormat(timeFormat(axisFormat2));
     const reTickInterval = /^([1-9]\d*)(millisecond|second|minute|hour|day|week|month)$/;
     const resultTickInterval = reTickInterval.exec(
       diagObj.db.getTickInterval() || conf.tickInterval
@@ -1764,7 +1773,7 @@ var draw = /* @__PURE__ */ __name(function(text, id, version, diagObj) {
     }
     svg.append("g").attr("class", "grid").attr("transform", "translate(" + theSidePad + ", " + (h2 - 50) + ")").call(bottomXAxis).selectAll("text").style("text-anchor", "middle").attr("fill", "#000").attr("stroke", "none").attr("font-size", 10).attr("dy", "1em");
     if (diagObj.db.topAxisEnabled() || conf.topAxis) {
-      let topXAxis = axisTop(timeScale).tickSize(-h2 + theTopPad + conf.gridLineStartPadding).tickFormat(timeFormat(diagObj.db.getAxisFormat() || conf.axisFormat || "%Y-%m-%d"));
+      let topXAxis = axisTop(timeScale).tickSize(-h2 + theTopPad + conf.gridLineStartPadding).tickFormat(timeFormat(axisFormat2));
       if (resultTickInterval !== null) {
         const every = resultTickInterval[1];
         const interval = resultTickInterval[2];