@zscreate/form-component 1.1.55 → 1.1.56

package/dist/form-component.umd.js

@@ -62943,7 +62943,7 @@ module.exports = /******/function (modules) {
 /* harmony import */ var _util_mathUtils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(38);
 /* harmony import */ var _util_util__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(6955);
 /* harmony import */ var _layoutItem__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(8660);
-/* harmony import */ var _components_index__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(8353);
+/* harmony import */ var _components_index__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(3363);
 /* harmony import */ var pubsub_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(9616);
 /* harmony import */ var pubsub_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(pubsub_js__WEBPACK_IMPORTED_MODULE_4__);
 /* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(7203);
@@ -63500,7 +63500,7 @@ module.exports = /******/function (modules) {
 
 "use strict";
 /* harmony import */ var _common_CorrectionModal__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(899);
-/* harmony import */ var _components_index__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(8353);
+/* harmony import */ var _components_index__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(3363);
 /* harmony import */ var pubsub_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(9616);
 /* harmony import */ var pubsub_js__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(pubsub_js__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var lodash__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(1925);
@@ -66946,7 +66946,7 @@ module.exports = {
 
 /***/ }),
 
-/***/ 8353:
+/***/ 3363:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -99431,8 +99431,8 @@ var DepartSelector_widgetDesign_component = (0,componentNormalizer/* default */.
   widgetSetup: DepartSelector_widgetSetup,
   widgetDesign: DepartSelector_widgetDesign
 });
-;// 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/loaders/templateLoader.js??ruleSet[1].rules[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=template&id=41c85a88&scoped=true&
-var componentvue_type_template_id_41c85a88_scoped_true_render = function render() {
+;// 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/loaders/templateLoader.js??ruleSet[1].rules[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=template&id=3ea38358&scoped=true&
+var componentvue_type_template_id_3ea38358_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _vm.widget ? _c('div', {
@@ -99478,6 +99478,9 @@ var componentvue_type_template_id_41c85a88_scoped_true_render = function render(
         zIndex: '2'
       },
       "placeholder": _vm.widget.options.isRange == true ? _vm.widget.options.startPlaceholder : _vm.widget.options.placeholder,
+      "disabledHours": _vm.disabledStartHours,
+      "disabledMinutes": _vm.disabledStartMinutes,
+      "disabledSeconds": _vm.disabledStartSeconds,
       "format": _vm.widget.options.format,
       "disabled": _vm.isdisabled ? _vm.show : _vm.widget.options.disabled,
       "valueFormat": _vm.widget.options.format,
@@ -99500,9 +99503,9 @@ var componentvue_type_template_id_41c85a88_scoped_true_render = function render(
       "popupStyle": {
         zIndex: '2'
       },
-      "disabledHours": _vm.getDisabledHours,
-      "disabledMinutes": _vm.getDisabledMinutes,
-      "disabledSeconds": _vm.getDisabledSeconds,
+      "disabledHours": _vm.disabledEndHours,
+      "disabledMinutes": _vm.disabledEndMinutes,
+      "disabledSeconds": _vm.disabledEndSeconds,
       "format": _vm.widget.options.format,
       "valueFormat": _vm.widget.options.format,
       "placeholder": _vm.widget.options.endPlaceholder ? _vm.widget.options.endPlaceholder : _vm.widget.options.placeholder,
@@ -99530,9 +99533,9 @@ var componentvue_type_template_id_41c85a88_scoped_true_render = function render(
       "slot": "label"
     },
     slot: "label"
-  }, [_vm._v(_vm._s(_vm.widget.name))])], 2)], 1) : _vm._e();
+  }, [_vm._v(_vm._s(_vm.widget.name) + " ")])], 2)], 1) : _vm._e();
 };
-var componentvue_type_template_id_41c85a88_scoped_true_staticRenderFns = [];
+var componentvue_type_template_id_3ea38358_scoped_true_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/_moment@2.29.4@moment/moment.js
 var moment = __webpack_require__(62);
@@ -99584,6 +99587,7 @@ var moment_default = /*#__PURE__*/__webpack_require__.n(moment);
 
 
 
