@fecp/designer 5.5.67 → 5.5.69

package/es/designer/package.json.mjs

@@ -1,4 +1,4 @@
-const version = "5.5.67";
+const version = "5.5.69";
 const packageJson = {
   version
 };

package/es/designer.css

@@ -6216,33 +6216,34 @@ body,
   align-items: center;
   flex-wrap: nowrap;
 }
-.fec-form[data-v-0976aa9f] {
+.fec-form[data-v-c86c3354] {
   height: 100%;
 }
-.fec-form-col[data-v-0976aa9f] {
+.fec-form-col[data-v-c86c3354] {
   padding: 0px !important;
   display: flex !important;
   flex-direction: column;
   background-color: #fff;
   border-radius: 4px;
   overflow: hidden;
+  flex: auto !important;
 }
-[data-v-0976aa9f] .vgl-layout {
+[data-v-c86c3354] .vgl-layout {
   position: relative;
 }
-[data-v-0976aa9f] .vgl-item {
+[data-v-c86c3354] .vgl-item {
   transition: none;
 }
-[data-v-0976aa9f] .vgl-item > .el-form-item {
+[data-v-c86c3354] .vgl-item > .el-form-item {
   width: 100%;
   padding: 6px 8px 0 8px;
   height: calc(100% - 15px);
   display: flex;
 }
-[data-v-0976aa9f] .vgl-item > .el-form-item.el-form-item--label-top {
+[data-v-c86c3354] .vgl-item > .el-form-item.el-form-item--label-top {
   flex-direction: column;
 }
-[data-v-0976aa9f] .vgl-item > .el-form-item .el-form-item__label {
+[data-v-c86c3354] .vgl-item > .el-form-item .el-form-item__label {
   line-height: 20px;
   display: inline-flex;
   align-items: center;
@@ -6256,107 +6257,107 @@ body,
   flex-shrink: 0;
   min-height: 45px;
 }
-[data-v-0976aa9f] .vgl-item > .el-form-item {
+[data-v-c86c3354] .vgl-item > .el-form-item {
   /* .el-form-item__error {
     padding-top: 10px;
   } */
 }
-[data-v-0976aa9f] .vgl-item > .el-form-item .el-input__wrapper {
+[data-v-c86c3354] .vgl-item > .el-form-item .el-input__wrapper {
   padding: 1px 12px;
 }
-[data-v-0976aa9f] .vgl-item > .el-container {
+[data-v-c86c3354] .vgl-item > .el-container {
   height: auto !important;
 }
 @media (min-width: 1720px) {
-[data-v-0976aa9f] .vgl-item .el-form-item__label {
+[data-v-c86c3354] .vgl-item .el-form-item__label {
     max-width: 160px !important;
 }
-[data-v-0976aa9f] .vgl-item .el-form-item {
+[data-v-c86c3354] .vgl-item .el-form-item {
     padding: 6px 8px 0 8px !important;
 }
-[data-v-0976aa9f] .vgl-item .el-form-item .el-input__wrapper {
+[data-v-c86c3354] .vgl-item .el-form-item .el-input__wrapper {
     padding: 1px 12px;
 }
-[data-v-0976aa9f] .vgl-item .el-form-item .el-select__wrapper {
+[data-v-c86c3354] .vgl-item .el-form-item .el-select__wrapper {
     padding: 8px 12px;
 }
-.fec-el-form[data-v-0976aa9f] {
+.fec-el-form[data-v-c86c3354] {
     padding: 12px !important;
 }
 }
 /* 标准 PC（1200px ~ 1439px）*/
 @media (min-width: 1366px) and (max-width: 1719px) {
-[data-v-0976aa9f] .vgl-item .el-form-item__label {
+[data-v-c86c3354] .vgl-item .el-form-item__label {
     max-width: 130px !important;
     padding-right: 6px !important;
 }
-[data-v-0976aa9f] .vgl-item .el-form-item {
+[data-v-c86c3354] .vgl-item .el-form-item {
     padding: 6px 0 0 0 !important;
 }
-[data-v-0976aa9f] .vgl-item .el-form-item .el-input__wrapper {
+[data-v-c86c3354] .vgl-item .el-form-item .el-input__wrapper {
     padding: 1px 8px;
 }
-[data-v-0976aa9f] .vgl-item .el-form-item .el-select__wrapper {
+[data-v-c86c3354] .vgl-item .el-form-item .el-select__wrapper {
     padding: 8px 8px;
 }
-.fec-el-form[data-v-0976aa9f] {
+.fec-el-form[data-v-c86c3354] {
     padding: 8px !important;
 }
 }
 /* 2. 标准 PC 992px ~ 1199px */
 @media (min-width: 992px) and (max-width: 1365px) {
-[data-v-0976aa9f] .vgl-item .el-form-item__label {
+[data-v-c86c3354] .vgl-item .el-form-item__label {
     max-width: 125px !important;
     padding-right: 4px !important;
 }
-[data-v-0976aa9f] .vgl-item .el-form-item {
+[data-v-c86c3354] .vgl-item .el-form-item {
     padding: 0 !important;
 }
-[data-v-0976aa9f] .vgl-item .el-form-item .el-input__wrapper {
+[data-v-c86c3354] .vgl-item .el-form-item .el-input__wrapper {
     padding: 1px 6px;
 }
-[data-v-0976aa9f] .vgl-item .el-form-item .el-select__wrapper {
+[data-v-c86c3354] .vgl-item .el-form-item .el-select__wrapper {
     padding: 8px 6px;
 }
-.fec-el-form[data-v-0976aa9f] {
+.fec-el-form[data-v-c86c3354] {
     padding: 6px !important;
 }
 }
 /* 3. 小屏 PC / 窄窗口 <992px（最小到768px）*/
 @media (max-width: 991px) and (min-width: 768px) {
-[data-v-0976aa9f] .vgl-item .el-form-item__label {
+[data-v-c86c3354] .vgl-item .el-form-item__label {
     max-width: 100px !important;
     padding-right: 4px !important;
 }
-[data-v-0976aa9f] .vgl-item .el-form-item {
+[data-v-c86c3354] .vgl-item .el-form-item {
     padding: 0 !important;
 }
-[data-v-0976aa9f] .vgl-item .el-form-item .el-input__wrapper {
+[data-v-c86c3354] .vgl-item .el-form-item .el-input__wrapper {
     padding: 1px 4px;
 }
-[data-v-0976aa9f] .vgl-item .el-form-item .el-select__wrapper {
+[data-v-c86c3354] .vgl-item .el-form-item .el-select__wrapper {
     padding: 8px 4px;
 }
-.fec-el-form[data-v-0976aa9f] {
+.fec-el-form[data-v-c86c3354] {
     padding: 6px !important;
 }
 }
 /* 超小屏 <768px */
 @media (max-width: 767px) {
-[data-v-0976aa9f] .vgl-item .el-form-item__label {
+[data-v-c86c3354] .vgl-item .el-form-item__label {
     max-width: 80px !important;
     padding-right: 4px !important;
 }
-[data-v-0976aa9f] .vgl-item .el-form-item {
+[data-v-c86c3354] .vgl-item .el-form-item {
     padding: 0 !important;
 }
-[data-v-0976aa9f] .vgl-item .el-form-item .el-input__wrapper {
+[data-v-c86c3354] .vgl-item .el-form-item .el-input__wrapper {
     padding: 1px 2px;
 }
-[data-v-0976aa9f] .vgl-item .el-form-item .el-select__wrapper {
+[data-v-c86c3354] .vgl-item .el-form-item .el-select__wrapper {
     padding: 8px 2px;
 }
-.fec-el-form[data-v-0976aa9f] {
+.fec-el-form[data-v-c86c3354] {
     padding: 6px !important;
 }
 }.table-pagination[data-v-142fdd35] {

package/es/packages/vue/src/components/forms/date/Date.vue.mjs

@@ -93,7 +93,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     });
     const disabledDate = (date) => {
       if (!props.dateRange) return false;
-      debugger;
       const today = /* @__PURE__ */ new Date();
       today.setHours(0, 0, 0, 0);
       const targetDate = new Date(date);

package/es/packages/vue/src/components/forms/form/Form.vue.mjs

@@ -1213,7 +1213,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-0976aa9f"]]);
+const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-c86c3354"]]);
 export {
   _Form as default
 };

package/es/packages/vue/src/utils/parseFilterConfig.mjs

@@ -37,9 +37,6 @@ function checkConditionMatch(condition, data, fields) {
   const fieldName = (fieldInfo == null ? void 0 : fieldInfo.fieldName) || field;
   const dataValue = data[fieldName];
   const parsedValue = parseSingleParamValue(value, data, fields);
-  if ("null" == (dataValue ?? "null") || "null" == (parsedValue ?? "null")) {
-    return true;
-  }
   switch (operator) {
     case "eq":
       return dataValue == parsedValue;

package/lib/designer/package.json.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
-const version = "5.5.67";
+const version = "5.5.69";
 const packageJson = {
   version
 };

package/lib/designer.css

@@ -6216,33 +6216,34 @@ body,
   align-items: center;
   flex-wrap: nowrap;
 }
-.fec-form[data-v-0976aa9f] {
+.fec-form[data-v-c86c3354] {
   height: 100%;
 }
-.fec-form-col[data-v-0976aa9f] {
+.fec-form-col[data-v-c86c3354] {
   padding: 0px !important;
   display: flex !important;
   flex-direction: column;
   background-color: #fff;
   border-radius: 4px;
   overflow: hidden;
+  flex: auto !important;
 }
-[data-v-0976aa9f] .vgl-layout {
+[data-v-c86c3354] .vgl-layout {
   position: relative;
 }
-[data-v-0976aa9f] .vgl-item {
+[data-v-c86c3354] .vgl-item {
   transition: none;
 }
-[data-v-0976aa9f] .vgl-item > .el-form-item {
+[data-v-c86c3354] .vgl-item > .el-form-item {
   width: 100%;
   padding: 6px 8px 0 8px;
   height: calc(100% - 15px);
   display: flex;
 }
-[data-v-0976aa9f] .vgl-item > .el-form-item.el-form-item--label-top {
+[data-v-c86c3354] .vgl-item > .el-form-item.el-form-item--label-top {
   flex-direction: column;
 }
-[data-v-0976aa9f] .vgl-item > .el-form-item .el-form-item__label {
+[data-v-c86c3354] .vgl-item > .el-form-item .el-form-item__label {
   line-height: 20px;
   display: inline-flex;
   align-items: center;
@@ -6256,107 +6257,107 @@ body,
   flex-shrink: 0;
   min-height: 45px;
 }
-[data-v-0976aa9f] .vgl-item > .el-form-item {
+[data-v-c86c3354] .vgl-item > .el-form-item {
   /* .el-form-item__error {
     padding-top: 10px;
   } */
 }
-[data-v-0976aa9f] .vgl-item > .el-form-item .el-input__wrapper {
+[data-v-c86c3354] .vgl-item > .el-form-item .el-input__wrapper {
   padding: 1px 12px;
 }
-[data-v-0976aa9f] .vgl-item > .el-container {
+[data-v-c86c3354] .vgl-item > .el-container {
   height: auto !important;
 }
 @media (min-width: 1720px) {
-[data-v-0976aa9f] .vgl-item .el-form-item__label {
+[data-v-c86c3354] .vgl-item .el-form-item__label {
     max-width: 160px !important;
 }
-[data-v-0976aa9f] .vgl-item .el-form-item {
+[data-v-c86c3354] .vgl-item .el-form-item {
     padding: 6px 8px 0 8px !important;
 }
-[data-v-0976aa9f] .vgl-item .el-form-item .el-input__wrapper {
+[data-v-c86c3354] .vgl-item .el-form-item .el-input__wrapper {
     padding: 1px 12px;
 }
-[data-v-0976aa9f] .vgl-item .el-form-item .el-select__wrapper {
+[data-v-c86c3354] .vgl-item .el-form-item .el-select__wrapper {
     padding: 8px 12px;
 }
-.fec-el-form[data-v-0976aa9f] {
+.fec-el-form[data-v-c86c3354] {
     padding: 12px !important;
 }
 }
 /* 标准 PC（1200px ~ 1439px）*/
 @media (min-width: 1366px) and (max-width: 1719px) {
-[data-v-0976aa9f] .vgl-item .el-form-item__label {
+[data-v-c86c3354] .vgl-item .el-form-item__label {
     max-width: 130px !important;
     padding-right: 6px !important;
 }
-[data-v-0976aa9f] .vgl-item .el-form-item {
+[data-v-c86c3354] .vgl-item .el-form-item {
     padding: 6px 0 0 0 !important;
 }
-[data-v-0976aa9f] .vgl-item .el-form-item .el-input__wrapper {
+[data-v-c86c3354] .vgl-item .el-form-item .el-input__wrapper {
     padding: 1px 8px;
 }
-[data-v-0976aa9f] .vgl-item .el-form-item .el-select__wrapper {
+[data-v-c86c3354] .vgl-item .el-form-item .el-select__wrapper {
     padding: 8px 8px;
 }
-.fec-el-form[data-v-0976aa9f] {
+.fec-el-form[data-v-c86c3354] {
     padding: 8px !important;
 }
 }
 /* 2. 标准 PC 992px ~ 1199px */
 @media (min-width: 992px) and (max-width: 1365px) {
-[data-v-0976aa9f] .vgl-item .el-form-item__label {
+[data-v-c86c3354] .vgl-item .el-form-item__label {
     max-width: 125px !important;
     padding-right: 4px !important;
 }
-[data-v-0976aa9f] .vgl-item .el-form-item {
+[data-v-c86c3354] .vgl-item .el-form-item {
     padding: 0 !important;
 }
-[data-v-0976aa9f] .vgl-item .el-form-item .el-input__wrapper {
+[data-v-c86c3354] .vgl-item .el-form-item .el-input__wrapper {
     padding: 1px 6px;
 }
-[data-v-0976aa9f] .vgl-item .el-form-item .el-select__wrapper {
+[data-v-c86c3354] .vgl-item .el-form-item .el-select__wrapper {
     padding: 8px 6px;
 }
-.fec-el-form[data-v-0976aa9f] {
+.fec-el-form[data-v-c86c3354] {
     padding: 6px !important;
 }
 }
 /* 3. 小屏 PC / 窄窗口 <992px（最小到768px）*/
 @media (max-width: 991px) and (min-width: 768px) {
-[data-v-0976aa9f] .vgl-item .el-form-item__label {
+[data-v-c86c3354] .vgl-item .el-form-item__label {
     max-width: 100px !important;
     padding-right: 4px !important;
 }
-[data-v-0976aa9f] .vgl-item .el-form-item {
+[data-v-c86c3354] .vgl-item .el-form-item {
     padding: 0 !important;
 }
-[data-v-0976aa9f] .vgl-item .el-form-item .el-input__wrapper {
+[data-v-c86c3354] .vgl-item .el-form-item .el-input__wrapper {
     padding: 1px 4px;
 }
-[data-v-0976aa9f] .vgl-item .el-form-item .el-select__wrapper {
+[data-v-c86c3354] .vgl-item .el-form-item .el-select__wrapper {
     padding: 8px 4px;
 }
-.fec-el-form[data-v-0976aa9f] {
+.fec-el-form[data-v-c86c3354] {
     padding: 6px !important;
 }
 }
 /* 超小屏 <768px */
 @media (max-width: 767px) {
-[data-v-0976aa9f] .vgl-item .el-form-item__label {
+[data-v-c86c3354] .vgl-item .el-form-item__label {
     max-width: 80px !important;
     padding-right: 4px !important;
 }
-[data-v-0976aa9f] .vgl-item .el-form-item {
+[data-v-c86c3354] .vgl-item .el-form-item {
     padding: 0 !important;
 }
-[data-v-0976aa9f] .vgl-item .el-form-item .el-input__wrapper {
+[data-v-c86c3354] .vgl-item .el-form-item .el-input__wrapper {
     padding: 1px 2px;
 }
-[data-v-0976aa9f] .vgl-item .el-form-item .el-select__wrapper {
+[data-v-c86c3354] .vgl-item .el-form-item .el-select__wrapper {
     padding: 8px 2px;
 }
-.fec-el-form[data-v-0976aa9f] {
+.fec-el-form[data-v-c86c3354] {
     padding: 6px !important;
 }
 }.table-pagination[data-v-142fdd35] {

package/lib/packages/vue/src/components/forms/date/Date.vue.js

@@ -95,7 +95,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     });
     const disabledDate = (date) => {
       if (!props.dateRange) return false;
-      debugger;
       const today = /* @__PURE__ */ new Date();
       today.setHours(0, 0, 0, 0);
       const targetDate = new Date(date);

package/lib/packages/vue/src/components/forms/form/Form.vue.js

@@ -1215,5 +1215,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-0976aa9f"]]);
+const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-c86c3354"]]);
 exports.default = _Form;

package/lib/packages/vue/src/utils/parseFilterConfig.js

@@ -39,9 +39,6 @@ function checkConditionMatch(condition, data, fields) {
   const fieldName = (fieldInfo == null ? void 0 : fieldInfo.fieldName) || field;
   const dataValue = data[fieldName];
   const parsedValue = parseRouteParams.parseSingleParamValue(value, data, fields);
-  if ("null" == (dataValue ?? "null") || "null" == (parsedValue ?? "null")) {
-    return true;
-  }
   switch (operator) {
     case "eq":
       return dataValue == parsedValue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fecp/designer",
-  "version": "5.5.67",
+  "version": "5.5.69",
   "main": "lib/designer/index.js",
   "module": "es/designer/index.mjs",
   "files": [