ecinc-cloud-mappaio 9.6.172 → 9.6.174

package/lib/ecmappaio.common.js

@@ -798,7 +798,7 @@ function convertToRoute(h5app) {
 
 /***/ }),
 
-/***/ 5197:
+/***/ 7578:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -7300,7 +7300,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".table-search .search_out_div[data-v-7
 
 /***/ }),
 
-/***/ 9400:
+/***/ 7338:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -7314,7 +7314,7 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".advancedSearch-selectTime .selectTime[data-v-13fe0b0a]{color:#666;font-size:12px;position:relative}.advancedSearch-selectTime .selectTime .timeinner[data-v-13fe0b0a]{line-height:30px;float:left;width:100%;text-align:center}.advancedSearch-selectTime .selectTime .timebox[data-v-13fe0b0a]{position:relative}.advancedSearch-selectTime .selectTime .timebox input[data-v-13fe0b0a]{padding:4px 10px;border:1px solid #ebedf0;line-height:20px;-webkit-box-sizing:border-box;box-sizing:border-box;width:100%}.advancedSearch-selectTime .selectTime .timebox[data-v-13fe0b0a] .van-icon{position:absolute;right:0;line-height:30px;width:30px;text-align:center}.block_select .radio-type[data-v-13fe0b0a]{padding:0 5px;line-height:32px;background:#f7f8fa;color:#666;font-size:12px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden;word-break:break-all;text-align:center;border-radius:3px}.block_select .wfTypeKey[data-v-13fe0b0a]{background:#1689fa;color:#fff}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".advancedSearch-selectTime .selectTime[data-v-3a85bb58]{color:#666;font-size:12px;position:relative}.advancedSearch-selectTime .selectTime .timeinner[data-v-3a85bb58]{line-height:30px;float:left;width:100%;text-align:center}.advancedSearch-selectTime .selectTime .timebox[data-v-3a85bb58]{position:relative}.advancedSearch-selectTime .selectTime .timebox input[data-v-3a85bb58]{padding:4px 10px;border:1px solid #ebedf0;line-height:20px;-webkit-box-sizing:border-box;box-sizing:border-box;width:100%}.advancedSearch-selectTime .selectTime .timebox[data-v-3a85bb58] .van-icon{position:absolute;right:0;line-height:30px;width:30px;text-align:center}.block_select .radio-type[data-v-3a85bb58]{padding:0 5px;line-height:32px;background:#f7f8fa;color:#666;font-size:12px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden;word-break:break-all;text-align:center;border-radius:3px}.block_select .wfTypeKey[data-v-3a85bb58]{background:#1689fa;color:#fff}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -34298,19 +34298,19 @@ var update = add("1b057ae9", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 2706:
+/***/ 4852:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(9400);
+var content = __webpack_require__(7338);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(9548)/* ["default"] */ .A)
-var update = add("fb854dce", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("dcf7637a", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -36297,7 +36297,7 @@ webpackContext.id = 9326;
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 var map = {
-	"./user.js": 5197
+	"./user.js": 7578
 };
 
 
@@ -50353,8 +50353,8 @@ var Searchvue_type_template_id_7908bea2_scoped_true_render = function render() {
 };
 var Searchvue_type_template_id_7908bea2_scoped_true_staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/DataTable/src/components/SearchField.vue?vue&type=template&id=13fe0b0a&scoped=true
-var SearchFieldvue_type_template_id_13fe0b0a_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/DataTable/src/components/SearchField.vue?vue&type=template&id=3a85bb58&scoped=true
+var SearchFieldvue_type_template_id_3a85bb58_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', [_vm.searchColumn.listAdvSearchElement === 'input' ? _c('input-field', {
@@ -50571,7 +50571,7 @@ var SearchFieldvue_type_template_id_13fe0b0a_scoped_true_render = function rende
     }
   })], 1) : _vm._e()] : _vm._e()], 2) : _vm._e()], 1);
 };
-var SearchFieldvue_type_template_id_13fe0b0a_scoped_true_staticRenderFns = [];
+var SearchFieldvue_type_template_id_3a85bb58_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/DataTable/src/components/SearchField.vue?vue&type=script&lang=js
 var SearchFieldvue_type_script_lang_js_moment = __webpack_require__(5093);
