@gingkoo/pandora-metabase 1.0.103 → 1.0.105

package/lib/cjs/components/dialog/custom-column/index.d.ts

@@ -1,7 +1,7 @@
 import './index.less';
 import { MetaCustom_Item, MetaData_ColumnsType } from '../../../store/types';
 interface PropsType {
-    value: MetaCustom_Item | null;
+    value: MetaCustom_Item;
     data: MetaData_ColumnsType[];
     onChange: (record: MetaCustom_Item) => void;
     onClose: Function;

package/lib/cjs/components/dialog/custom-column/index.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
 var _jsxRuntime = require("react/jsx-runtime");
 require("./index.less");
@@ -35,9 +36,9 @@ var CustomColumn = function CustomColumn(_ref) {
     return expression && name;
   }, [expression, name]);
   function onOk() {
-    typeof onChange === 'function' && onChange({
+    typeof onChange === 'function' && onChange((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, value), {}, {
       name: name
-    });
+    }));
   }
   var buttonText = isUpdate ? (0, _locale.__)('customColumn.update') : (0, _locale.__)('customColumn.complete');
   return (0, _jsxRuntime.jsx)("div", {

package/lib/cjs/components/dialog/expression/date-format-picker.d.ts

@@ -0,0 +1,14 @@
+import React from 'react';
+interface DateRangeFormatPickerProps {
+    value?: string[];
+    format?: string;
+    onChange?: (val: string[], format?: string) => void;
+}
+export declare const DateRangeFormatPicker: React.FC<DateRangeFormatPickerProps>;
+interface DateFormatPickerProps {
+    value?: string;
+    format?: string;
+    onChange?: (val: string, format?: string) => void;
+}
+export declare const DateFormatPicker: React.FC<DateFormatPickerProps>;
+export {};

package/lib/cjs/components/dialog/expression/date-format-picker.js

@@ -0,0 +1,218 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.DateRangeFormatPicker = exports.DateFormatPicker = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
+var _jsxRuntime = require("react/jsx-runtime");
+var _react = require("react");
+var _pandora = require("@gingkoo/pandora");
+var _dayjs = _interopRequireDefault(require("dayjs"));
+var RangePicker = _pandora.DatePicker.RangePicker,
+  YearPicker = _pandora.DatePicker.YearPicker,
+  MonthPicker = _pandora.DatePicker.MonthPicker;
+var DATE_FORMAT_OPTIONS = [{
+  value: 'YYYY',
+  label: 'YYYY'
+}, {
+  value: 'YYYY-MM',
+  label: 'YYYY-MM'
+}, {
+  value: 'YYYY-MM-DD',
+  label: 'YYYY-MM-DD'
+}, {
+  value: 'YYYY-MM-DD HH:mm',
+  label: 'YYYY-MM-DD HH:mm'
+}, {
+  value: 'YYYY/MM',
+  label: 'YYYY/MM'
+}, {
+  value: 'YYYY/MM/DD',
+  label: 'YYYY/MM/DD'
+}, {
+  value: 'YYYY/MM/DD HH:mm',
+  label: 'YYYY/MM/DD HH:mm'
+}];
+var DEFAULT_FORMAT = 'YYYY-MM-DD HH:mm';
+var DateRangeFormatPicker = exports.DateRangeFormatPicker = function DateRangeFormatPicker(_ref) {
+  var value = _ref.value,
+    format = _ref.format,
+    onChange = _ref.onChange;
+  var _useState = (0, _react.useState)(format || DEFAULT_FORMAT),
+    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+    currentFormat = _useState2[0],
+    setCurrentFormat = _useState2[1];
+  (0, _react.useEffect)(function () {
+    if (format) {
+      setCurrentFormat(format);
+    }
+  }, [format]);
+  var showTime = currentFormat.includes('HH:mm');
+  // 根据格式确定 RangePicker 的 mode
+  var getRangePickerMode = function getRangePickerMode() {
+    if (currentFormat === 'YYYY') return 'year';
+    if (currentFormat === 'YYYY-MM' || currentFormat === 'YYYY/MM') return 'month';
+    return 'date';
+  };
+  var handleFormatChange = function handleFormatChange(newFormat) {
+    // 切换格式时，用新格式重新格式化当前值
+    if (value && value.length > 0) {
+      var formattedValues = value.map(function (v) {
+        if (!v) return '';
+        var parsed = (0, _dayjs["default"])(v);
+        if (!parsed.isValid()) return '';
+        return parsed.format(newFormat);
+      });
+      // 只调用 onChange，传递新格式化的值和新格式
+      onChange === null || onChange === void 0 || onChange(formattedValues, newFormat);
+    }
+    setCurrentFormat(newFormat);
+  };
+  // 将字符串数组转为 dayjs 对象数组，供 RangePicker 使用
+  var rangeValue = (value === null || value === void 0 ? void 0 : value.map(function (v) {
+    if (!v) return null;
+    // 尝试用当前格式解析，失败则用 dayjs 默认解析
+    var parsed = (0, _dayjs["default"])(v, currentFormat, true);
+    if (parsed.isValid()) return parsed;
+    // 尝试不用严格模式解析
+    var looseParsed = (0, _dayjs["default"])(v, currentFormat);
+    if (looseParsed.isValid()) return looseParsed;
+    // 最后尝试不指定格式
+    var anyParsed = (0, _dayjs["default"])(v);
+    return anyParsed.isValid() ? anyParsed : null;
+  })) || undefined;
+  var handleRangeChange = function handleRangeChange(date, dateString) {
+    // 确保日期值按 currentFormat 格式化
+    var formattedValues = (date === null || date === void 0 ? void 0 : date.map(function (d) {
+      if (!d || !(0, _dayjs["default"])(d).isValid()) return '';
+      return (0, _dayjs["default"])(d).format(currentFormat);
+    })) || dateString;
+    onChange === null || onChange === void 0 || onChange(formattedValues, currentFormat);
+  };
+  return (0, _jsxRuntime.jsxs)("div", {
+    style: {
+      display: 'flex',
+      gap: 4
+    },
+    children: [(0, _jsxRuntime.jsx)(_pandora.Select, {
+      style: {
+        width: 120
+      },
+      value: currentFormat,
+      onChange: handleFormatChange,
+      children: DATE_FORMAT_OPTIONS.map(function (option) {
+        return (0, _jsxRuntime.jsx)(_pandora.Select.Option, {
+          value: option.value,
+          children: option.label
+        }, option.value);
+      })
+    }), (0, _jsxRuntime.jsx)(RangePicker, {
+      value: rangeValue,
+      onChange: handleRangeChange,
+      style: {
+        flex: 1
+      },
+      format: currentFormat,
+      showTime: showTime,
+      mode: getRangePickerMode()
+    })]
+  });
+};
+var DateFormatPicker = exports.DateFormatPicker = function DateFormatPicker(_ref2) {
+  var value = _ref2.value,
+    format = _ref2.format,
+    onChange = _ref2.onChange;
+  var _useState3 = (0, _react.useState)(format || DEFAULT_FORMAT),
+    _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
+    currentFormat = _useState4[0],
+    setCurrentFormat = _useState4[1];
+  (0, _react.useEffect)(function () {
+    if (format) {
+      setCurrentFormat(format);
+    }
+  }, [format]);
+  var showTime = currentFormat.includes('HH:mm');
+  var isYearOnly = currentFormat === 'YYYY';
+  var isMonthOnly = currentFormat === 'YYYY-MM' || currentFormat === 'YYYY/MM';
+  var handleFormatChange = function handleFormatChange(newFormat) {
+    // 切换格式时，用新格式重新格式化当前值
+    if (value) {
+      var parsed = (0, _dayjs["default"])(value);
+      if (parsed.isValid()) {
+        onChange === null || onChange === void 0 || onChange(parsed.format(newFormat), newFormat);
+      }
+    }
+    setCurrentFormat(newFormat);
+  };
+  // 将字符串转为 dayjs 对象，使用宽松解析
+  var dateValue = function () {
+    if (!value) return undefined;
+    var parsed = (0, _dayjs["default"])(value, currentFormat, true);
+    if (parsed.isValid()) return parsed;
+    var looseParsed = (0, _dayjs["default"])(value, currentFormat);
+    if (looseParsed.isValid()) return looseParsed;
+    var anyParsed = (0, _dayjs["default"])(value);
+    return anyParsed.isValid() ? anyParsed : undefined;
+  }();
+  var handleDateChange = function handleDateChange(dateString) {
+    onChange === null || onChange === void 0 || onChange(dateString, currentFormat);
+  };
+  var handleYearChange = function handleYearChange(dateString) {
+    onChange === null || onChange === void 0 || onChange(dateString, currentFormat);
+  };
+  var handleMonthChange = function handleMonthChange(dateString) {
+    onChange === null || onChange === void 0 || onChange(dateString, currentFormat);
+  };
+  // 根据格式渲染不同的选择器
+  var renderPicker = function renderPicker() {
+    if (isYearOnly) {
+      return (0, _jsxRuntime.jsx)(YearPicker, {
+        value: dateValue,
+        onChange: handleYearChange,
+        style: {
+          flex: 1
+        }
+      });
+    }
+    if (isMonthOnly) {
+      return (0, _jsxRuntime.jsx)(MonthPicker, {
+        value: dateValue,
+        onChange: handleMonthChange,
+        style: {
+          flex: 1
+        },
+        format: currentFormat
+      });
+    }
+    return (0, _jsxRuntime.jsx)(_pandora.DatePicker, {
+      value: dateValue,
+      onChange: handleDateChange,
+      style: {
+        flex: 1
+      },
+      format: currentFormat,
+      showTime: showTime
+    });
+  };
+  return (0, _jsxRuntime.jsxs)("div", {
+    style: {
+      display: 'flex',
+      gap: 4
+    },
+    children: [(0, _jsxRuntime.jsx)(_pandora.Select, {
+      style: {
+        width: 120
+      },
+      value: currentFormat,
+      onChange: handleFormatChange,
+      children: DATE_FORMAT_OPTIONS.map(function (option) {
+        return (0, _jsxRuntime.jsx)(_pandora.Select.Option, {
+          value: option.value,
+          children: option.label
+        }, option.value);
+      })
+    }), renderPicker()]
+  });
+};

package/lib/cjs/components/dialog/expression/date-format.d.ts

@@ -0,0 +1,5 @@
+export declare const DATE_FORMAT_OPTIONS: {
+    value: string;
+    label: string;
+}[];
+export declare const DEFAULT_DATE_FORMAT = "YYYY-MM-DD HH:mm";

package/lib/cjs/components/dialog/expression/date-format.js

@@ -0,0 +1,26 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.DEFAULT_DATE_FORMAT = exports.DATE_FORMAT_OPTIONS = void 0;
+var DATE_FORMAT_OPTIONS = exports.DATE_FORMAT_OPTIONS = [{
+  value: 'YYYY-MM',
+  label: 'YYYY-MM'
+}, {
+  value: 'YYYY-MM-DD',
+  label: 'YYYY-MM-DD'
+}, {
+  value: 'YYYY-MM-DD HH:mm',
+  label: 'YYYY-MM-DD HH:mm'
+}, {
+  value: 'YYYY/MM',
+  label: 'YYYY/MM'
+}, {
+  value: 'YYYY/MM/DD',
+  label: 'YYYY/MM/DD'
+}, {
+  value: 'YYYY/MM/DD HH:mm',
+  label: 'YYYY/MM/DD HH:mm'
+}];
+var DEFAULT_DATE_FORMAT = exports.DEFAULT_DATE_FORMAT = 'YYYY-MM-DD HH:mm';

package/lib/cjs/components/dialog/expression/index.js

@@ -27,12 +27,12 @@ var _useProvider = require("../../../hooks/use-provider");
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 var _utils = require("../formula-list/utils");
 var _itemName = _interopRequireDefault(require("../../modules/components/item-name"));
+var _dateFormatPicker = require("./date-format-picker");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 /**
  * 关联模块 选择表字段
  */
 
-var RangePicker = _pandora.DatePicker.RangePicker;
 var NUMBER_LIST = ['等于', '不等于', '大于', '小于', '介于之间', '大于或等于', '小于或等于', '为空', '不为空', '以...开始', '以...结束', '不以...开始', '不以...结束', 'In', 'Not In', '正则匹配'];
 var STRING_LIST = ['等于', '不等于', '包含', '不包含', '为空', '不为空', '以...开始', '以...结束', '不以...开始', '不以...结束', 'In', 'Not In', '正则匹配'];
 var DATE_LIST = [
@@ -395,23 +395,21 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
         });
       }
       if (type === _enum.SQL_GROUP_TYPE.DATE) {
-        return (0, _jsxRuntime.jsx)("div", {
-          children: (0, _jsxRuntime.jsx)(RangePicker, {
-            showTime: {
-              format: 'HH:mm'
-            },
-            format: 'YYYY-MM-DD HH:mm',
-            className: 'w_300',
-            // @ts-ignore
-            value: firstVal ? [(0, _dayjs["default"])(firstVal !== null && firstVal !== void 0 ? firstVal : undefined), (0, _dayjs["default"])(secondVal !== null && secondVal !== void 0 ? secondVal : undefined)] : [],
-            onChange: function onChange(val) {
-              // @ts-ignore
-              val && setRhsVal([{
+        var _rhsVal$, _rhsVal$2;
+        var dateVal = ((_rhsVal$ = rhsVal[0]) === null || _rhsVal$ === void 0 ? void 0 : _rhsVal$.type) === _types.AtomsTypeEnum.INPUT_STRING_LIST ? rhsVal[0].val : undefined;
+        var dateFormat = ((_rhsVal$2 = rhsVal[0]) === null || _rhsVal$2 === void 0 ? void 0 : _rhsVal$2.type) === _types.AtomsTypeEnum.INPUT_STRING_LIST ? rhsVal[0].format : undefined;
+        return (0, _jsxRuntime.jsx)(_dateFormatPicker.DateRangeFormatPicker, {
+          value: dateVal,
+          format: dateFormat,
+          onChange: function onChange(val, format) {
+            if (val) {
+              setRhsVal([{
                 type: _types.AtomsTypeEnum.INPUT_STRING_LIST,
-                val: [(0, _dayjs["default"])(val[0]).format('YYYY-MM-DD HH:mm'), (0, _dayjs["default"])(val[1]).format('YYYY-MM-DD HH:mm')]
+                val: val,
+                format: format
               }]);
             }
-          })
+          }
         });
       }
     } else if (conditionText === '当前') {
@@ -496,58 +494,50 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
         })]
       });
     } else if (~['早于', '晚于', '在'].indexOf(conditionText)) {
-      return (0, _jsxRuntime.jsx)("div", {
-        children: (0, _jsxRuntime.jsx)(_pandora.DatePicker, {
-          showTime: {
-            format: 'HH:mm'
-          },
-          format: 'YYYY-MM-DD HH:mm',
-          className: 'w_300',
-          value: firstVal ? (0, _dayjs["default"])(firstVal) : '',
-          onChange: function onChange(val) {
-            if (val) {
-              setRhsVal([{
-                type: _types.AtomsTypeEnum.INPUT_STRING,
-                val: (0, _dayjs["default"])(val).format('YYYY-MM-DD HH:mm')
-              }
-              // {
-              //   type: AtomsTypeEnum.INPUT_STRING,
-              //   val: moment(val).format('YYYY-MM-DD HH:mm'),
-              // },
-              ]);
-            } else {
-              setRhsVal([{
-                val: '',
-                type: _types.AtomsTypeEnum.INPUT_STRING
-              }]);
-              // setVal([]);
-            }
+      var _rhsVal$3, _rhsVal$4;
+      var _dateVal = ((_rhsVal$3 = rhsVal[0]) === null || _rhsVal$3 === void 0 ? void 0 : _rhsVal$3.type) === _types.AtomsTypeEnum.INPUT_STRING ? rhsVal[0].val : undefined;
+      var _dateFormat = ((_rhsVal$4 = rhsVal[0]) === null || _rhsVal$4 === void 0 ? void 0 : _rhsVal$4.type) === _types.AtomsTypeEnum.INPUT_STRING ? rhsVal[0].format : undefined;
+      return (0, _jsxRuntime.jsx)(_dateFormatPicker.DateFormatPicker, {
+        value: _dateVal,
+        format: _dateFormat,
+        onChange: function onChange(val, format) {
+          if (val) {
+            setRhsVal([{
+              type: _types.AtomsTypeEnum.INPUT_STRING,
+              val: val,
+              format: format
+            }]);
+          } else {
+            setRhsVal([{
+              val: '',
+              type: _types.AtomsTypeEnum.INPUT_STRING,
+              format: format
+            }]);
           }
-        })
+        }
       });
     } else if (~['等于'].indexOf(conditionText) && type === _enum.SQL_GROUP_TYPE.DATE) {
-      return (0, _jsxRuntime.jsx)("div", {
-        children: (0, _jsxRuntime.jsx)(_pandora.DatePicker, {
-          showTime: {
-            format: 'HH:mm'
-          },
-          format: 'YYYY-MM-DD HH:mm',
-          className: 'w_300',
-          value: firstVal ? (0, _dayjs["default"])(firstVal) : '',
-          onChange: function onChange(val) {
-            if (val) {
-              setRhsVal([{
-                type: _types.AtomsTypeEnum.INPUT_STRING,
-                val: (0, _dayjs["default"])(val).format('YYYY-MM-DD HH:mm')
-              }]);
-            } else {
-              setRhsVal([{
-                val: '',
-                type: _types.AtomsTypeEnum.INPUT_STRING
-              }]);
-            }
+      var _rhsVal$5, _rhsVal$6;
+      var _dateVal2 = ((_rhsVal$5 = rhsVal[0]) === null || _rhsVal$5 === void 0 ? void 0 : _rhsVal$5.type) === _types.AtomsTypeEnum.INPUT_STRING ? rhsVal[0].val : undefined;
+      var _dateFormat2 = ((_rhsVal$6 = rhsVal[0]) === null || _rhsVal$6 === void 0 ? void 0 : _rhsVal$6.type) === _types.AtomsTypeEnum.INPUT_STRING ? rhsVal[0].format : undefined;
+      return (0, _jsxRuntime.jsx)(_dateFormatPicker.DateFormatPicker, {
+        value: _dateVal2,
+        format: _dateFormat2,
+        onChange: function onChange(val, format) {
+          if (val) {
+            setRhsVal([{
+              type: _types.AtomsTypeEnum.INPUT_STRING,
+              val: val,
+              format: format
+            }]);
+          } else {
+            setRhsVal([{
+              val: '',
+              type: _types.AtomsTypeEnum.INPUT_STRING,
+              format: format
+            }]);
           }
-        })
+        }
       });
     } else if (~['In', 'Not In'].indexOf(conditionText)) {
       var options = firstVal ? firstVal.split(',') : [];
@@ -930,7 +920,8 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
     } else if (~['介于之间'].indexOf(_condition)) {
       setRhsVal([{
         val: ['', ''],
-        type: _types.AtomsTypeEnum.INPUT_STRING_LIST
+        type: _types.AtomsTypeEnum.INPUT_STRING_LIST,
+        format: 'YYYY-MM-DD HH:mm'
       }]);
     } else if (~['当前'].indexOf(_condition)) {
       setRhsVal([{
@@ -940,7 +931,8 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
     } else if (~['早于', '晚于', '在'].indexOf(_condition)) {
       setRhsVal([{
         val: (0, _dayjs["default"])().format('YYYY-MM-DD HH:mm'),
-        type: _types.AtomsTypeEnum.INPUT_STRING
+        type: _types.AtomsTypeEnum.INPUT_STRING,
+        format: 'YYYY-MM-DD HH:mm'
       }]);
     } else {
       setRhsVal([{

package/lib/cjs/components/modules/custom-column.js

@@ -251,7 +251,7 @@ var CustomColumn = function CustomColumn(props) {
             },
             onOk: function onOk(_data) {
               var data = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _data), {}, {
-                uuid: _data.uuid || (0, _helper.uuidv4)('custom')
+                fieldUuid: _data.fieldUuid || (0, _helper.uuidv4)('field')
               });
               if (i === -1) {
                 newMeta[index].customColumn.push(data);

package/lib/cjs/store/types.d.ts

@@ -107,10 +107,12 @@ export interface AtomsField {
 export interface AtomsInputString {
     val: string;
     type: AtomsTypeEnum.INPUT_STRING;
+    format?: string;
 }
 export interface AtomsInputStringList {
     val: string[];
     type: AtomsTypeEnum.INPUT_STRING_LIST;
+    format?: string;
 }
 export interface AtomsInputNumberList {
     val: number[];
@@ -223,6 +225,7 @@ export interface MetaJoin {
 export interface MetaCustom_Item {
     name: string;
     id?: string;
+    fieldUuid: string;
     type?: string;
     formulaList?: AtomsItem[];
 }

package/lib/cjs/utils.js

@@ -125,7 +125,9 @@ var getSubColumns = exports.getSubColumns = function getSubColumns(metaList) {
     metaKey: -1,
     type: _enum.TypeEnum.customColumn,
     customColumn: [{
-      name: '' // 用户起的别名
+      name: '',
+      // 用户起的别名
+      fieldUuid: ''
       // formula: '', // 公式}];
     }]
   };
@@ -244,7 +246,7 @@ var getSubColumns = exports.getSubColumns = function getSubColumns(metaList) {
             name: v.name,
             select: true,
             fieldAlias: '',
-            fieldUuid: (0, _helper2.uuidv4)('field')
+            fieldUuid: v.fieldUuid || (0, _helper2.uuidv4)('field')
           };
         });
         return {

package/lib/es/components/dialog/custom-column/index.d.ts

@@ -1,7 +1,7 @@
 import './index.less';
 import { MetaCustom_Item, MetaData_ColumnsType } from '../../../store/types';
 interface PropsType {
-    value: MetaCustom_Item | null;
+    value: MetaCustom_Item;
     data: MetaData_ColumnsType[];
     onChange: (record: MetaCustom_Item) => void;
     onClose: Function;

package/lib/es/components/dialog/custom-column/index.js

@@ -1,3 +1,4 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import './index.less';
@@ -28,9 +29,9 @@ var CustomColumn = function CustomColumn(_ref) {
     return expression && name;
   }, [expression, name]);
   function onOk() {
-    typeof onChange === 'function' && onChange({
+    typeof onChange === 'function' && onChange(_objectSpread(_objectSpread({}, value), {}, {
       name: name
-    });
+    }));
   }
   var buttonText = isUpdate ? __('customColumn.update') : __('customColumn.complete');
   return _jsx("div", {

package/lib/es/components/dialog/expression/date-format-picker.d.ts

@@ -0,0 +1,14 @@
+import React from 'react';
+interface DateRangeFormatPickerProps {
+    value?: string[];
+    format?: string;
+    onChange?: (val: string[], format?: string) => void;
+}
+export declare const DateRangeFormatPicker: React.FC<DateRangeFormatPickerProps>;
+interface DateFormatPickerProps {
+    value?: string;
+    format?: string;
+    onChange?: (val: string, format?: string) => void;
+}
+export declare const DateFormatPicker: React.FC<DateFormatPickerProps>;
+export {};

package/lib/es/components/dialog/expression/date-format-picker.js

@@ -0,0 +1,211 @@
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useState, useEffect } from 'react';
+import { DatePicker, Select } from '@gingkoo/pandora';
+import dayjs from 'dayjs';
+var RangePicker = DatePicker.RangePicker,
+  YearPicker = DatePicker.YearPicker,
+  MonthPicker = DatePicker.MonthPicker;
+var DATE_FORMAT_OPTIONS = [{
+  value: 'YYYY',
+  label: 'YYYY'
+}, {
+  value: 'YYYY-MM',
+  label: 'YYYY-MM'
+}, {
+  value: 'YYYY-MM-DD',
+  label: 'YYYY-MM-DD'
+}, {
+  value: 'YYYY-MM-DD HH:mm',
+  label: 'YYYY-MM-DD HH:mm'
+}, {
+  value: 'YYYY/MM',
+  label: 'YYYY/MM'
+}, {
+  value: 'YYYY/MM/DD',
+  label: 'YYYY/MM/DD'
+}, {
+  value: 'YYYY/MM/DD HH:mm',
+  label: 'YYYY/MM/DD HH:mm'
+}];
+var DEFAULT_FORMAT = 'YYYY-MM-DD HH:mm';
+export var DateRangeFormatPicker = function DateRangeFormatPicker(_ref) {
+  var value = _ref.value,
+    format = _ref.format,
+    onChange = _ref.onChange;
+  var _useState = useState(format || DEFAULT_FORMAT),
+    _useState2 = _slicedToArray(_useState, 2),
+    currentFormat = _useState2[0],
+    setCurrentFormat = _useState2[1];
+  useEffect(function () {
+    if (format) {
+      setCurrentFormat(format);
+    }
+  }, [format]);
+  var showTime = currentFormat.includes('HH:mm');
+  // 根据格式确定 RangePicker 的 mode
+  var getRangePickerMode = function getRangePickerMode() {
+    if (currentFormat === 'YYYY') return 'year';
+    if (currentFormat === 'YYYY-MM' || currentFormat === 'YYYY/MM') return 'month';
+    return 'date';
+  };
+  var handleFormatChange = function handleFormatChange(newFormat) {
+    // 切换格式时，用新格式重新格式化当前值
+    if (value && value.length > 0) {
+      var formattedValues = value.map(function (v) {
+        if (!v) return '';
+        var parsed = dayjs(v);
+        if (!parsed.isValid()) return '';
+        return parsed.format(newFormat);
+      });
+      // 只调用 onChange，传递新格式化的值和新格式
+      onChange === null || onChange === void 0 || onChange(formattedValues, newFormat);
+    }
+    setCurrentFormat(newFormat);
+  };
+  // 将字符串数组转为 dayjs 对象数组，供 RangePicker 使用
+  var rangeValue = (value === null || value === void 0 ? void 0 : value.map(function (v) {
+    if (!v) return null;
+    // 尝试用当前格式解析，失败则用 dayjs 默认解析
+    var parsed = dayjs(v, currentFormat, true);
+    if (parsed.isValid()) return parsed;
+    // 尝试不用严格模式解析
+    var looseParsed = dayjs(v, currentFormat);
+    if (looseParsed.isValid()) return looseParsed;
+    // 最后尝试不指定格式
+    var anyParsed = dayjs(v);
+    return anyParsed.isValid() ? anyParsed : null;
+  })) || undefined;
+  var handleRangeChange = function handleRangeChange(date, dateString) {
+    // 确保日期值按 currentFormat 格式化
+    var formattedValues = (date === null || date === void 0 ? void 0 : date.map(function (d) {
+      if (!d || !dayjs(d).isValid()) return '';
+      return dayjs(d).format(currentFormat);
+    })) || dateString;
+    onChange === null || onChange === void 0 || onChange(formattedValues, currentFormat);
+  };
+  return _jsxs("div", {
+    style: {
+      display: 'flex',
+      gap: 4
+    },
+    children: [_jsx(Select, {
+      style: {
+        width: 120
+      },
+      value: currentFormat,
+      onChange: handleFormatChange,
+      children: DATE_FORMAT_OPTIONS.map(function (option) {
+        return _jsx(Select.Option, {
+          value: option.value,
+          children: option.label
+        }, option.value);
+      })
+    }), _jsx(RangePicker, {
+      value: rangeValue,
+      onChange: handleRangeChange,
+      style: {
+        flex: 1
+      },
+      format: currentFormat,
+      showTime: showTime,
+      mode: getRangePickerMode()
+    })]
+  });
+};
+export var DateFormatPicker = function DateFormatPicker(_ref2) {
+  var value = _ref2.value,
+    format = _ref2.format,
+    onChange = _ref2.onChange;
+  var _useState3 = useState(format || DEFAULT_FORMAT),
+    _useState4 = _slicedToArray(_useState3, 2),
+    currentFormat = _useState4[0],
+    setCurrentFormat = _useState4[1];
+  useEffect(function () {
+    if (format) {
+      setCurrentFormat(format);
+    }
+  }, [format]);
+  var showTime = currentFormat.includes('HH:mm');
+  var isYearOnly = currentFormat === 'YYYY';
+  var isMonthOnly = currentFormat === 'YYYY-MM' || currentFormat === 'YYYY/MM';
+  var handleFormatChange = function handleFormatChange(newFormat) {
+    // 切换格式时，用新格式重新格式化当前值
+    if (value) {
+      var parsed = dayjs(value);
+      if (parsed.isValid()) {
+        onChange === null || onChange === void 0 || onChange(parsed.format(newFormat), newFormat);
+      }
+    }
+    setCurrentFormat(newFormat);
+  };
+  // 将字符串转为 dayjs 对象，使用宽松解析
+  var dateValue = function () {
+    if (!value) return undefined;
+    var parsed = dayjs(value, currentFormat, true);
+    if (parsed.isValid()) return parsed;
+    var looseParsed = dayjs(value, currentFormat);
+    if (looseParsed.isValid()) return looseParsed;
+    var anyParsed = dayjs(value);
+    return anyParsed.isValid() ? anyParsed : undefined;
+  }();
+  var handleDateChange = function handleDateChange(dateString) {
+    onChange === null || onChange === void 0 || onChange(dateString, currentFormat);
+  };
+  var handleYearChange = function handleYearChange(dateString) {
+    onChange === null || onChange === void 0 || onChange(dateString, currentFormat);
+  };
+  var handleMonthChange = function handleMonthChange(dateString) {
+    onChange === null || onChange === void 0 || onChange(dateString, currentFormat);
+  };
+  // 根据格式渲染不同的选择器
+  var renderPicker = function renderPicker() {
+    if (isYearOnly) {
+      return _jsx(YearPicker, {
+        value: dateValue,
+        onChange: handleYearChange,
+        style: {
+          flex: 1
+        }
+      });
+    }
+    if (isMonthOnly) {
+      return _jsx(MonthPicker, {
+        value: dateValue,
+        onChange: handleMonthChange,
+        style: {
+          flex: 1
+        },
+        format: currentFormat
+      });
+    }
+    return _jsx(DatePicker, {
+      value: dateValue,
+      onChange: handleDateChange,
+      style: {
+        flex: 1
+      },
+      format: currentFormat,
+      showTime: showTime
+    });
+  };
+  return _jsxs("div", {
+    style: {
+      display: 'flex',
+      gap: 4
+    },
+    children: [_jsx(Select, {
+      style: {
+        width: 120
+      },
+      value: currentFormat,
+      onChange: handleFormatChange,
+      children: DATE_FORMAT_OPTIONS.map(function (option) {
+        return _jsx(Select.Option, {
+          value: option.value,
+          children: option.label
+        }, option.value);
+      })
+    }), renderPicker()]
+  });
+};

package/lib/es/components/dialog/expression/date-format.d.ts

@@ -0,0 +1,5 @@
+export declare const DATE_FORMAT_OPTIONS: {
+    value: string;
+    label: string;
+}[];
+export declare const DEFAULT_DATE_FORMAT = "YYYY-MM-DD HH:mm";

package/lib/es/components/dialog/expression/date-format.js

@@ -0,0 +1,20 @@
+export var DATE_FORMAT_OPTIONS = [{
+  value: 'YYYY-MM',
+  label: 'YYYY-MM'
+}, {
+  value: 'YYYY-MM-DD',
+  label: 'YYYY-MM-DD'
+}, {
+  value: 'YYYY-MM-DD HH:mm',
+  label: 'YYYY-MM-DD HH:mm'
+}, {
+  value: 'YYYY/MM',
+  label: 'YYYY/MM'
+}, {
+  value: 'YYYY/MM/DD',
+  label: 'YYYY/MM/DD'
+}, {
+  value: 'YYYY/MM/DD HH:mm',
+  label: 'YYYY/MM/DD HH:mm'
+}];
+export var DEFAULT_DATE_FORMAT = 'YYYY-MM-DD HH:mm';

package/lib/es/components/dialog/expression/index.js

@@ -8,7 +8,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import './index.less';
 import React, { useEffect, useMemo, useState } from 'react';
 import { Repeat, Function } from '@gingkoo/pandora-icons';
-import { Button, Tooltip, Input, Select, InputNumber, Dropdown, DatePicker } from '@gingkoo/pandora';
+import { Button, Tooltip, Input, Select, InputNumber, Dropdown } from '@gingkoo/pandora';
 import cx from 'classnames';
 import { ChevronODown } from '@gingkoo/pandora-icons';
 import moment from 'dayjs';
@@ -23,7 +23,7 @@ import { useStore } from '../../../hooks/use-provider';
 import cloneDeep from 'lodash/cloneDeep';
 import { getConstantLabel } from '../formula-list/utils';
 import ItemName from '../../modules/components/item-name';
-var RangePicker = DatePicker.RangePicker;
+import { DateFormatPicker, DateRangeFormatPicker } from './date-format-picker';
 var NUMBER_LIST = ['等于', '不等于', '大于', '小于', '介于之间', '大于或等于', '小于或等于', '为空', '不为空', '以...开始', '以...结束', '不以...开始', '不以...结束', 'In', 'Not In', '正则匹配'];
 var STRING_LIST = ['等于', '不等于', '包含', '不包含', '为空', '不为空', '以...开始', '以...结束', '不以...开始', '不以...结束', 'In', 'Not In', '正则匹配'];
 var DATE_LIST = [
@@ -386,23 +386,21 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
         });
       }
       if (type === SQL_GROUP_TYPE.DATE) {
-        return _jsx("div", {
-          children: _jsx(RangePicker, {
-            showTime: {
-              format: 'HH:mm'
-            },
-            format: 'YYYY-MM-DD HH:mm',
-            className: 'w_300',
-            // @ts-ignore
-            value: firstVal ? [moment(firstVal !== null && firstVal !== void 0 ? firstVal : undefined), moment(secondVal !== null && secondVal !== void 0 ? secondVal : undefined)] : [],
-            onChange: function onChange(val) {
-              // @ts-ignore
-              val && setRhsVal([{
+        var _rhsVal$, _rhsVal$2;
+        var dateVal = ((_rhsVal$ = rhsVal[0]) === null || _rhsVal$ === void 0 ? void 0 : _rhsVal$.type) === AtomsTypeEnum.INPUT_STRING_LIST ? rhsVal[0].val : undefined;
+        var dateFormat = ((_rhsVal$2 = rhsVal[0]) === null || _rhsVal$2 === void 0 ? void 0 : _rhsVal$2.type) === AtomsTypeEnum.INPUT_STRING_LIST ? rhsVal[0].format : undefined;
+        return _jsx(DateRangeFormatPicker, {
+          value: dateVal,
+          format: dateFormat,
+          onChange: function onChange(val, format) {
+            if (val) {
+              setRhsVal([{
                 type: AtomsTypeEnum.INPUT_STRING_LIST,
-                val: [moment(val[0]).format('YYYY-MM-DD HH:mm'), moment(val[1]).format('YYYY-MM-DD HH:mm')]
+                val: val,
+                format: format
               }]);
             }
-          })
+          }
         });
       }
     } else if (conditionText === '当前') {
@@ -487,58 +485,50 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
         })]
       });
     } else if (~['早于', '晚于', '在'].indexOf(conditionText)) {
-      return _jsx("div", {
-        children: _jsx(DatePicker, {
-          showTime: {
-            format: 'HH:mm'
-          },
-          format: 'YYYY-MM-DD HH:mm',
-          className: 'w_300',
-          value: firstVal ? moment(firstVal) : '',
-          onChange: function onChange(val) {
-            if (val) {
-              setRhsVal([{
-                type: AtomsTypeEnum.INPUT_STRING,
-                val: moment(val).format('YYYY-MM-DD HH:mm')
-              }
-              // {
-              //   type: AtomsTypeEnum.INPUT_STRING,
-              //   val: moment(val).format('YYYY-MM-DD HH:mm'),
-              // },
-              ]);
-            } else {
-              setRhsVal([{
-                val: '',
-                type: AtomsTypeEnum.INPUT_STRING
-              }]);
-              // setVal([]);
-            }
+      var _rhsVal$3, _rhsVal$4;
+      var _dateVal = ((_rhsVal$3 = rhsVal[0]) === null || _rhsVal$3 === void 0 ? void 0 : _rhsVal$3.type) === AtomsTypeEnum.INPUT_STRING ? rhsVal[0].val : undefined;
+      var _dateFormat = ((_rhsVal$4 = rhsVal[0]) === null || _rhsVal$4 === void 0 ? void 0 : _rhsVal$4.type) === AtomsTypeEnum.INPUT_STRING ? rhsVal[0].format : undefined;
+      return _jsx(DateFormatPicker, {
+        value: _dateVal,
+        format: _dateFormat,
+        onChange: function onChange(val, format) {
+          if (val) {
+            setRhsVal([{
+              type: AtomsTypeEnum.INPUT_STRING,
+              val: val,
+              format: format
+            }]);
+          } else {
+            setRhsVal([{
+              val: '',
+              type: AtomsTypeEnum.INPUT_STRING,
+              format: format
+            }]);
           }
-        })
+        }
       });
     } else if (~['等于'].indexOf(conditionText) && type === SQL_GROUP_TYPE.DATE) {
-      return _jsx("div", {
-        children: _jsx(DatePicker, {
-          showTime: {
-            format: 'HH:mm'
-          },
-          format: 'YYYY-MM-DD HH:mm',
-          className: 'w_300',
-          value: firstVal ? moment(firstVal) : '',
-          onChange: function onChange(val) {
-            if (val) {
-              setRhsVal([{
-                type: AtomsTypeEnum.INPUT_STRING,
-                val: moment(val).format('YYYY-MM-DD HH:mm')
-              }]);
-            } else {
-              setRhsVal([{
-                val: '',
-                type: AtomsTypeEnum.INPUT_STRING
-              }]);
-            }
+      var _rhsVal$5, _rhsVal$6;
+      var _dateVal2 = ((_rhsVal$5 = rhsVal[0]) === null || _rhsVal$5 === void 0 ? void 0 : _rhsVal$5.type) === AtomsTypeEnum.INPUT_STRING ? rhsVal[0].val : undefined;
+      var _dateFormat2 = ((_rhsVal$6 = rhsVal[0]) === null || _rhsVal$6 === void 0 ? void 0 : _rhsVal$6.type) === AtomsTypeEnum.INPUT_STRING ? rhsVal[0].format : undefined;
+      return _jsx(DateFormatPicker, {
+        value: _dateVal2,
+        format: _dateFormat2,
+        onChange: function onChange(val, format) {
+          if (val) {
+            setRhsVal([{
+              type: AtomsTypeEnum.INPUT_STRING,
+              val: val,
+              format: format
+            }]);
+          } else {
+            setRhsVal([{
+              val: '',
+              type: AtomsTypeEnum.INPUT_STRING,
+              format: format
+            }]);
           }
-        })
+        }
       });
     } else if (~['In', 'Not In'].indexOf(conditionText)) {
       var options = firstVal ? firstVal.split(',') : [];
@@ -921,7 +911,8 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
     } else if (~['介于之间'].indexOf(_condition)) {
       setRhsVal([{
         val: ['', ''],
-        type: AtomsTypeEnum.INPUT_STRING_LIST
+        type: AtomsTypeEnum.INPUT_STRING_LIST,
+        format: 'YYYY-MM-DD HH:mm'
       }]);
     } else if (~['当前'].indexOf(_condition)) {
       setRhsVal([{
@@ -931,7 +922,8 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
     } else if (~['早于', '晚于', '在'].indexOf(_condition)) {
       setRhsVal([{
         val: moment().format('YYYY-MM-DD HH:mm'),
-        type: AtomsTypeEnum.INPUT_STRING
+        type: AtomsTypeEnum.INPUT_STRING,
+        format: 'YYYY-MM-DD HH:mm'
       }]);
     } else {
       setRhsVal([{

package/lib/es/components/modules/custom-column.js

@@ -247,7 +247,7 @@ var CustomColumn = function CustomColumn(props) {
             },
             onOk: function onOk(_data) {
               var data = _objectSpread(_objectSpread({}, _data), {}, {
-                uuid: _data.uuid || uuidv4('custom')
+                fieldUuid: _data.fieldUuid || uuidv4('field')
               });
               if (i === -1) {
                 newMeta[index].customColumn.push(data);

package/lib/es/store/types.d.ts

@@ -107,10 +107,12 @@ export interface AtomsField {
 export interface AtomsInputString {
     val: string;
     type: AtomsTypeEnum.INPUT_STRING;
+    format?: string;
 }
 export interface AtomsInputStringList {
     val: string[];
     type: AtomsTypeEnum.INPUT_STRING_LIST;
+    format?: string;
 }
 export interface AtomsInputNumberList {
     val: number[];
@@ -223,6 +225,7 @@ export interface MetaJoin {
 export interface MetaCustom_Item {
     name: string;
     id?: string;
+    fieldUuid: string;
     type?: string;
     formulaList?: AtomsItem[];
 }

package/lib/es/utils.js

@@ -112,7 +112,9 @@ export var getSubColumns = function getSubColumns(metaList) {
     metaKey: -1,
     type: TypeEnum.customColumn,
     customColumn: [{
-      name: '' // 用户起的别名
+      name: '',
+      // 用户起的别名
+      fieldUuid: ''
       // formula: '', // 公式}];
     }]
   };
@@ -231,7 +233,7 @@ export var getSubColumns = function getSubColumns(metaList) {
             name: v.name,
             select: true,
             fieldAlias: '',
-            fieldUuid: uuidv4('field')
+            fieldUuid: v.fieldUuid || uuidv4('field')
           };
         });
         return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gingkoo/pandora-metabase",
-  "version": "1.0.103",
+  "version": "1.0.105",
   "description": "",
   "main": "lib/es/index.js",
   "module": "lib/es/index.js",