service-flow-designer 0.0.2-tmp3 → 1.0.1

package/dist/es/designer/service-components/database/aggregate-query/filter-conditions.vue.js

@@ -1,16 +1,16 @@
-import { ElTableColumn, ElOption, ElSelect, ElButton, ElTooltip, ElTable } from "element-plus/es";
+import { ElTableColumn, ElOption, ElSelect, ElInput, ElButton, ElTooltip, ElTable } from "element-plus/es";
 import "element-plus/es/components/base/style/css";
 import "element-plus/es/components/table/style/css";
 import "element-plus/es/components/tooltip/style/css";
 import "element-plus/es/components/button/style/css";
+import "element-plus/es/components/input/style/css";
 import "element-plus/es/components/select/style/css";
 import "element-plus/es/components/option/style/css";
 import "element-plus/es/components/table-column/style/css";
-import { defineComponent, openBlock, createBlock, withCtx, createVNode, createElementBlock, toDisplayString, Fragment, renderList, withDirectives, vShow, unref, createElementVNode } from "vue";
+import { defineComponent, openBlock, createBlock, withCtx, createVNode, createElementBlock, toDisplayString, Fragment, renderList, unref, createElementVNode } from "vue";
 import { Plus, Minus } from "@element-plus/icons-vue";
-import { v4 } from "uuid";
 import ValueSetInput from "../../../common/components/value-set-input/value-set-input.vue.js";
-import { logicOperators } from "../../util/common-options.js";
+import { sqlOperators, logicOperators } from "../../util/common-options.js";
 const _hoisted_1 = { key: 0 };
 const _hoisted_2 = { key: 0 };
 const _hoisted_3 = { key: 0 };