@@ -50748,7 +50748,17 @@ var SearchFieldvue_type_script_lang_js_moment = __webpack_require__(5093);
     },
     submitForm: function submitForm(val) {
       var moment = __webpack_require__(5093);
-      this.searchMap[this.searchColumn.timeType] = moment(val).format('YYYY-MM-DD HH:mm:ss');
+      var startKey = this.searchColumn.field + '_START';
+      var endKey = this.searchColumn.field + '_END';
+      var selectValue = moment(val).format('YYYY-MM-DD HH:mm:ss');
+      var isSelectStart = this.searchColumn.timeType.indexOf('START') > -1;
+      var startValue = isSelectStart ? selectValue : this.searchMap[startKey];
+      var endValue = isSelectStart ? this.searchMap[endKey] : selectValue;
+      if (startValue && endValue && moment(startValue).isAfter(moment(endValue))) {
+        this.$toast(this.$tx('ecmapp.common.startTimeNotAfterEndTime', '开始时间不能晚于结束时间'));
+        return;
+      }
+      this.searchMap[this.searchColumn.timeType] = selectValue;
       if (this.searchColumn.timeType.indexOf('START') > -1) {
         this.timeStart = moment(val).format(this.timeformat);
       } else {
@@ -50773,9 +50783,9 @@ var SearchFieldvue_type_script_lang_js_moment = __webpack_require__(5093);
 });
 ;// CONCATENATED MODULE: ./packages/ecmapp/DataTable/src/components/SearchField.vue?vue&type=script&lang=js
  /* harmony default export */ var components_SearchFieldvue_type_script_lang_js = (SearchFieldvue_type_script_lang_js); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/DataTable/src/components/SearchField.vue?vue&type=style&index=0&id=13fe0b0a&prod&scoped=true&lang=scss
-var SearchFieldvue_type_style_index_0_id_13fe0b0a_prod_scoped_true_lang_scss = __webpack_require__(2706);
-;// CONCATENATED MODULE: ./packages/ecmapp/DataTable/src/components/SearchField.vue?vue&type=style&index=0&id=13fe0b0a&prod&scoped=true&lang=scss
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/DataTable/src/components/SearchField.vue?vue&type=style&index=0&id=3a85bb58&prod&scoped=true&lang=scss
+var SearchFieldvue_type_style_index_0_id_3a85bb58_prod_scoped_true_lang_scss = __webpack_require__(4852);
+;// CONCATENATED MODULE: ./packages/ecmapp/DataTable/src/components/SearchField.vue?vue&type=style&index=0&id=3a85bb58&prod&scoped=true&lang=scss
 
 ;// CONCATENATED MODULE: ./packages/ecmapp/DataTable/src/components/SearchField.vue
 
@@ -50788,11 +50798,11 @@ var SearchFieldvue_type_style_index_0_id_13fe0b0a_prod_scoped_true_lang_scss = _
 
 var SearchField_component = (0,componentNormalizer/* default */.A)(
   components_SearchFieldvue_type_script_lang_js,
-  SearchFieldvue_type_template_id_13fe0b0a_scoped_true_render,
-  SearchFieldvue_type_template_id_13fe0b0a_scoped_true_staticRenderFns,
+  SearchFieldvue_type_template_id_3a85bb58_scoped_true_render,
+  SearchFieldvue_type_template_id_3a85bb58_scoped_true_staticRenderFns,
   false,
   null,
-  "13fe0b0a",
+  "3a85bb58",
   null
   
 )

package/lib/ecmappaio.umd.js

@@ -7310,7 +7310,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".table-search .search_out_div[data-v-7
 
 /***/ }),
 
-/***/ 6536:
+/***/ 8122:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -7324,7 +7324,7 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".advancedSearch-selectTime .selectTime[data-v-13fe0b0a]{color:#666;font-size:12px;position:relative}.advancedSearch-selectTime .selectTime .timeinner[data-v-13fe0b0a]{line-height:30px;float:left;width:100%;text-align:center}.advancedSearch-selectTime .selectTime .timebox[data-v-13fe0b0a]{position:relative}.advancedSearch-selectTime .selectTime .timebox input[data-v-13fe0b0a]{padding:4px 10px;border:1px solid #ebedf0;line-height:20px;-webkit-box-sizing:border-box;box-sizing:border-box;width:100%}.advancedSearch-selectTime .selectTime .timebox[data-v-13fe0b0a] .van-icon{position:absolute;right:0;line-height:30px;width:30px;text-align:center}.block_select .radio-type[data-v-13fe0b0a]{padding:0 5px;line-height:32px;background:#f7f8fa;color:#666;font-size:12px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden;word-break:break-all;text-align:center;border-radius:3px}.block_select .wfTypeKey[data-v-13fe0b0a]{background:#1689fa;color:#fff}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".advancedSearch-selectTime .selectTime[data-v-3a85bb58]{color:#666;font-size:12px;position:relative}.advancedSearch-selectTime .selectTime .timeinner[data-v-3a85bb58]{line-height:30px;float:left;width:100%;text-align:center}.advancedSearch-selectTime .selectTime .timebox[data-v-3a85bb58]{position:relative}.advancedSearch-selectTime .selectTime .timebox input[data-v-3a85bb58]{padding:4px 10px;border:1px solid #ebedf0;line-height:20px;-webkit-box-sizing:border-box;box-sizing:border-box;width:100%}.advancedSearch-selectTime .selectTime .timebox[data-v-3a85bb58] .van-icon{position:absolute;right:0;line-height:30px;width:30px;text-align:center}.block_select .radio-type[data-v-3a85bb58]{padding:0 5px;line-height:32px;background:#f7f8fa;color:#666;font-size:12px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden;word-break:break-all;text-align:center;border-radius:3px}.block_select .wfTypeKey[data-v-3a85bb58]{background:#1689fa;color:#fff}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -34308,19 +34308,19 @@ var update = add("bd8ff32e", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 5300:
+/***/ 8438:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(6536);
+var content = __webpack_require__(8122);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(9548)/* ["default"] */ .A)
-var update = add("11578499", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("209e79c3", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -50363,8 +50363,8 @@ var Searchvue_type_template_id_7908bea2_scoped_true_render = function render() {
 };
 var Searchvue_type_template_id_7908bea2_scoped_true_staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/DataTable/src/components/SearchField.vue?vue&type=template&id=13fe0b0a&scoped=true
-var SearchFieldvue_type_template_id_13fe0b0a_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/DataTable/src/components/SearchField.vue?vue&type=template&id=3a85bb58&scoped=true
+var SearchFieldvue_type_template_id_3a85bb58_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', [_vm.searchColumn.listAdvSearchElement === 'input' ? _c('input-field', {
@@ -50581,7 +50581,7 @@ var SearchFieldvue_type_template_id_13fe0b0a_scoped_true_render = function rende
     }
   })], 1) : _vm._e()] : _vm._e()], 2) : _vm._e()], 1);
 };
