@byteluck-fe/model-driven-controls 6.2.0-jeecg-2 → 6.2.0-jeecg-4

package/dist/esm/formControls/DatePicker/designer.js

@@ -201,6 +201,10 @@ _define_property(DatePickerControl, "setting", [
         key: 'date-type',
         visible: true
     },
+    {
+        key: 'custom-date-format',
+        visible: true
+    },
     {
         key: 'date-common-time-setting',
         visible: true

package/dist/esm/formControls/DatePicker/property.js

@@ -93,7 +93,8 @@ var DatePickerProperty = /*#__PURE__*/ function(BaseControlProperty) {
         _define_property(_this, "allowDateRange", void 0 // 允许选中多个日期范围
         ), _define_property(_this, "filterWeekend", void 0 // 是否过滤周末
         ), _define_property(_this, "isInternational", void 0 //是否国际化
-        ), _define_property(_this, "isCustomDateFormat", void 0 //是否使用自定义日期类型
+        ), _define_property(_this, "isShowCustomDateFormat", void 0 //是否使用自定义格式化显示时间
+        ), _define_property(_this, "customDateFormat", void 0 //自定义格式化显示时间
         );
         var _props_dateType;
         _this.dateType = (_props_dateType = props === null || props === void 0 ? void 0 : props.dateType) !== null && _props_dateType !== void 0 ? _props_dateType : DateType.DATE;
@@ -123,8 +124,10 @@ var DatePickerProperty = /*#__PURE__*/ function(BaseControlProperty) {
         _this.filterWeekend = (_props_filterWeekend = props === null || props === void 0 ? void 0 : props.filterWeekend) !== null && _props_filterWeekend !== void 0 ? _props_filterWeekend : false;
         var _props_isInternational;
         _this.isInternational = (_props_isInternational = props === null || props === void 0 ? void 0 : props.isInternational) !== null && _props_isInternational !== void 0 ? _props_isInternational : false;
-        var _props_isCustomDateFormat;
-        _this.isCustomDateFormat = (_props_isCustomDateFormat = props === null || props === void 0 ? void 0 : props.isCustomDateFormat) !== null && _props_isCustomDateFormat !== void 0 ? _props_isCustomDateFormat : false;
+        var _props_isShowCustomDateFormat;
+        _this.isShowCustomDateFormat = (_props_isShowCustomDateFormat = props === null || props === void 0 ? void 0 : props.isShowCustomDateFormat) !== null && _props_isShowCustomDateFormat !== void 0 ? _props_isShowCustomDateFormat : false;
+        var _props_customDateFormat;
+        _this.customDateFormat = (_props_customDateFormat = props === null || props === void 0 ? void 0 : props.customDateFormat) !== null && _props_customDateFormat !== void 0 ? _props_customDateFormat : '';
         return _this;
     }
     return DatePickerProperty;