@@ -35,12 +35,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   },
   setup(__props) {
     const props = __props;
-    const rowDblclick = (rowObj) => {
-      updateEditState(rowObj);
+    const rowDblclick = () => {
     };
-    function updateEditState(editRow) {
-      editRow.$editing = true;
-    }
     const handleDelete = (index, row) => {
       props.properties.filterConditions.splice(index, 1);
     };
@@ -48,33 +44,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (!props.properties.filterConditions) {
         props.properties.filterConditions = [];
       }
-      const newItem = {
-        code: v4()
-      };
-      props.properties.filterConditions.push(newItem);
-      updateEditState(newItem);
+      props.properties.filterConditions.push({ $editing: true });
     };
-    function fieldChange(fieldName, rowObj) {
-      if (!rowObj || !props.dataTableColumns) {
-        return;
-      }
-      const selItems = props.dataTableColumns.filter(
-        (item) => item.name == rowObj.propName || item.dbColumnName == rowObj.propName
-      );
-      const hisType = rowObj.dataType;
-      if (selItems && selItems.length > 0) {
-        rowObj.dataType = selItems[0].dataType;
-      } else {
-        rowObj.dataType = "TEXT";
-      }
-      if (hisType != rowObj.dataType) {
-        rowObj.operator = null;
-      }
-    }
     return (_ctx, _cache) => {
       const _component_el_table_column = ElTableColumn;
       const _component_el_option = ElOption;
       const _component_el_select = ElSelect;
+      const _component_el_input = ElInput;
       const _component_el_button = ElButton;
       const _component_el_tooltip = ElTooltip;
       const _component_el_table = ElTable;
@@ -82,7 +58,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         data: __props.properties.filterConditions,
         style: { "width": "100%", "margin-bottom": "20px" },
         "row-key": "name",
-        onRowClick: rowDblclick,
+        onRowDblclick: rowDblclick,
         size: "small",
         border: "",
         "default-expand-all": ""
@@ -91,13 +67,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           createVNode(_component_el_table_column, {
             type: "index",
             width: "50",
-            label: "序号",
-            align: "center"
+            label: "序号"
           }),
           createVNode(_component_el_table_column, {
             prop: "leftBracket",
-            label: "((((",
-            width: "60"
+            label: "((("
           }, {
             default: withCtx((scope) => [
               !scope.row.$editing ? (openBlock(), createElementBlock("span", _hoisted_1, toDisplayString(scope.row.leftBracket), 1)) : (openBlock(), createBlock(_component_el_select, {
@@ -105,10 +79,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 size: "small",
                 modelValue: scope.row.leftBracket,
                 "onUpdate:modelValue": ($event) => scope.row.leftBracket = $event,
-                placeholder: "",
-                clearable: ""
+                placeholder: ""
               }, {
                 default: withCtx(() => [
+                  createVNode(_component_el_option, {
+                    label: "",
+                    value: ""
+                  }),
                   createVNode(_component_el_option, {
                     label: "(",
                     value: "("
@@ -120,10 +97,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   createVNode(_component_el_option, {
                     label: "(((",
                     value: "((("
-                  }),
-                  createVNode(_component_el_option, {
-                    label: "((((",
-                    value: "(((("
                   })
                 ]),
                 _: 2
@@ -133,30 +106,27 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }),
           createVNode(_component_el_table_column, {
             prop: "name",
-            label: "字段名",
-            width: "160"
+            label: "字段名"
           }, {
             default: withCtx((scope) => [
-              !scope.row.$editing ? (openBlock(), createElementBlock("span", _hoisted_2, toDisplayString(scope.row.propName), 1)) : (openBlock(), createBlock(_component_el_select, {
+              !scope.row.$editing ? (openBlock(), createElementBlock("span", _hoisted_2, toDisplayString(scope.row.name), 1)) : (openBlock(), createBlock(_component_el_select, {
                 key: 1,
-                modelValue: scope.row.propName,
-                "onUpdate:modelValue": ($event) => scope.row.propName = $event,
+                modelValue: scope.row.name,
+                "onUpdate:modelValue": ($event) => scope.row.name = $event,
                 placeholder: "",
-                size: "small",
-                onChange: ($event) => fieldChange(_ctx.val, scope.row),
-                title: scope.row.propName
+                size: "small"
               }, {
                 default: withCtx(() => [
                   (openBlock(true), createElementBlock(Fragment, null, renderList(__props.dataTableColumns, (item) => {
                     return openBlock(), createBlock(_component_el_option, {
-                      key: item.dbColumnName,
-                      label: item.alias + "(" + item.dbColumnName + ")",
-                      value: item.dbColumnName
+                      key: item.name,
+                      label: item.alias,
+                      value: item.name
                     }, null, 8, ["label", "value"]);
                   }), 128))
                 ]),
                 _: 2
-              }, 1032, ["modelValue", "onUpdate:modelValue", "onChange", "title"]))
+              }, 1032, ["modelValue", "onUpdate:modelValue"]))
             ]),
             _: 1
           }),
@@ -170,136 +140,40 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 modelValue: scope.row.operator,
                 "onUpdate:modelValue": ($event) => scope.row.operator = $event,
                 placeholder: "",
-                size: "small",
-                title: scope.row.operator
+                size: "small"
               }, {
                 default: withCtx(() => [
-                  withDirectives(createVNode(_component_el_option, {
-                    label: "大于",
-                    value: "GT"
-                  }, null, 512), [
-                    [
-                      vShow,
-                      scope.row.dataType == "INTEGER" || scope.row.dataType == "LONG" || scope.row.dataType == "FLOAT" || scope.row.dataType == "DOUBLE"
-                    ]
-                  ]),
-                  withDirectives(createVNode(_component_el_option, {
-                    label: "小于",
-                    value: "LT"
-                  }, null, 512), [
-                    [
-                      vShow,
-                      scope.row.dataType == "INTEGER" || scope.row.dataType == "LONG" || scope.row.dataType == "FLOAT" || scope.row.dataType == "DOUBLE"
-                    ]
-                  ]),
-                  withDirectives(createVNode(_component_el_option, {
-                    label: "晚于",
-                    value: "GT"
-                  }, null, 512), [
-                    [vShow, scope.row.dataType == "DATE" || scope.row.dataType == "TIME"]
-                  ]),
-                  withDirectives(createVNode(_component_el_option, {
-                    label: "早于",
-                    value: "LT"
-                  }, null, 512), [
-                    [vShow, scope.row.dataType == "DATE" || scope.row.dataType == "TIME"]
-                  ]),
-                  createVNode(_component_el_option, {
-                    label: "等于",
-                    value: "EQ"
-                  }),
-                  withDirectives(createVNode(_component_el_option, {
-                    label: "不大于",
-                    value: "LET"
-                  }, null, 512), [
-                    [
-                      vShow,
-                      scope.row.dataType == "INTEGER" || scope.row.dataType == "LONG" || scope.row.dataType == "FLOAT" || scope.row.dataType == "DOUBLE"
-                    ]
-                  ]),
-                  withDirectives(createVNode(_component_el_option, {
-                    label: "不小于",
-                    value: "GET"
-                  }, null, 512), [
-                    [
-                      vShow,
-                      scope.row.dataType == "INTEGER" || scope.row.dataType == "LONG" || scope.row.dataType == "FLOAT" || scope.row.dataType == "DOUBLE"
-                    ]
-                  ]),
-                  withDirectives(createVNode(_component_el_option, {
-                    label: "不晚于",
-                    value: "LET"
-                  }, null, 512), [
-                    [vShow, scope.row.dataType == "DATE" || scope.row.dataType == "TIME"]
-                  ]),
-                  withDirectives(createVNode(_component_el_option, {
-                    label: "不早于",
-                    value: "GET"
-                  }, null, 512), [
-                    [vShow, scope.row.dataType == "DATE" || scope.row.dataType == "TIME"]
-                  ]),
-                  createVNode(_component_el_option, {
-                    label: "不等于",
-                    value: "NET"
-                  }),
-                  withDirectives(createVNode(_component_el_option, {
-                    label: "包含",
-                    value: "CONTAIN"
-                  }, null, 512), [
-                    [vShow, scope.row.dataType == "TEXT"]
-                  ]),
-                  withDirectives(createVNode(_component_el_option, {
-                    label: "左匹配",
-                    value: "LEFT_LIKE"
-                  }, null, 512), [
-                    [vShow, scope.row.dataType == "TEXT"]
-                  ]),
-                  withDirectives(createVNode(_component_el_option, {
-                    label: "右匹配",
-                    value: "RIGHT_LIKE"
-                  }, null, 512), [
-                    [vShow, scope.row.dataType == "TEXT"]
-                  ]),
-                  withDirectives(createVNode(_component_el_option, {
-                    label: "不包含",
-                    value: "NOT_CONTAIN"
-                  }, null, 512), [
-                    [vShow, scope.row.dataType == "TEXT"]
-                  ]),
-                  createVNode(_component_el_option, {
-                    label: "等于Null",
-                    value: "IS_NULL"
-                  }),
-                  createVNode(_component_el_option, {
-                    label: "不等于Null",
-                    value: "IS_NOT_NULL"
-                  })
+                  (openBlock(true), createElementBlock(Fragment, null, renderList(unref(sqlOperators), (item) => {
+                    return openBlock(), createBlock(_component_el_option, {
+                      key: item.value,
+                      label: item.label,
+                      value: item.value
+                    }, null, 8, ["label", "value"]);
+                  }), 128))
                 ]),
                 _: 2
-              }, 1032, ["modelValue", "onUpdate:modelValue", "title"]))
+              }, 1032, ["modelValue", "onUpdate:modelValue"]))
             ]),
             _: 1
           }),
           createVNode(_component_el_table_column, {
-            prop: "propValue",
-            label: "值",
-            width: "160"
+            prop: "value",
+            label: "值"
           }, {
             default: withCtx((scope) => [
               createVNode(unref(ValueSetInput), {
                 showLabel: !scope.row.$editing,
                 size: "small",
-                paramTypes: ["system", "context", "service", "request", "fixed"],
-                modelValue: scope.row.propValue,
-                "onUpdate:modelValue": ($event) => scope.row.propValue = $event
+                paramTypes: ["system", "context", "page", "request", "fixed"],
+                modelValue: scope.row.value,
+                "onUpdate:modelValue": ($event) => scope.row.value = $event
               }, null, 8, ["showLabel", "modelValue", "onUpdate:modelValue"])
             ]),
             _: 1
           }),
           createVNode(_component_el_table_column, {
             prop: "rightBracket",
-            label: "))))",
-            width: "60"
+            label: ")))"
           }, {
             default: withCtx((scope) => [
               !scope.row.$editing ? (openBlock(), createElementBlock("span", _hoisted_4, toDisplayString(scope.row.rightBracket), 1)) : (openBlock(), createBlock(_component_el_select, {
@@ -307,10 +181,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 size: "small",
                 modelValue: scope.row.rightBracket,
                 "onUpdate:modelValue": ($event) => scope.row.rightBracket = $event,
-                placeholder: "",
-                clearable: ""
+                placeholder: ""
               }, {
                 default: withCtx(() => [
+                  createVNode(_component_el_option, {
+                    label: "",
+                    value: ""
+                  }),
                   createVNode(_component_el_option, {
                     label: ")",
                     value: ")"
@@ -322,10 +199,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   createVNode(_component_el_option, {
                     label: ")))",
                     value: ")))"
-                  }),
-                  createVNode(_component_el_option, {
-                    label: "))))",
-                    value: "))))"
                   })
                 ]),
                 _: 2
@@ -334,9 +207,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             _: 1
           }),
           createVNode(_component_el_table_column, {
-            prop: "joinSign",
-            label: "连接符",
-            width: "70"
+            prop: "logicOperator",
+            label: "连接符"
           }, {
             default: withCtx((scope) => [
               !scope.row.$editing ? (openBlock(), createElementBlock("span", _hoisted_5, toDisplayString(scope.row.logicOperator), 1)) : (openBlock(), createBlock(_component_el_select, {
@@ -361,41 +233,21 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             _: 1
           }),
           createVNode(_component_el_table_column, {
-            prop: "variableIsNull",
-            label: "变量为空时",
-            width: "120"
+            prop: "nullValue",
+            label: "变量为空时"
           }, {
             default: withCtx((scope) => [
-              !scope.row.$editing ? (openBlock(), createElementBlock("span", _hoisted_6, toDisplayString(scope.row.variableIsNull), 1)) : (openBlock(), createBlock(_component_el_select, {
+              !scope.row.$editing ? (openBlock(), createElementBlock("span", _hoisted_6, toDisplayString(scope.row.nullValue), 1)) : (openBlock(), createBlock(_component_el_input, {
                 key: 1,
-                modelValue: scope.row.variableIsNull,
-                "onUpdate:modelValue": ($event) => scope.row.variableIsNull = $event,
-                clearable: "",
-                placeholder: "请选择"
-              }, {
-                default: withCtx(() => [
-                  createVNode(_component_el_option, {
-                    label: "Null",
-                    value: "null"
-                  }),
-                  createVNode(_component_el_option, {
-                    label: "忽略(1=1)",
-                    value: "ignore"
-                  }),
-                  createVNode(_component_el_option, {
-                    label: "不符合(1<>1)",
-                    value: "notequal"
-                  })
-                ]),
-                _: 2
-              }, 1032, ["modelValue", "onUpdate:modelValue"]))
+                modelValue: scope.row.nullValue,
+                "onUpdate:modelValue": ($event) => scope.row.nullValue = $event,
+                placeholder: "",
+                size: "small"
+              }, null, 8, ["modelValue", "onUpdate:modelValue"]))
             ]),
             _: 1
           }),
-          createVNode(_component_el_table_column, {
-            align: "center",
-            width: "60"
-          }, {
+          createVNode(_component_el_table_column, { align: "right" }, {
             header: withCtx(() => [
               createVNode(_component_el_tooltip, {
                 effect: "dark",

package/dist/es/designer/service-components/database/aggregate-query/index.css

@@ -1,4 +1,4 @@
-.nodeView[data-v-bd32480c] {
+.nodeView[data-v-8511bf0b] {
   box-sizing: border-box;
   margin: 10px 10px;
   width: 180px;
@@ -7,7 +7,7 @@
   border-radius: 2px 2px 2px 2px;
   padding: 20px 10px;
 }
-.nodeTitle[data-v-bd32480c] {
+.nodeTitle[data-v-8511bf0b] {
   width: 90px;
   height: 15px;
   font-weight: 400;
@@ -22,8 +22,8 @@
   overflow: hidden; /* 隐藏超出div宽度的文本 */
   text-overflow: ellipsis; /* 使用省略号表示被截断的文本 */
 }
-.nodeContent[data-v-bd32480c] {
-  /* width: 100%; */
+.nodeContent[data-v-8511bf0b] {
+  width: 112px;
   height: 15px;
   font-weight: 400;
   font-size: 14px;
@@ -32,21 +32,19 @@
   text-align: left;
   font-style: normal;
   text-transform: none;
-  padding: 0px 0px;
+  padding: 0px 24px;
   white-space: nowrap; /* 确保文本在一行内显示 */
   overflow: hidden; /* 隐藏超出div宽度的文本 */
   text-overflow: ellipsis; /* 使用省略号表示被截断的文本 */
 }
-.nodeContent-desc[data-v-bd32480c]{
-}
-.el-divider--horizontal[data-v-bd32480c] {
+.el-divider--horizontal[data-v-8511bf0b] {
   margin: 12px 0;
 }
-.nodeView[data-v-bd32480c] {
+.nodeView[data-v-8511bf0b] {
   border: 1px solid #5a90f9;
   background: #eef3fe;
   width: 180px;
   min-height: 95px;
 }
-.nodeContent[data-v-bd32480c] {
+.nodeContent[data-v-8511bf0b] {
 }

package/dist/es/designer/service-components/database/aggregate-query/index.vue.js

@@ -1,7 +1,7 @@
 import _sfc_main from "./index.vue2.js";
 /* empty css           */
 import _export_sfc from "../../../../_virtual/_plugin-vue_export-helper.js";
-const AggregateQuery = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-bd32480c"]]);
+const AggregateQuery = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-8511bf0b"]]);
 export {
   AggregateQuery as default
 };

package/dist/es/designer/service-components/database/aggregate-query/index.vue2.js

@@ -3,15 +3,14 @@ import "element-plus/es/components/base/style/css";
 import "element-plus/es/components/divider/style/css";
 import { defineComponent, ref, onMounted, openBlock, createElementBlock, createElementVNode, normalizeStyle, toDisplayString, createVNode, Fragment, renderList, pushScopeId, popScopeId } from "vue";
 import _imports_0 from "../../../../assets/icon/vardef-v.png.js";
-const _withScopeId = (n) => (pushScopeId("data-v-bd32480c"), n = n(), popScopeId(), n);
+const _withScopeId = (n) => (pushScopeId("data-v-8511bf0b"), n = n(), popScopeId(), n);
 const _hoisted_1 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("img", {
   src: _imports_0,
   style: { "height": "32px", "position": "fixed", "left": "0px", "top": "0px" }
 }, null, -1));
 const _hoisted_2 = { class: "nodeTitle" };
 const _hoisted_3 = { class: "nodeContent" };
-const _hoisted_4 = ["title"];
-const _hoisted_5 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("br", null, null, -1));
+const _hoisted_4 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("br", null, null, -1));
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "index",
   props: {
@@ -74,14 +73,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           createElementVNode("div", _hoisted_2, toDisplayString(__props.properties.name ? __props.properties.name : "条件判断"), 1),
           createVNode(_component_el_divider),
           createElementVNode("div", _hoisted_3, [
-            createElementVNode("div", {
-              class: "nodeContent-desc",
-              title: __props.properties.description
-            }, toDisplayString(__props.properties.description), 9, _hoisted_4),
             (openBlock(true), createElementBlock(Fragment, null, renderList(varDef.value, (item) => {
               return openBlock(), createElementBlock("div", null, [
                 createElementVNode("span", null, toDisplayString(item), 1),
-                _hoisted_5
+                _hoisted_4
               ]);
             }), 256))
           ])

package/dist/es/designer/service-components/database/aggregate-query/sort-conditions.vue.js

@@ -62,8 +62,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           createVNode(_component_el_table_column, {
             type: "index",
             width: "50",
-            label: "序号",
-            align: "center"
+            label: "序号"
           }),
           createVNode(_component_el_table_column, {
             prop: "name",
@@ -91,12 +90,26 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             ]),
             _: 1
           }),
+          createVNode(_component_el_table_column, {
+            prop: "name",
+            label: "动态排序值"
+          }, {
+            default: withCtx((scope) => [
+              !scope.row.$editing ? (openBlock(), createElementBlock("span", _hoisted_2, toDisplayString(scope.row.dynamicSortValue), 1)) : (openBlock(), createBlock(_component_el_input, {
+                key: 1,
+                modelValue: scope.row.dynamicSortValue,
+                "onUpdate:modelValue": ($event) => scope.row.dynamicSortValue = $event,
+                size: "small"
+              }, null, 8, ["modelValue", "onUpdate:modelValue"]))
+            ]),
+            _: 1
+          }),
           createVNode(_component_el_table_column, {
             prop: "order",
             label: "排序方式"
           }, {
             default: withCtx((scope) => [
-              !scope.row.$editing ? (openBlock(), createElementBlock("span", _hoisted_2, toDisplayString(scope.row.order), 1)) : (openBlock(), createBlock(_component_el_select, {
+              !scope.row.$editing ? (openBlock(), createElementBlock("span", _hoisted_3, toDisplayString(scope.row.order), 1)) : (openBlock(), createBlock(_component_el_select, {
                 key: 1,
                 size: "small",
                 modelValue: scope.row.order,
@@ -118,24 +131,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             ]),
             _: 1
           }),
-          createVNode(_component_el_table_column, {
-            prop: "name",
-            label: "动态排序值"
-          }, {
-            default: withCtx((scope) => [
-              !scope.row.$editing ? (openBlock(), createElementBlock("span", _hoisted_3, toDisplayString(scope.row.dynamicSortValue), 1)) : (openBlock(), createBlock(_component_el_input, {
-                key: 1,
-                modelValue: scope.row.dynamicSortValue,
-                "onUpdate:modelValue": ($event) => scope.row.dynamicSortValue = $event,
-                size: "small"
-              }, null, 8, ["modelValue", "onUpdate:modelValue"]))
-            ]),
-            _: 1
-          }),
-          createVNode(_component_el_table_column, {
-            align: "center",
-            width: "90"
-          }, {
+          createVNode(_component_el_table_column, { align: "right" }, {
             header: withCtx(() => [
               createVNode(_component_el_tooltip, {
                 effect: "dark",

package/dist/es/designer/service-components/database/aggregate-query/statistical-formula.vue.d.ts

@@ -22,9 +22,7 @@ declare const _default: import('vue').DefineComponent<{
         };
         default: () => any[];
     };
-}, {}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
-    change: (...args: any[]) => void;
-}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
+}, {}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     properties: {
         type: ObjectConstructor;
         default: () => {
@@ -48,9 +46,7 @@ declare const _default: import('vue').DefineComponent<{
         };
         default: () => any[];
     };
-}>> & {
-    onChange?: (...args: any[]) => any;
-}, {
+}>>, {
     properties: Record<string, any>;
     dataTableColumns: any[];
 }, {}>;