epx-frame 3.18.2 → 3.18.4

package/lib/form-item.js

@@ -4960,7 +4960,7 @@ ___CSS_LOADER_EXPORT___.push([module.i, ".color::v-deep .el-color-picker.is-disa
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_0___default()(function(i){return i[1]});
 // Module
-___CSS_LOADER_EXPORT___.push([module.i, ".date-picker[data-v-82cb7c2e]{position:relative}.date-picker-range[data-v-82cb7c2e] .el-date-editor{width:240px}.show-label[data-v-82cb7c2e]{position:absolute;top:0;left:0}\n", ""]);
+___CSS_LOADER_EXPORT___.push([module.i, ".date-picker[data-v-34ff61b0]{position:relative}.date-picker-range[data-v-34ff61b0] .el-date-editor{width:240px}.show-label[data-v-34ff61b0]{position:absolute;top:0;left:0}\n", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["a"] = (___CSS_LOADER_EXPORT___);
 
@@ -7615,8 +7615,8 @@ var Color_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var Color = (Color_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/form-item/Date.vue?vue&type=template&id=82cb7c2e&scoped=true
-var Datevue_type_template_id_82cb7c2e_scoped_true_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/form-item/Date.vue?vue&type=template&id=34ff61b0&scoped=true
+var Datevue_type_template_id_34ff61b0_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -7678,7 +7678,7 @@ var Datevue_type_template_id_82cb7c2e_scoped_true_render = function () {
               [
                 _c("van-datetime-picker", {
                   attrs: {
-                    type: "date",
+                    type: _vm.dataType === "month" ? "year-month" : "date",
                     title: _vm.$t("please select a date"),
                     "min-date": _vm.minDate,
                     "max-date": _vm.maxDate,
@@ -7836,11 +7836,11 @@ var Datevue_type_template_id_82cb7c2e_scoped_true_render = function () {
     2
   )
 }
-var Datevue_type_template_id_82cb7c2e_scoped_true_staticRenderFns = []
-Datevue_type_template_id_82cb7c2e_scoped_true_render._withStripped = true
+var Datevue_type_template_id_34ff61b0_scoped_true_staticRenderFns = []
+Datevue_type_template_id_34ff61b0_scoped_true_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/frame/packages/form-item/Date.vue?vue&type=template&id=82cb7c2e&scoped=true
+// CONCATENATED MODULE: ./src/frame/packages/form-item/Date.vue?vue&type=template&id=34ff61b0&scoped=true
 
 // EXTERNAL MODULE: external "core-js/modules/es.string.trim.js"
 var es_string_trim_js_ = __webpack_require__(168);
@@ -8170,7 +8170,7 @@ var es_string_trim_js_ = __webpack_require__(168);
       this.excuteEvent('onBlur');
     },
     confirm: function confirm(v) {
-      this._value = this.$moment(v).format('YYYY-MM-DD');
+      this._value = this.$moment(v).format(this.dataType === 'month' ? 'YYYY-MM' : 'YYYY-MM-DD');
       this.showPicker = false;
     },
     excuteEvent: function excuteEvent(key) {
@@ -8218,24 +8218,24 @@ var es_string_trim_js_ = __webpack_require__(168);
 });
 // CONCATENATED MODULE: ./src/frame/packages/form-item/Date.vue?vue&type=script&lang=js
  /* harmony default export */ var form_item_Datevue_type_script_lang_js = (Datevue_type_script_lang_js); 
-// EXTERNAL MODULE: ./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/form-item/Date.vue?vue&type=style&index=0&id=82cb7c2e&prod&lang=scss&scoped=true
-var Datevue_type_style_index_0_id_82cb7c2e_prod_lang_scss_scoped_true = __webpack_require__(289);
+// EXTERNAL MODULE: ./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/form-item/Date.vue?vue&type=style&index=0&id=34ff61b0&prod&lang=scss&scoped=true
+var Datevue_type_style_index_0_id_34ff61b0_prod_lang_scss_scoped_true = __webpack_require__(289);
 
-// CONCATENATED MODULE: ./node_modules/style-loader/dist/cjs.js!./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/form-item/Date.vue?vue&type=style&index=0&id=82cb7c2e&prod&lang=scss&scoped=true
+// CONCATENATED MODULE: ./node_modules/style-loader/dist/cjs.js!./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/form-item/Date.vue?vue&type=style&index=0&id=34ff61b0&prod&lang=scss&scoped=true
 
             
 
-var Datevue_type_style_index_0_id_82cb7c2e_prod_lang_scss_scoped_true_options = {};
+var Datevue_type_style_index_0_id_34ff61b0_prod_lang_scss_scoped_true_options = {};
 
-Datevue_type_style_index_0_id_82cb7c2e_prod_lang_scss_scoped_true_options.insert = "head";
-Datevue_type_style_index_0_id_82cb7c2e_prod_lang_scss_scoped_true_options.singleton = false;
+Datevue_type_style_index_0_id_34ff61b0_prod_lang_scss_scoped_true_options.insert = "head";
+Datevue_type_style_index_0_id_34ff61b0_prod_lang_scss_scoped_true_options.singleton = false;
 
-var Datevue_type_style_index_0_id_82cb7c2e_prod_lang_scss_scoped_true_update = injectStylesIntoStyleTag_default()(Datevue_type_style_index_0_id_82cb7c2e_prod_lang_scss_scoped_true["a" /* default */], Datevue_type_style_index_0_id_82cb7c2e_prod_lang_scss_scoped_true_options);
+var Datevue_type_style_index_0_id_34ff61b0_prod_lang_scss_scoped_true_update = injectStylesIntoStyleTag_default()(Datevue_type_style_index_0_id_34ff61b0_prod_lang_scss_scoped_true["a" /* default */], Datevue_type_style_index_0_id_34ff61b0_prod_lang_scss_scoped_true_options);
 
 
 
-/* harmony default export */ var form_item_Datevue_type_style_index_0_id_82cb7c2e_prod_lang_scss_scoped_true = (Datevue_type_style_index_0_id_82cb7c2e_prod_lang_scss_scoped_true["a" /* default */].locals || {});
-// CONCATENATED MODULE: ./src/frame/packages/form-item/Date.vue?vue&type=style&index=0&id=82cb7c2e&prod&lang=scss&scoped=true
+/* harmony default export */ var form_item_Datevue_type_style_index_0_id_34ff61b0_prod_lang_scss_scoped_true = (Datevue_type_style_index_0_id_34ff61b0_prod_lang_scss_scoped_true["a" /* default */].locals || {});
+// CONCATENATED MODULE: ./src/frame/packages/form-item/Date.vue?vue&type=style&index=0&id=34ff61b0&prod&lang=scss&scoped=true
 
 // CONCATENATED MODULE: ./src/frame/packages/form-item/Date.vue
 
@@ -8248,11 +8248,11 @@ var Datevue_type_style_index_0_id_82cb7c2e_prod_lang_scss_scoped_true_update = i
 
 var Date_component = Object(componentNormalizer["a" /* default */])(
   form_item_Datevue_type_script_lang_js,
-  Datevue_type_template_id_82cb7c2e_scoped_true_render,
-  Datevue_type_template_id_82cb7c2e_scoped_true_staticRenderFns,
+  Datevue_type_template_id_34ff61b0_scoped_true_render,
+  Datevue_type_template_id_34ff61b0_scoped_true_staticRenderFns,
   false,
   null,
-  "82cb7c2e",
+  "34ff61b0",
   null
   
 )

package/lib/form.js

@@ -2211,7 +2211,7 @@ __webpack_require__.r(__webpack_exports__);
 // EXTERNAL MODULE: external "core-js/modules/es.function.name.js"
 var es_function_name_js_ = __webpack_require__(9);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/form/Form.vue?vue&type=template&id=8679e254
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/form/Form.vue?vue&type=template&id=2f6255f8
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -2363,7 +2363,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/frame/packages/form/Form.vue?vue&type=template&id=8679e254
+// CONCATENATED MODULE: ./src/frame/packages/form/Form.vue?vue&type=template&id=2f6255f8
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/toConsumableArray.js + 3 modules
 var toConsumableArray = __webpack_require__(3);
@@ -3068,13 +3068,14 @@ var component = __webpack_require__(39);
     createTableModel: function createTableModel() {
       var _this7 = this;
       return Object(asyncToGenerator["a" /* default */])( /*#__PURE__*/Object(regeneratorRuntime["a" /* default */])().mark(function _callee3() {
-        var data, tableModel, currentRowIndex, _loop5, i, _i2;
+        var data, tableModel, relyHiddenFields, currentRowIndex, _loop5, i, _i2;
         return Object(regeneratorRuntime["a" /* default */])().wrap(function _callee3$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
               // 判断是否存在依赖字段，依赖字段隐藏
               data = _this7.model.data;
               tableModel = [[]];
+              relyHiddenFields = [];
               _this7.hiddenFields = [];
               currentRowIndex = 0;
               _this7.currentColIndex = 0;
@@ -3102,7 +3103,7 @@ var component = __webpack_require__(39);
                             }) || {};
                             var value = data[field.attriName];
                             // 设置依赖字段的查询条件
-                            if (value || fieldConfigs.state === 'DETAIL') {
+                            if ((value || fieldConfigs.state === 'DETAIL') && !relyHiddenFields.includes(fieldConfigs.attriName)) {
                               _this7.$set(fieldConfigs, 'upId', value);
                               fieldConfigs.state = oldFieldConfigs.state;
                             } else {
@@ -3117,6 +3118,7 @@ var component = __webpack_require__(39);
                             // 如果改变了
                             if (!flag && fieldConfigs.state !== 'SEARCH') {
                               fieldConfigs.state = 'HIDDEN';
+                              relyHiddenFields.push(fieldConfigs.attriName);
                               // this.model.data = { ...this.model.data, [fieldConfigs.attriName]: '' }
                             } else {
                               fieldConfigs.state = oldFieldConfigs.state;
@@ -3172,23 +3174,23 @@ var component = __webpack_require__(39);
                 }, _loop5);
               });
               i = 0;
-            case 8:
+            case 9:
               if (!(i < _this7._fieldsConfigs.length)) {
-                _context6.next = 15;
+                _context6.next = 16;
                 break;
               }
-              return _context6.delegateYield(_loop5(), "t0", 10);
-            case 10:
+              return _context6.delegateYield(_loop5(), "t0", 11);
+            case 11:
               if (!_context6.t0) {
-                _context6.next = 12;
+                _context6.next = 13;
                 break;
               }
-              return _context6.abrupt("continue", 12);
-            case 12:
+              return _context6.abrupt("continue", 13);
+            case 13:
               i++;
-              _context6.next = 8;
+              _context6.next = 9;
               break;
-            case 15:
+            case 16:
               if (tableModel.length === 1 && tableModel[1] && tableModel[1].length < _this7.tableColumn) {
                 for (_i2 = tableModel[1].length; _i2 < _this7.tableColumn; _i2++) {
                   tableModel[1].push({});
@@ -3196,7 +3198,7 @@ var component = __webpack_require__(39);
               }
               // 更新视图
               _this7.tableModel = [].concat(tableModel);
-            case 17:
+            case 18:
             case "end":
               return _context6.stop();
           }
@@ -3369,10 +3371,10 @@ var component = __webpack_require__(39);
 var injectStylesIntoStyleTag = __webpack_require__(19);
 var injectStylesIntoStyleTag_default = /*#__PURE__*/__webpack_require__.n(injectStylesIntoStyleTag);
 
-// EXTERNAL MODULE: ./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/form/Form.vue?vue&type=style&index=0&id=8679e254&prod&lang=scss
-var Formvue_type_style_index_0_id_8679e254_prod_lang_scss = __webpack_require__(285);
+// EXTERNAL MODULE: ./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/form/Form.vue?vue&type=style&index=0&id=2f6255f8&prod&lang=scss
+var Formvue_type_style_index_0_id_2f6255f8_prod_lang_scss = __webpack_require__(285);
 
-// CONCATENATED MODULE: ./node_modules/style-loader/dist/cjs.js!./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/form/Form.vue?vue&type=style&index=0&id=8679e254&prod&lang=scss
+// CONCATENATED MODULE: ./node_modules/style-loader/dist/cjs.js!./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/form/Form.vue?vue&type=style&index=0&id=2f6255f8&prod&lang=scss
 
             
 
@@ -3381,12 +3383,12 @@ var options = {};
 options.insert = "head";
 options.singleton = false;
 
-var update = injectStylesIntoStyleTag_default()(Formvue_type_style_index_0_id_8679e254_prod_lang_scss["a" /* default */], options);
+var update = injectStylesIntoStyleTag_default()(Formvue_type_style_index_0_id_2f6255f8_prod_lang_scss["a" /* default */], options);
 
 
 
-/* harmony default export */ var form_Formvue_type_style_index_0_id_8679e254_prod_lang_scss = (Formvue_type_style_index_0_id_8679e254_prod_lang_scss["a" /* default */].locals || {});
-// CONCATENATED MODULE: ./src/frame/packages/form/Form.vue?vue&type=style&index=0&id=8679e254&prod&lang=scss
+/* harmony default export */ var form_Formvue_type_style_index_0_id_2f6255f8_prod_lang_scss = (Formvue_type_style_index_0_id_2f6255f8_prod_lang_scss["a" /* default */].locals || {});
+// CONCATENATED MODULE: ./src/frame/packages/form/Form.vue?vue&type=style&index=0&id=2f6255f8&prod&lang=scss
 
 // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(15);