@zscreate/form-component 1.1.52 → 1.1.54

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/dist/form-component.css +15 -12
  2. package/dist/form-component.umd-report.html +2 -2
  3. package/dist/form-component.umd.js +98 -42
  4. package/package.json +3 -2
package/dist/form-component.umd.js CHANGED
@@ -62877,7 +62877,7 @@ module.exports = /******/function (modules) {
62877
62877
  /* harmony import */ var _util_mathUtils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(38);
62878
62878
  /* harmony import */ var _util_util__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(6955);
62879
62879
  /* harmony import */ var _layoutItem__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(9395);
62880
- /* harmony import */ var _components_index__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(5014);
62880
+ /* harmony import */ var _components_index__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(840);
62881
62881
  /* harmony import */ var pubsub_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(9616);
62882
62882
  /* harmony import */ var pubsub_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(pubsub_js__WEBPACK_IMPORTED_MODULE_4__);
62883
62883
  /* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(7203);
@@ -63806,7 +63806,7 @@ module.exports = /******/function (modules) {
63806
63806
 
63807
63807
  "use strict";
63808
63808
  /* harmony import */ var _common_CorrectionModal__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(9678);
63809
- /* harmony import */ var _components_index__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(5014);
63809
+ /* harmony import */ var _components_index__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(840);
63810
63810
  /* harmony import */ var pubsub_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(9616);
63811
63811
  /* harmony import */ var pubsub_js__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(pubsub_js__WEBPACK_IMPORTED_MODULE_2__);
63812
63812
  /* harmony import */ var lodash__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(1925);
@@ -68054,7 +68054,7 @@ module.exports = {
68054
68054
 
68055
68055
  /***/ }),
68056
68056
 
68057
- /***/ 5014:
68057
+ /***/ 840:
68058
68058
  /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
68059
68059
 
68060
68060
  "use strict";
@@ -73761,8 +73761,8 @@ var Radio_widgetDesign_component = (0,componentNormalizer/* default */.Z)(
73761
73761
  widgetSetup: Radio_widgetSetup,
73762
73762
  widgetDesign: Radio_widgetDesign
73763
73763
  });