+
 /* harmony default export */ var Time_componentvue_type_script_lang_js_ = ({
   name: "timeCom",
   mixins: [widgetMixins/* default */.Z, compareSizeMixins],
@@ -99628,6 +99632,86 @@ var moment_default = /*#__PURE__*/__webpack_require__.n(moment);
     }
   },
   methods: {
+    //获取不可选择的小时
+    disabledStartHours() {
+      if (this.endTime) {
+        let hours = [];
+        let hour = moment_default()(this.endTime, 'HH:mm:ss').hour();
+        for (let i = hour + 1; i < 24; i++) {
+          hours.push(i);
+        }
+        return hours;
+      }
+    },
+    //获取不可选择的分钟
+    disabledStartMinutes(selectedHour) {
+      if (this.endTime) {
+        let minutes = [];
+        let hour = moment_default()(this.endTime, 'HH:mm:ss').hour();
+        let minute = moment_default()(this.endTime, 'HH:mm:ss').minute();
+        if (selectedHour === hour) {
+          for (let i = minute + 1; i < 60; i++) {
+            minutes.push(i);
+          }
+        }
+        return minutes;
+      }
+    },
+    //获取不可选择的秒
+    disabledStartSeconds(selectedHour, selectedMinute) {
+      if (this.endTime) {
+        let seconds = [];
+        let hour = moment_default()(this.endTime, 'HH:mm:ss').hour();
+        let minute = moment_default()(this.endTime, 'HH:mm:ss').minute();
+        let second = moment_default()(this.endTime, 'HH:mm:ss').second();
+        if (selectedHour === hour && selectedMinute === minute) {
+          for (let i = second + 1; i < 60; i++) {
+            seconds.push(i);
+          }
+        }
+        return seconds;
+      }
+    },
+    //获取不可选择的小时
+    disabledEndHours() {
+      if (this.startTime) {
+        let hours = [];
+        let hour = moment_default()(this.startTime, 'HH:mm:ss').hour();
+        for (let i = 0; i < hour; i++) {
+          hours.push(i);
+        }
+        return hours;
+      }
+    },
+    //获取不可选择的分钟
+    disabledEndMinutes(selectedHour) {
+      if (this.startTime) {
+        let minutes = [];
+        let hour = moment_default()(this.startTime, 'HH:mm:ss').hour();
+        let minute = moment_default()(this.startTime, 'HH:mm:ss').minute();
+        if (selectedHour === hour) {
+          for (let i = 0; i < minute; i++) {
+            minutes.push(i);
+          }
+        }
+        return minutes;
+      }
+    },
+    //获取不可选择的秒
+    disabledEndSeconds(selectedHour, selectedMinute) {
+      if (this.startTime) {
+        let seconds = [];
+        let hour = moment_default()(this.startTime, 'HH:mm:ss').hour();
+        let minute = moment_default()(this.startTime, 'HH:mm:ss').minute();
+        let second = moment_default()(this.startTime, 'HH:mm:ss').second();
+        if (selectedHour === hour && selectedMinute === minute) {
+          for (let i = 0; i < second; i++) {
+            seconds.push(i);
+          }
+        }
+        return seconds;
+      }
+    },
     convertToSeconds(timeStr) {
       if (!timeStr) {
         return NaN;
@@ -99645,19 +99729,20 @@ var moment_default = /*#__PURE__*/__webpack_require__.n(moment);
       } else {
         this.time = val;
       }
-      if (['startTime', 'endTime'].includes(type)) {
-        if (this.stime && this.etime) {
-          const stimeSecs = this.convertToSeconds(this.stime);
-          const etimeSecs = this.convertToSeconds(this.etime);
-          if (stimeSecs > etimeSecs) {
-            this.$message.error('开始时间不能大于结束时间');
-            this.dataModel[0] = undefined;
-            this.stime = '';
-            this.startTime = '';
-            return;
-          }
-        }
-      }
+      // if (['startTime', 'endTime'].includes(type)) {
+      //   if (this.stime && this.etime) {
+      //     const stimeSecs = this.convertToSeconds(this.stime)
+      //     const etimeSecs = this.convertToSeconds(this.etime)
+      //     if (stimeSecs > etimeSecs) {
+      //       this.$message.error('开始时间不能大于结束时间')
+      //       this.dataModel[0] = undefined
+      //       this.stime = ''
+      //       this.startTime = ''
+      //       return
+      //     }
+      //   }
+      // }
+
       if (this.widget.options.isRange) {
         val = [this.startTime, this.endTime];
       }
@@ -99714,10 +99799,10 @@ var moment_default = /*#__PURE__*/__webpack_require__.n(moment);
 });
 ;// CONCATENATED MODULE: ./src/form/modules/components/Time/component.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_Time_componentvue_type_script_lang_js_ = (Time_componentvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.7.5@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.7.3@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&
