@maketribe/ms-app 3.0.32 → 3.0.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maketribe/ms-app",
-  "version": "3.0.32",
+  "version": "3.0.34",
   "description": "",
   "main": "dist/cjs",
   "files": [
@@ -20,9 +20,9 @@
     "vue": "^3.3.4",
     "vue-codemirror": "^6.1.1",
     "vue-router": "^4.2.4",
-    "@maketribe/locale": "^1.0.5",
+    "@maketribe/dm": "^3.0.13",
     "@maketribe/request": "^2.0.3",
-    "@maketribe/dm": "^3.0.11",
+    "@maketribe/locale": "^1.0.5",
     "@maketribe/utils": "^1.1.4"
   },
   "scripts": {

package/src/components/data-model/data-filter-form/composables/use-condition.ts

@@ -24,9 +24,9 @@ export function useDataFilterCondition(options: DataFilterConditionOptions) {
   dataFilterItem.setOperatorOptions(options.operatorOptions);
 
   dataFilterItem.setOperator(options.operator);
-  if (options.defaultValue !== void 0) {
-    dataFilterItem.column.defaultValue = options.defaultValue;
-  }
+  // if (options.defaultValue !== void 0) {
+  //   dataFilterItem.column.defaultValue = options.defaultValue;
+  // }
 
   const value = computed({
     get: () => dataFilterItem.getValue(),
@@ -42,7 +42,7 @@ export function useDataFilterCondition(options: DataFilterConditionOptions) {
   const calcDefaultValue = () => {
     const defaultValue = options.defaultValue;
 
-    if (unref(isBetween)) {
+    if (unref(isBetween) && !Array.isArray(defaultValue)) {
       return [defaultValue, defaultValue];
     }
 
@@ -50,13 +50,13 @@ export function useDataFilterCondition(options: DataFilterConditionOptions) {
   };
 
   watch(currentOperator, () => {
-    const defaultValue = calcDefaultValue();
+    const defaultValue = dataFilterItem.column.defaultValue || calcDefaultValue();
 
     dataFilterItem.column.defaultValue = defaultValue;
     value.value = defaultValue;
   });
 
-  dataFilterItem.column.defaultValue = calcDefaultValue();
+  dataFilterItem.column.defaultValue = dataFilterItem.column.defaultValue || calcDefaultValue();
   value.value = dataFilterItem.getValue() || calcDefaultValue();
 
   return {

package/src/components/data-model/filter-panel/composables/use-condition.ts

@@ -25,9 +25,9 @@ export function useCondition(options: ConditionOptions) {
   filterPanelItem.setOperatorOptions(options.operatorOptions);
 
   filterPanelItem.setOperator(options.operator);
-  if (options.defaultValue !== void 0) {
-    filterPanelItem.column.defaultValue = options.defaultValue;
-  }
+  // if (options.defaultValue !== void 0) {
+  //   filterPanelItem.column.defaultValue = options.defaultValue;
+  // }
 
   const value = computed({
     get: () => filterPanelItem.getValue(),

package/src/dataview/member/MemberTable.tsx

@@ -36,6 +36,12 @@ export class MemberTable extends DataTable<MemberResult, MemberTableItem> {
     await this.initActiveMemberForm();
 
     this.dataFilter.setColumns([
+      new FilterColumn({
+        name: "fdsafdsaf",
+        label: "fasdfsa",
+        componentInfo: "MKConditionDate",
+        defaultValue: ["2024-01-20 00:00:00", "2024-01-21 00:00:00"]
+      }),
       new FilterColumn({
         name: "name",
         label: "姓名",