73764
- ;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Checkbox/component.vue?vue&type=template&id=53f51db7&
73765
- var componentvue_type_template_id_53f51db7_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.widget)?_c('div',{staticClass:"custom_form_item",style:({ height: _vm.widget.options.height + 'px' })},[_c('a-form-model-item',{ref:_vm.widget.model,attrs:{"colon":false,"label-col":_vm.labelCol,"wrapperCol":_vm.wrapperCol,"prop":_vm.tableKey ? (_vm.tableKey + "." + _vm.tableIndex + "." + (_vm.widget.model)) : _vm.widget.model,"rules":_vm.tableKey ? _vm.rules[_vm.tableKey][_vm.widget.model] : _vm.rules[_vm.widget.model]}},[_c('a-checkbox-group',{staticStyle:{"width":"100%"},attrs:{"disabled":_vm.isdisabled ? _vm.show : _vm.widget.options.disabled,"placeholder":_vm.widget.options.placeholder},on:{"change":_vm.onChange},nativeOn:{"click":function($event){return _vm.handleClick.apply(null, arguments)}},model:{value:(_vm.dataModel),callback:function ($$v) {_vm.dataModel=$$v},expression:"dataModel"}},[(_vm.widget.options.inline == true)?_vm._l((_vm.dictOptions),function(item,index){return _c('a-checkbox',{key:index,style:({
73764
+ ;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Checkbox/component.vue?vue&type=template&id=4315ff18&
73765
+ var componentvue_type_template_id_4315ff18_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.widget)?_c('div',{staticClass:"custom_form_item",style:({ height: _vm.widget.options.height + 'px' })},[_c('a-form-model-item',{ref:_vm.widget.model,attrs:{"colon":false,"label-col":_vm.labelCol,"wrapperCol":_vm.wrapperCol,"prop":_vm.tableKey ? (_vm.tableKey + "." + _vm.tableIndex + "." + (_vm.widget.model)) : _vm.widget.model,"rules":_vm.tableKey ? _vm.rules[_vm.tableKey][_vm.widget.model] : _vm.rules[_vm.widget.model]}},[_c('a-checkbox-group',{staticStyle:{"width":"100%"},attrs:{"disabled":_vm.isdisabled ? _vm.show : _vm.widget.options.disabled,"placeholder":_vm.widget.options.placeholder},on:{"change":_vm.onChange},nativeOn:{"click":function($event){return _vm.handleClick.apply(null, arguments)}},model:{value:(_vm.dataModel),callback:function ($$v) {_vm.dataModel=$$v},expression:"dataModel"}},[(_vm.widget.options.inline == true)?_vm._l((_vm.dictOptions),function(item,index){return _c('a-checkbox',{key:index,style:({
73766
73766
  display: 'inline-block',
73767
73767
  }),attrs:{"value":item.value}},[_vm._v(_vm._s(item.text))])}):_vm._e(),(_vm.widget.options.inline == false)?_vm._l((_vm.dictOptions),function(item,index){return _c('a-checkbox',{key:index,style:({
73768
73768
  display: 'block',
@@ -73771,7 +73771,7 @@ var componentvue_type_template_id_53f51db7_render = function () {var _vm=this;va
73771
73771
  _vm.config.validate === true && _vm.widget.options.required === true
73772
73772
  ? 'is_required'
73773
73773
  : 'no_required' ],style:({ color: this.config.color }),attrs:{"slot":"label"},slot:"label"},[_vm._v(" "+_vm._s(_vm.widget.name)+" ")]):_vm._e()],1)],1):_vm._e()}
73774
- var componentvue_type_template_id_53f51db7_staticRenderFns = []
73774
+ var componentvue_type_template_id_4315ff18_staticRenderFns = []
73775
73775
 
73776
73776
 
73777
73777
  ;// CONCATENATED MODULE: ./node_modules/_thread-loader@3.0.4@thread-loader/dist/cjs.js!./node_modules/_babel-loader@8.3.0@babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Checkbox/component.vue?vue&type=script&lang=js&
@@ -73937,10 +73937,10 @@ var componentvue_type_template_id_53f51db7_staticRenderFns = []
73937
73937
  });
73938
73938
  ;// CONCATENATED MODULE: ./src/form/modules/components/Checkbox/component.vue?vue&type=script&lang=js&
73939
73939
  /* harmony default export */ var components_Checkbox_componentvue_type_script_lang_js_ = (Checkbox_componentvue_type_script_lang_js_);
73940
- ;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.7.6@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/_css-loader@6.8.1@css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Checkbox/component.vue?vue&type=style&index=0&id=53f51db7&prod&lang=css&
73940
+ ;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.7.6@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/_css-loader@6.8.1@css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Checkbox/component.vue?vue&type=style&index=0&id=4315ff18&prod&lang=css&
73941
73941
  // extracted by mini-css-extract-plugin
73942
73942
 
73943
- ;// CONCATENATED MODULE: ./src/form/modules/components/Checkbox/component.vue?vue&type=style&index=0&id=53f51db7&prod&lang=css&
73943
+ ;// CONCATENATED MODULE: ./src/form/modules/components/Checkbox/component.vue?vue&type=style&index=0&id=4315ff18&prod&lang=css&
73944
73944
 
73945
73945
  ;// CONCATENATED MODULE: ./src/form/modules/components/Checkbox/component.vue
73946
73946
 
@@ -73953,8 +73953,8 @@ var componentvue_type_template_id_53f51db7_staticRenderFns = []
73953
73953
 
73954
73954
  var Checkbox_component_component = (0,componentNormalizer/* default */.Z)(
73955
73955
  components_Checkbox_componentvue_type_script_lang_js_,
73956
- componentvue_type_template_id_53f51db7_render,
73957
- componentvue_type_template_id_53f51db7_staticRenderFns,
73956
+ componentvue_type_template_id_4315ff18_render,
73957
+ componentvue_type_template_id_4315ff18_staticRenderFns,
73958
73958
  false,
73959
73959
  null,
73960
73960
  null,
@@ -99060,8 +99060,8 @@ var DepartSelector_widgetDesign_component = (0,componentNormalizer/* default */.
99060
99060
  widgetSetup: DepartSelector_widgetSetup,
99061
99061
  widgetDesign: DepartSelector_widgetDesign
99062
99062
  });
99063
- ;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Time/component.vue?vue&type=template&id=7b600990&scoped=true&
99064
- var componentvue_type_template_id_7b600990_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.widget)?_c('div',{staticClass:"custom_form_item",style:({ height: _vm.widget.options.height + 'px' })},[_c('a-form-model-item',{ref:_vm.widget.model,attrs:{"colon":false,"label-col":_vm.labelCol,"wrapperCol":_vm.wrapperCol,"prop":_vm.tableKey ? (_vm.tableKey + "." + _vm.tableIndex + "." + (_vm.widget.model)) : _vm.widget.model,"rules":_vm.tableKey ? _vm.rules[_vm.tableKey][_vm.widget.model] : _vm.rules[_vm.widget.model]}},[(!_vm.widget.options.isRange)?[_c('a-time-picker',{attrs:{"popupStyle":{
99063
+ ;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Time/component.vue?vue&type=template&id=41c85a88&scoped=true&
99064
+ var componentvue_type_template_id_41c85a88_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.widget)?_c('div',{staticClass:"custom_form_item",style:({ height: _vm.widget.options.height + 'px' })},[_c('a-form-model-item',{ref:_vm.widget.model,attrs:{"colon":false,"label-col":_vm.labelCol,"wrapperCol":_vm.wrapperCol,"prop":_vm.tableKey ? (_vm.tableKey + "." + _vm.tableIndex + "." + (_vm.widget.model)) : _vm.widget.model,"rules":_vm.tableKey ? _vm.rules[_vm.tableKey][_vm.widget.model] : _vm.rules[_vm.widget.model]}},[(!_vm.widget.options.isRange)?[_c('a-time-picker',{attrs:{"popupStyle":{
99065
99065
  zIndex:'2'
99066
99066
  },"disabled":_vm.isdisabled ? _vm.show : _vm.widget.options.disabled,"placeholder":_vm.widget.options.placeholder,"format":_vm.widget.options.format,"valueFormat":_vm.widget.options.format,"getPopupContainer":function (triggerNode) {
99067
99067
  return triggerNode.parentNode.parentNode || _vm.document.body;
@@ -99081,7 +99081,7 @@ var componentvue_type_template_id_7b600990_scoped_true_render = function () {var
99081
99081
  _vm.config.validate === true && _vm.widget.options.required === true
99082
99082
  ? 'is_required'
99083
99083
  : 'no_required' ],style:({ color: this.config.color }),attrs:{"slot":"label"},slot:"label"},[_vm._v(_vm._s(_vm.widget.name))])],2)],1):_vm._e()}
99084
- var componentvue_type_template_id_7b600990_scoped_true_staticRenderFns = []
99084
+ var componentvue_type_template_id_41c85a88_scoped_true_staticRenderFns = []
99085
99085
 
99086
99086
 
99087
99087
  // EXTERNAL MODULE: ./node_modules/_moment@2.29.4@moment/moment.js
@@ -99271,6 +99271,13 @@ var moment_default = /*#__PURE__*/__webpack_require__.n(moment);
99271
99271
  }
99272
99272
  },
99273
99273
  methods: {
99274
+ convertToSeconds(timeStr) {
99275
+ if (!timeStr) {
99276
+ return NaN;
99277
+ }
99278
+ const [hours = 0, minutes = 0, seconds = 0] = timeStr.split(':').map(Number);
99279
+ return hours * 3600 + minutes * 60 + seconds;
99280
+ },
99274
99281
  changeTime(val, dateStrings, type) {
99275
99282
  if (type === "startTime") {
99276
99283
  this.startTime = dateStrings;
@@ -99281,6 +99288,19 @@ var moment_default = /*#__PURE__*/__webpack_require__.n(moment);
99281
99288
  } else {
99282
99289
  this.time = val;
99283
99290
  }
99291
+ if (['startTime', 'endTime'].includes(type)) {
99292
+ if (this.stime && this.etime) {
99293
+ const stimeSecs = this.convertToSeconds(this.stime);
99294
+ const etimeSecs = this.convertToSeconds(this.etime);
99295
+ if (stimeSecs > etimeSecs) {
99296
+ this.$message.error('开始时间不能大于结束时间');
99297
+ this.dataModel[0] = undefined;
99298
+ this.stime = '';
99299
+ this.startTime = '';
99300
+ return;
99301
+ }
99302
+ }
99303
+ }
99284
99304
  if (this.widget.options.isRange) {
99285
99305
  val = [this.startTime, this.endTime];
99286
99306
  }
@@ -99337,10 +99357,10 @@ var moment_default = /*#__PURE__*/__webpack_require__.n(moment);
99337
99357
  });
99338
99358
  ;// CONCATENATED MODULE: ./src/form/modules/components/Time/component.vue?vue&type=script&lang=js&
99339
99359
  /* harmony default export */ var components_Time_componentvue_type_script_lang_js_ = (Time_componentvue_type_script_lang_js_);
99340
- ;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.7.6@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.8.1@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Time/component.vue?vue&type=style&index=0&id=7b600990&prod&lang=less&scoped=true&
99360
+ ;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.7.6@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.8.1@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Time/component.vue?vue&type=style&index=0&id=41c85a88&prod&lang=less&scoped=true&
99341
99361
  // extracted by mini-css-extract-plugin
99342
99362
 
99343
- ;// CONCATENATED MODULE: ./src/form/modules/components/Time/component.vue?vue&type=style&index=0&id=7b600990&prod&lang=less&scoped=true&
99363
+ ;// CONCATENATED MODULE: ./src/form/modules/components/Time/component.vue?vue&type=style&index=0&id=41c85a88&prod&lang=less&scoped=true&
99344
99364
 
99345
99365
  ;// CONCATENATED MODULE: ./src/form/modules/components/Time/component.vue
99346
99366
 
@@ -99353,19 +99373,19 @@ var moment_default = /*#__PURE__*/__webpack_require__.n(moment);
99353
99373
 
99354
99374
  var Time_component_component = (0,componentNormalizer/* default */.Z)(
99355
99375
  components_Time_componentvue_type_script_lang_js_,
99356
- componentvue_type_template_id_7b600990_scoped_true_render,
99357
- componentvue_type_template_id_7b600990_scoped_true_staticRenderFns,
99376
+ componentvue_type_template_id_41c85a88_scoped_true_render,
99377
+ componentvue_type_template_id_41c85a88_scoped_true_staticRenderFns,
99358
99378
  false,
99359
99379
  null,
99360
- "7b600990",
99380
+ "41c85a88",
99361
99381
  null
99362
99382
 
99363
99383
  )
99364
99384
 
99365
99385
  /* harmony default export */ var Time_component = (Time_component_component.exports);
99366
- ;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Time/widgetSetup.vue?vue&type=template&id=dbf71284&scoped=true&
99367
- var widgetSetupvue_type_template_id_dbf71284_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"control"},[_c('div',{staticClass:"form_wrap"},[_c('div',{staticClass:"form"},[_c('a-form-model',[_c('a-form-model-item',{ref:"isRange",attrs:{"label":"是否为范围选择","prop":"isRange"}},[_c('a-switch',{model:{value:(_vm.widget.options.isRange),callback:function ($$v) {_vm.$set(_vm.widget.options, "isRange", $$v)},expression:"widget.options.isRange"}})],1),(_vm.widget.options.isRange == true)?_c('a-form-model-item',{ref:"startPlaceholder",attrs:{"label":"开始时间占位内容：","prop":"startPlaceholder"}},[_c('a-input',{model:{value:(_vm.widget.options.startPlaceholder),callback:function ($$v) {_vm.$set(_vm.widget.options, "startPlaceholder", $$v)},expression:"widget.options.startPlaceholder"}})],1):_vm._e(),(_vm.widget.options.isRange == true)?_c('a-form-model-item',{ref:"endPlaceholder",attrs:{"label":"结束时间占位内容：","prop":"endPlaceholder"}},[_c('a-input',{model:{value:(_vm.widget.options.endPlaceholder),callback:function ($$v) {_vm.$set(_vm.widget.options, "endPlaceholder", $$v)},expression:"widget.options.endPlaceholder"}})],1):_vm._e(),_c('a-form-model-item',{ref:"format",attrs:{"label":"格式","prop":"format"}},[_c('a-input',{model:{value:(_vm.widget.options.format),callback:function ($$v) {_vm.$set(_vm.widget.options, "format", $$v)},expression:"widget.options.format"}})],1),_c('a-form-model-item',{ref:"title",attrs:{"label":"默认值","prop":"title"}},[_c('a-time-picker',{attrs:{"format":_vm.widget.options.format},on:{"change":_vm.onChangeone},model:{value:(_vm.valueone),callback:function ($$v) {_vm.valueone=$$v},expression:"valueone"}}),(_vm.widget.options.isRange == true)?_c('span',[_vm._v(" - ")]):_vm._e(),(_vm.widget.options.isRange)?_c('a-time-picker',{attrs:{"format":_vm.widget.options.format},on:{"change":_vm.onChangetwo},model:{value:(_vm.valuetwo),callback:function ($$v) {_vm.valuetwo=$$v},expression:"valuetwo"}}):_vm._e()],1)],1)],1),_c('form-data-bind-modal',{ref:"formDataBindModal",on:{"okSubStr":_vm.okSubStr}}),_c('relate-sub-modal',{ref:"relateSubModal",attrs:{"datalist":_vm.datalist,"widget":_vm.widget},on:{"okSubStr":_vm.okSubStr}})],1)])}
99368
- var widgetSetupvue_type_template_id_dbf71284_scoped_true_staticRenderFns = []
99386
+ ;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Time/widgetSetup.vue?vue&type=template&id=eac7a476&scoped=true&
99387
+ var widgetSetupvue_type_template_id_eac7a476_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"control"},[_c('div',{staticClass:"form_wrap"},[_c('div',{staticClass:"form"},[_c('a-form-model',[_c('a-form-model-item',{ref:"isRange",attrs:{"label":"是否为范围选择","prop":"isRange"}},[_c('a-switch',{model:{value:(_vm.widget.options.isRange),callback:function ($$v) {_vm.$set(_vm.widget.options, "isRange", $$v)},expression:"widget.options.isRange"}})],1),(_vm.widget.options.isRange == true)?_c('a-form-model-item',{ref:"startPlaceholder",attrs:{"label":"开始时间占位内容：","prop":"startPlaceholder"}},[_c('a-input',{model:{value:(_vm.widget.options.startPlaceholder),callback:function ($$v) {_vm.$set(_vm.widget.options, "startPlaceholder", $$v)},expression:"widget.options.startPlaceholder"}})],1):_vm._e(),(_vm.widget.options.isRange == true)?_c('a-form-model-item',{ref:"endPlaceholder",attrs:{"label":"结束时间占位内容：","prop":"endPlaceholder"}},[_c('a-input',{model:{value:(_vm.widget.options.endPlaceholder),callback:function ($$v) {_vm.$set(_vm.widget.options, "endPlaceholder", $$v)},expression:"widget.options.endPlaceholder"}})],1):_vm._e(),_c('a-form-model-item',{ref:"format",attrs:{"label":"格式","prop":"format"}},[_c('a-input',{model:{value:(_vm.widget.options.format),callback:function ($$v) {_vm.$set(_vm.widget.options, "format", $$v)},expression:"widget.options.format"}})],1),_c('a-form-model-item',{ref:"title",attrs:{"label":"默认值","prop":"title"}},[_c('a-time-picker',{attrs:{"format":_vm.widget.options.format},on:{"change":_vm.onChangeone},model:{value:(_vm.valueone),callback:function ($$v) {_vm.valueone=$$v},expression:"valueone"}}),(_vm.widget.options.isRange == true)?_c('span',[_vm._v(" - ")]):_vm._e(),(_vm.widget.options.isRange)?_c('a-time-picker',{attrs:{"format":_vm.widget.options.format},on:{"change":_vm.onChangetwo},model:{value:(_vm.valuetwo),callback:function ($$v) {_vm.valuetwo=$$v},expression:"valuetwo"}}):_vm._e()],1)],1)],1),_c('form-data-bind-modal',{ref:"formDataBindModal",on:{"okSubStr":_vm.okSubStr}}),_c('relate-sub-modal',{ref:"relateSubModal",attrs:{"datalist":_vm.datalist,"widget":_vm.widget},on:{"okSubStr":_vm.okSubStr}})],1)])}
99388
+ var widgetSetupvue_type_template_id_eac7a476_scoped_true_staticRenderFns = []
99369
99389
 
99370
99390
 
99371
99391
  ;// CONCATENATED MODULE: ./node_modules/_thread-loader@3.0.4@thread-loader/dist/cjs.js!./node_modules/_babel-loader@8.3.0@babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Time/widgetSetup.vue?vue&type=script&lang=js&
@@ -99496,6 +99516,24 @@ var widgetSetupvue_type_template_id_dbf71284_scoped_true_staticRenderFns = []
99496
99516
  }
99497
99517
  }
99498
99518
  },
99519
+ convertToSeconds(timeStr) {
99520
+ if (!timeStr) {
99521
+ return NaN;
99522
+ }
99523
+ const [hours = 0, minutes = 0, seconds = 0] = timeStr.split(':').map(Number);
99524
+ return hours * 3600 + minutes * 60 + seconds;
99525
+ },
99526
+ checkRangeTime() {
99527
+ const [stime, etime] = this.widget.options.defaultValue;
99528
+ const stimeSecs = this.convertToSeconds(stime);
99529
+ const etimeSecs = this.convertToSeconds(etime);
99530
+ if (stimeSecs > etimeSecs) {
99531
+ this.$message.error('开始时间不能大于结束时间');
99532
+ this.valueone = undefined;
99533
+ this.widget.options.defaultValue[0] = undefined;
99534
+ return;
99535
+ }
99536
+ },
99499
99537
  onChangeone(time, timeString) {
99500
99538
  if (!this.widget.options.format) {
99501
99539
  this.widget.options.format = "HH:mm:ss";
@@ -99503,12 +99541,14 @@ var widgetSetupvue_type_template_id_dbf71284_scoped_true_staticRenderFns = []
99503
99541
  console.log(time, timeString);
99504
99542
  if (this.widget.options.isRange) {
99505
99543
  this.widget.options.defaultValue[0] = timeString;
99544
+ this.checkRangeTime();
99506
99545
  } else {
99507
99546
  this.widget.options.defaultValue = timeString;
99508
99547
  }
99509
99548
  },
99510
99549
  onChangetwo(time, timeString) {
99511
99550
  this.widget.options.defaultValue[1] = timeString;
99551
+ this.checkRangeTime();
99512
99552
  },
99513
99553
  showModal() {
99514
99554
  Bus/* default */.Z.$emit("getWidgetFormList");
@@ -99527,21 +99567,27 @@ var widgetSetupvue_type_template_id_dbf71284_scoped_true_staticRenderFns = []
99527
99567
  });
99528
99568
  ;// CONCATENATED MODULE: ./src/form/modules/components/Time/widgetSetup.vue?vue&type=script&lang=js&
99529
99569
  /* harmony default export */ var components_Time_widgetSetupvue_type_script_lang_js_ = (Time_widgetSetupvue_type_script_lang_js_);
99570
+ ;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.7.6@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.8.1@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Time/widgetSetup.vue?vue&type=style&index=0&id=eac7a476&prod&lang=less&scoped=true&
99571
+ // extracted by mini-css-extract-plugin
99572
+
99573
+ ;// CONCATENATED MODULE: ./src/form/modules/components/Time/widgetSetup.vue?vue&type=style&index=0&id=eac7a476&prod&lang=less&scoped=true&
99574
+
99530
99575
  ;// CONCATENATED MODULE: ./src/form/modules/components/Time/widgetSetup.vue
99531
99576
 
99532
99577
 
99533
99578
 
99579
+ ;
99534
99580
 
99535
99581
 
99536
99582
  /* normalize component */
99537
- ;
99583
+
99538
99584
  var Time_widgetSetup_component = (0,componentNormalizer/* default */.Z)(
99539
99585
  components_Time_widgetSetupvue_type_script_lang_js_,
99540
- widgetSetupvue_type_template_id_dbf71284_scoped_true_render,
99541
- widgetSetupvue_type_template_id_dbf71284_scoped_true_staticRenderFns,
99586
+ widgetSetupvue_type_template_id_eac7a476_scoped_true_render,
99587
+ widgetSetupvue_type_template_id_eac7a476_scoped_true_staticRenderFns,
99542
99588
  false,
99543
99589
  null,
99544
- "dbf71284",
99590
+ "eac7a476",
99545
99591
  null
99546
99592
 
99547
99593
  )
@@ -99768,12 +99814,12 @@ var Time_widgetDesign_component = (0,componentNormalizer/* default */.Z)(
99768
99814
  widgetSetup: Time_widgetSetup,
99769
99815
  widgetDesign: Time_widgetDesign
99770
99816
  });
99771
- ;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Date/component.vue?vue&type=template&id=349afc51&scoped=true&
99772
- var componentvue_type_template_id_349afc51_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.widget)?_c('div',{staticClass:"custom_form_item",style:({ height: _vm.widget.options.height + 'px' })},[_c('a-form-model-item',{ref:_vm.widget.model,attrs:{"colon":false,"label-col":_vm.labelCol,"wrapperCol":_vm.wrapperCol,"prop":_vm.tableKey ? (_vm.tableKey + "." + _vm.tableIndex + "." + (_vm.widget.model)) : _vm.widget.model,"rules":_vm.tableKey ? _vm.rules[_vm.tableKey][_vm.widget.model] : _vm.rules[_vm.widget.model]}},[(_vm.widget.options.type == 'date')?_c('a-date-picker',{attrs:{"popupStyle":{
99817
+ ;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Date/component.vue?vue&type=template&id=6e76a405&scoped=true&
99818
+ var componentvue_type_template_id_6e76a405_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.widget)?_c('div',{staticClass:"custom_form_item",style:({ height: _vm.widget.options.height + 'px' })},[_c('a-form-model-item',{ref:_vm.widget.model,attrs:{"colon":false,"label-col":_vm.labelCol,"wrapperCol":_vm.wrapperCol,"prop":_vm.tableKey ? (_vm.tableKey + "." + _vm.tableIndex + "." + (_vm.widget.model)) : _vm.widget.model,"rules":_vm.tableKey ? _vm.rules[_vm.tableKey][_vm.widget.model] : _vm.rules[_vm.widget.model]}},[(_vm.widget.options.type == 'date')?_c('a-date-picker',{attrs:{"popupStyle":{
99773
99819
  zIndex: '2',
99774
99820
  },"valueFormat":_vm.widget.options.format,"format":_vm.widget.options.format,"placeholder":_vm.widget.options.placeholder,"disabled":_vm.isdisabled ? _vm.show : _vm.widget.options.disabled,"getCalendarContainer":function (triggerNode) {
99775
99821
  return triggerNode.parentNode || _vm.document.body;
99776
- },"show-time":""},on:{"openChange":_vm.changeIsClickByUser,"change":_vm.onDateChange},model:{value:(_vm.dataModel),callback:function ($$v) {_vm.dataModel=$$v},expression:"dataModel"}}):_vm._e(),(_vm.widget.options.type == 'week')?_c('a-week-picker',{attrs:{"popupStyle":{
99822
+ },"show-time":_vm.hasTime(_vm.widget.options.format)},on:{"openChange":_vm.changeIsClickByUser,"change":_vm.onDateChange},model:{value:(_vm.dataModel),callback:function ($$v) {_vm.dataModel=$$v},expression:"dataModel"}}):_vm._e(),(_vm.widget.options.type == 'week')?_c('a-week-picker',{attrs:{"popupStyle":{
99777
99823
  zIndex: '2',
99778
99824
  },"valueFormat":_vm.widget.options.format,"format":_vm.widget.options.format,"placeholder":_vm.widget.options.placeholder,"disabled":_vm.isdisabled ? _vm.show : _vm.widget.options.disabled,"getCalendarContainer":function (triggerNode) {
99779
99825
  return triggerNode.parentNode || _vm.document.body;
@@ -99783,14 +99829,14 @@ var componentvue_type_template_id_349afc51_scoped_true_render = function () {var
99783
99829
  return triggerNode.parentNode || _vm.document.body;
99784
99830
  }},on:{"change":_vm.onDateChange},model:{value:(_vm.dataModel),callback:function ($$v) {_vm.dataModel=$$v},expression:"dataModel"}}):_vm._e(),(_vm.widget.options.type == 'range')?_c('a-range-picker',{attrs:{"popupStyle":{
99785
99831
  zIndex: '2',
99786
- },"valueFormat":_vm.widget.options.format,"disabled":_vm.isdisabled ? _vm.show : _vm.widget.options.disabled,"show-time":"","placeholder":_vm.widget.options.rangeplaceholder,"getCalendarContainer":function (triggerNode) {
99832
+ },"valueFormat":_vm.widget.options.format,"disabled":_vm.isdisabled ? _vm.show : _vm.widget.options.disabled,"show-time":_vm.hasTime(_vm.widget.options.format),"placeholder":_vm.widget.options.rangeplaceholder,"getCalendarContainer":function (triggerNode) {
99787
99833
  return triggerNode.parentNode || _vm.document.body;
99788
99834
  }},on:{"change":_vm.onDateChange},model:{value:(_vm.dataModel),callback:function ($$v) {_vm.dataModel=$$v},expression:"dataModel"}}):_vm._e(),(_vm.widget.options.labelWidth !== 0)?_c('div',{class:[
99789
99835
  _vm.config.align,
99790
99836
  _vm.config.validate === true && _vm.widget.options.required === true
99791
99837
  ? 'is_required'
99792
99838
  : 'no_required' ],style:({ color: this.config.color }),attrs:{"slot":"label"},slot:"label"},[_vm._v(" "+_vm._s(_vm.widget.name)+" ")]):_vm._e()],1)],1):_vm._e()}
99793
- var componentvue_type_template_id_349afc51_scoped_true_staticRenderFns = []
99839
+ var componentvue_type_template_id_6e76a405_scoped_true_staticRenderFns = []
99794
99840
 
99795
99841
 
99796
99842
  ;// CONCATENATED MODULE: ./node_modules/_thread-loader@3.0.4@thread-loader/dist/cjs.js!./node_modules/_babel-loader@8.3.0@babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Date/component.vue?vue&type=script&lang=js&
@@ -99898,6 +99944,7 @@ var componentvue_type_template_id_349afc51_scoped_true_staticRenderFns = []
99898
99944
 
99899
99945
 
99900
99946
 
99947
+
99901
99948
  /* harmony default export */ var Date_componentvue_type_script_lang_js_ = ({
99902
99949
  name: 'datePicker',
99903
99950
  mixins: [widgetMixins/* default */.Z, compareSizeMixins],
@@ -99928,6 +99975,15 @@ var componentvue_type_template_id_349afc51_scoped_true_staticRenderFns = []
99928
99975
  }
99929
99976
  },
99930
99977
  methods: {
99978
+ hasTime(format) {
99979
+ const dateTimeStr = "2023-06-28 00:00:01";
99980
+ const momentObj = moment_default()(dateTimeStr, String(format).trim());
99981
+ if (momentObj.isSame(momentObj.clone().startOf('day'))) {
99982
+ return false;
99983
+ } else {
99984
+ return true;
99985
+ }
99986
+ },
99931
99987
  onDateChange(val) {
99932
99988
  if (this.tableKey) {
99933
99989
  this.models[this.tableKey][this.tableIndex][this.widget.model] = val;
@@ -99946,10 +100002,10 @@ var componentvue_type_template_id_349afc51_scoped_true_staticRenderFns = []
99946
100002
  });
99947
100003
  ;// CONCATENATED MODULE: ./src/form/modules/components/Date/component.vue?vue&type=script&lang=js&
99948
100004
  /* harmony default export */ var components_Date_componentvue_type_script_lang_js_ = (Date_componentvue_type_script_lang_js_);
99949
- ;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.7.6@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.8.1@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Date/component.vue?vue&type=style&index=0&id=349afc51&prod&lang=less&scoped=true&
100005
+ ;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.7.6@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.8.1@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.10.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/Date/component.vue?vue&type=style&index=0&id=6e76a405&prod&lang=less&scoped=true&
99950
100006
  // extracted by mini-css-extract-plugin
99951
100007
 
99952
- ;// CONCATENATED MODULE: ./src/form/modules/components/Date/component.vue?vue&type=style&index=0&id=349afc51&prod&lang=less&scoped=true&
100008
+ ;// CONCATENATED MODULE: ./src/form/modules/components/Date/component.vue?vue&type=style&index=0&id=6e76a405&prod&lang=less&scoped=true&
99953
100009
 
99954
100010
  ;// CONCATENATED MODULE: ./src/form/modules/components/Date/component.vue
99955
100011
 
@@ -99962,11 +100018,11 @@ var componentvue_type_template_id_349afc51_scoped_true_staticRenderFns = []
99962
100018
 
99963
100019
  var Date_component_component = (0,componentNormalizer/* default */.Z)(
99964
100020
  components_Date_componentvue_type_script_lang_js_,
99965
- componentvue_type_template_id_349afc51_scoped_true_render,
99966
- componentvue_type_template_id_349afc51_scoped_true_staticRenderFns,
100021
+ componentvue_type_template_id_6e76a405_scoped_true_render,
100022
+ componentvue_type_template_id_6e76a405_scoped_true_staticRenderFns,
99967
100023
  false,
99968
100024
  null,
99969
- "349afc51",
100025
+ "6e76a405",
99970
100026
  null
99971
100027
 
99972
100028
  )
@@ -105703,8 +105759,8 @@ var CorrectionItemvue_type_template_id_4d910d38_scoped_true_render = function ()
105703
105759
  var CorrectionItemvue_type_template_id_4d910d38_scoped_true_staticRenderFns = []
105704
105760
 
105705
105761
 
105706
- // EXTERNAL MODULE: ./src/form/modules/components/index.js + 798 modules
105707
- var components = __webpack_require__(5014);
105762
+ // EXTERNAL MODULE: ./src/form/modules/components/index.js + 800 modules
105763
+ var components = __webpack_require__(840);
105708
105764
  ;// CONCATENATED MODULE: ./node_modules/_thread-loader@3.0.4@thread-loader/dist/cjs.js!./node_modules/_babel-loader@8.3.0@babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/_vue-loader@15.10.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/Modals/CorrectionItem.vue?vue&type=script&lang=js&
105709
105765
  //
105710
105766
  //
@@ -107154,8 +107210,8 @@ var vuedraggable_umd = __webpack_require__(6507);
107154
107210
  var vuedraggable_umd_default = /*#__PURE__*/__webpack_require__.n(vuedraggable_umd);
107155
107211
  // EXTERNAL MODULE: ./src/api/manage.js
107156
107212
  var manage = __webpack_require__(1474);
107157
- // EXTERNAL MODULE: ./src/form/modules/components/index.js + 798 modules
107158
- var components = __webpack_require__(5014);
107213
+ // EXTERNAL MODULE: ./src/form/modules/components/index.js + 800 modules
107214
+ var components = __webpack_require__(840);
107159
107215
  // EXTERNAL MODULE: ./src/form/util/Bus.js
107160
107216
  var Bus = __webpack_require__(767);
107161
107217
  // EXTERNAL MODULE: ./src/form/modules/config/hnkj.js
@@ -107763,7 +107819,7 @@ module.exports = __WEBPACK_EXTERNAL_MODULE__7203__;
107763
107819
  /***/ (function(module) {
107764
107820
 
107765
107821
  "use strict";
107766
- module.exports = {"i8":"1.1.52"};
107822
+ module.exports = {"i8":"1.1.54"};
107767
107823
 
107768
107824
  /***/ })
107769
107825
 
@@ -109257,8 +109313,8 @@ var widgetFormvue_type_template_id_7e2230f3_scoped_true_staticRenderFns = []
109257
109313
  var es_array_push = __webpack_require__(6903);
109258
109314
  // EXTERNAL MODULE: ./src/form/util/util.js
109259
109315
  var util = __webpack_require__(6955);
109260
- // EXTERNAL MODULE: ./src/form/modules/components/index.js + 798 modules
109261
- var components = __webpack_require__(5014);
109316
+ // EXTERNAL MODULE: ./src/form/modules/components/index.js + 800 modules
109317
+ var components = __webpack_require__(840);
109262
109318
  // EXTERNAL MODULE: ./src/api/manage.js
109263
109319
  var manage = __webpack_require__(1474);
109264
109320
  // EXTERNAL MODULE: ./src/form/modules/widgetFormItem.vue + 6 modules
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zscreate/form-component",
3
- "version": "1.1.52",
3
+ "version": "1.1.54",
4
4
  "private": false,
5
5
  "description": "",
6
6
  "main": "dist/form-component.umd.js",
@@ -8,7 +8,8 @@
8
8
  "scripts": {
9
9
  "build": "vue-cli-service build --target lib --name form-component src/main.js --formats umd --report",
10
10
  "build:common": "vue-cli-service build --target lib --name form-component src/main.js --formats commonjs --report",
11
- "build:watch": "vue-cli-service build --target lib --name form-component src/main.js --formats umd --watch"
11
+ "build:watch": "vue-cli-service build --target lib --name form-component src/main.js --formats umd --watch",
12
+ "serve": "vue-cli-service serve --target lib --name form-component src/main.js --formats umd "
12
13
  },
13
14
  "publishConfig": {
14
15
  "access": "public",