+;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.7.5@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.7.3@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=3ea38358&prod&lang=less&scoped=true&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/form/modules/components/Time/component.vue?vue&type=style&index=0&id=41c85a88&prod&lang=less&scoped=true&
+;// CONCATENATED MODULE: ./src/form/modules/components/Time/component.vue?vue&type=style&index=0&id=3ea38358&prod&lang=less&scoped=true&
 
 ;// CONCATENATED MODULE: ./src/form/modules/components/Time/component.vue
 
@@ -99730,11 +99815,11 @@ var moment_default = /*#__PURE__*/__webpack_require__.n(moment);
 
 var Time_component_component = (0,componentNormalizer/* default */.Z)(
   components_Time_componentvue_type_script_lang_js_,
-  componentvue_type_template_id_41c85a88_scoped_true_render,
-  componentvue_type_template_id_41c85a88_scoped_true_staticRenderFns,
+  componentvue_type_template_id_3ea38358_scoped_true_render,
+  componentvue_type_template_id_3ea38358_scoped_true_staticRenderFns,
   false,
   null,
-  "41c85a88",
+  "3ea38358",
   null
   
 )
@@ -106900,7 +106985,7 @@ var CorrectionItemvue_type_template_id_4d910d38_scoped_true_render = function re
 var CorrectionItemvue_type_template_id_4d910d38_scoped_true_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./src/form/modules/components/index.js + 800 modules
-var components = __webpack_require__(8353);
+var components = __webpack_require__(3363);
 ;// 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&
 
 /* harmony default export */ var CorrectionItemvue_type_script_lang_js_ = ({
@@ -109016,7 +109101,7 @@ var vuedraggable_umd_default = /*#__PURE__*/__webpack_require__.n(vuedraggable_u
 // EXTERNAL MODULE: ./src/api/manage.js
 var manage = __webpack_require__(1474);
 // EXTERNAL MODULE: ./src/form/modules/components/index.js + 800 modules
-var components = __webpack_require__(8353);
+var components = __webpack_require__(3363);
 // EXTERNAL MODULE: ./src/form/util/Bus.js
 var Bus = __webpack_require__(767);
 // EXTERNAL MODULE: ./src/form/modules/config/hnkj.js
@@ -109324,7 +109409,7 @@ module.exports = __WEBPACK_EXTERNAL_MODULE__7203__;
 /***/ (function(module) {
 
 "use strict";
-module.exports = {"i8":"1.1.55"};
+module.exports = {"i8":"1.1.56"};
 
 /***/ })
 
@@ -111879,7 +111964,7 @@ var es_array_push = __webpack_require__(2445);
 // EXTERNAL MODULE: ./src/form/util/util.js
 var util = __webpack_require__(6955);
 // EXTERNAL MODULE: ./src/form/modules/components/index.js + 800 modules
-var components = __webpack_require__(8353);
+var components = __webpack_require__(3363);
 // EXTERNAL MODULE: ./src/api/manage.js
 var manage = __webpack_require__(1474);
 // EXTERNAL MODULE: ./src/form/modules/widgetFormItem.vue + 6 modules

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zscreate/form-component",
-  "version": "1.1.55",
+  "version": "1.1.56",
   "private": false,
   "description": "",
   "main": "dist/form-component.umd.js",