-var SearchFieldvue_type_template_id_13fe0b0a_scoped_true_staticRenderFns = [];
+var SearchFieldvue_type_template_id_3a85bb58_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/DataTable/src/components/SearchField.vue?vue&type=script&lang=js
 var SearchFieldvue_type_script_lang_js_moment = __webpack_require__(5093);
@@ -50758,7 +50758,17 @@ var SearchFieldvue_type_script_lang_js_moment = __webpack_require__(5093);
     },
     submitForm: function submitForm(val) {
       var moment = __webpack_require__(5093);
-      this.searchMap[this.searchColumn.timeType] = moment(val).format('YYYY-MM-DD HH:mm:ss');
+      var startKey = this.searchColumn.field + '_START';
+      var endKey = this.searchColumn.field + '_END';
+      var selectValue = moment(val).format('YYYY-MM-DD HH:mm:ss');
+      var isSelectStart = this.searchColumn.timeType.indexOf('START') > -1;
+      var startValue = isSelectStart ? selectValue : this.searchMap[startKey];
+      var endValue = isSelectStart ? this.searchMap[endKey] : selectValue;
+      if (startValue && endValue && moment(startValue).isAfter(moment(endValue))) {
+        this.$toast(this.$tx('ecmapp.common.startTimeNotAfterEndTime', '开始时间不能晚于结束时间'));
+        return;
+      }
+      this.searchMap[this.searchColumn.timeType] = selectValue;
       if (this.searchColumn.timeType.indexOf('START') > -1) {
         this.timeStart = moment(val).format(this.timeformat);
       } else {
@@ -50783,9 +50793,9 @@ var SearchFieldvue_type_script_lang_js_moment = __webpack_require__(5093);
 });
 ;// CONCATENATED MODULE: ./packages/ecmapp/DataTable/src/components/SearchField.vue?vue&type=script&lang=js
  /* harmony default export */ var components_SearchFieldvue_type_script_lang_js = (SearchFieldvue_type_script_lang_js); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/DataTable/src/components/SearchField.vue?vue&type=style&index=0&id=13fe0b0a&prod&scoped=true&lang=scss
-var SearchFieldvue_type_style_index_0_id_13fe0b0a_prod_scoped_true_lang_scss = __webpack_require__(5300);
-;// CONCATENATED MODULE: ./packages/ecmapp/DataTable/src/components/SearchField.vue?vue&type=style&index=0&id=13fe0b0a&prod&scoped=true&lang=scss
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/DataTable/src/components/SearchField.vue?vue&type=style&index=0&id=3a85bb58&prod&scoped=true&lang=scss
+var SearchFieldvue_type_style_index_0_id_3a85bb58_prod_scoped_true_lang_scss = __webpack_require__(8438);
+;// CONCATENATED MODULE: ./packages/ecmapp/DataTable/src/components/SearchField.vue?vue&type=style&index=0&id=3a85bb58&prod&scoped=true&lang=scss
 
 ;// CONCATENATED MODULE: ./packages/ecmapp/DataTable/src/components/SearchField.vue
 
@@ -50798,11 +50808,11 @@ var SearchFieldvue_type_style_index_0_id_13fe0b0a_prod_scoped_true_lang_scss = _
 
 var SearchField_component = (0,componentNormalizer/* default */.A)(
   components_SearchFieldvue_type_script_lang_js,
-  SearchFieldvue_type_template_id_13fe0b0a_scoped_true_render,
-  SearchFieldvue_type_template_id_13fe0b0a_scoped_true_staticRenderFns,
+  SearchFieldvue_type_template_id_3a85bb58_scoped_true_render,
+  SearchFieldvue_type_template_id_3a85bb58_scoped_true_staticRenderFns,
   false,
   null,
-  "13fe0b0a",
+  "3a85bb58",
   null
   
 )