@maketribe/ms-app 3.0.32 → 3.0.33

package/dist/cjs/components/data-model/data-filter-form/composables/use-condition.js

@@ -15,9 +15,6 @@ function useDataFilterCondition(options) {
   const dataFilterItem = dataFilterItemContext.dataFilterItem;
   dataFilterItem.setOperatorOptions(options.operatorOptions);
   dataFilterItem.setOperator(options.operator);
-  if (options.defaultValue !== void 0) {
-    dataFilterItem.column.defaultValue = options.defaultValue;
-  }
   const value = vue.computed({
     get: () => dataFilterItem.getValue(),
     set: (v) => dataFilterItem.setValue(v === "" ? null : v)
@@ -28,17 +25,17 @@ function useDataFilterCondition(options) {
   const currentOperator = vue.computed(() => dataFilterItem.currentOperator);
   const calcDefaultValue = () => {
     const defaultValue = options.defaultValue;
-    if (vue.unref(isBetween)) {
+    if (vue.unref(isBetween) && !Array.isArray(defaultValue)) {
       return [defaultValue, defaultValue];
     }
     return defaultValue;
   };
   vue.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 {
     isBetween,

package/dist/cjs/components/data-model/data-filter-form/composables/use-condition.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-condition.js","sources":["../../../../../../src/components/data-model/data-filter-form/composables/use-condition.ts"],"sourcesContent":["import { computed, inject, unref, watch } from \"vue\";\r\nimport { buildProps } from \"@maketribe/utils\";\r\nimport { Operator } from \"@maketribe/dm\";\r\n\r\nimport { BETWEEN_OPTION, OperatorOption } from \"../operator-options\";\r\nimport { DATA_FILTER_ITEM_CONTEXT } from \"../token\";\r\n\r\nexport const dataFilterConditionProps = buildProps({\r\n  defaultValue: {\r\n    default: null,\r\n  },\r\n} as const);\r\n\r\nexport type DataFilterConditionOptions = {\r\n  operator: Operator;\r\n  operatorOptions: OperatorOption[];\r\n  defaultValue: any;\r\n};\r\n\r\nexport function useDataFilterCondition(options: DataFilterConditionOptions) {\r\n  const dataFilterItemContext = inject(DATA_FILTER_ITEM_CONTEXT)!;\r\n  const dataFilterItem = dataFilterItemContext.dataFilterItem;\r\n\r\n  dataFilterItem.setOperatorOptions(options.operatorOptions);\r\n\r\n  dataFilterItem.setOperator(options.operator);\r\n  if (options.defaultValue !== void 0) {\r\n    dataFilterItem.column.defaultValue = options.defaultValue;\r\n  }\r\n\r\n  const value = computed({\r\n    get: () => dataFilterItem.getValue(),\r\n    set: (v: any) => dataFilterItem.setValue(v === \"\" ? null : v),\r\n  });\r\n\r\n  const isBetween = computed(\r\n    () => unref(currentOperator.value) === BETWEEN_OPTION.value\r\n  );\r\n\r\n  const currentOperator = computed(() => dataFilterItem.currentOperator);\r\n\r\n  const calcDefaultValue = () => {\r\n    const defaultValue = options.defaultValue;\r\n\r\n    if (unref(isBetween)) {\r\n      return [defaultValue, defaultValue];\r\n    }\r\n\r\n    return defaultValue;\r\n  };\r\n\r\n  watch(currentOperator, () => {\r\n    const defaultValue = calcDefaultValue();\r\n\r\n    dataFilterItem.column.defaultValue = defaultValue;\r\n    value.value = defaultValue;\r\n  });\r\n\r\n  dataFilterItem.column.defaultValue = calcDefaultValue();\r\n  value.value = dataFilterItem.getValue() || calcDefaultValue();\r\n\r\n  return {\r\n    isBetween,\r\n    dataFilterItem,\r\n    currentOperator,\r\n    value,\r\n  };\r\n}\r\n"],"names":["buildProps","inject","DATA_FILTER_ITEM_CONTEXT","computed","unref","BETWEEN_OPTION","watch"],"mappings":";;;;;;;AAOO,MAAM,2BAA2BA,gBAAW,CAAA;AAAA,EACjD,YAAc,EAAA;AAAA,IACZ,OAAS,EAAA,IAAA;AAAA,GACX;AACF,CAAU,EAAA;AAQH,SAAS,uBAAuB,OAAqC,EAAA;AAC1E,EAAM,MAAA,qBAAA,GAAwBC,WAAOC,8BAAwB,CAAA,CAAA;AAC7D,EAAA,MAAM,iBAAiB,qBAAsB,CAAA,cAAA,CAAA;AAE7C,EAAe,cAAA,CAAA,kBAAA,CAAmB,QAAQ,eAAe,CAAA,CAAA;AAEzD,EAAe,cAAA,CAAA,WAAA,CAAY,QAAQ,QAAQ,CAAA,CAAA;AAC3C,EAAI,IAAA,OAAA,CAAQ,iBAAiB,KAAQ,CAAA,EAAA;AACnC,IAAe,cAAA,CAAA,MAAA,CAAO,eAAe,OAAQ,CAAA,YAAA,CAAA;AAAA,GAC/C;AAEA,EAAA,MAAM,QAAQC,YAAS,CAAA;AAAA,IACrB,GAAA,EAAK,MAAM,cAAA,CAAe,QAAS,EAAA;AAAA,IACnC,GAAA,EAAK,CAAC,CAAW,KAAA,cAAA,CAAe,SAAS,CAAM,KAAA,EAAA,GAAK,OAAO,CAAC,CAAA;AAAA,GAC7D,CAAA,CAAA;AAED,EAAA,MAAM,SAAY,GAAAA,YAAA;AAAA,IAChB,MAAMC,SAAA,CAAM,eAAgB,CAAA,KAAK,MAAMC,8BAAe,CAAA,KAAA;AAAA,GACxD,CAAA;AAEA,EAAA,MAAM,eAAkB,GAAAF,YAAA,CAAS,MAAM,cAAA,CAAe,eAAe,CAAA,CAAA;AAErE,EAAA,MAAM,mBAAmB,MAAM;AAC7B,IAAA,MAAM,eAAe,OAAQ,CAAA,YAAA,CAAA;AAE7B,IAAI,IAAAC,SAAA,CAAM,SAAS,CAAG,EAAA;AACpB,MAAO,OAAA,CAAC,cAAc,YAAY,CAAA,CAAA;AAAA,KACpC;AAEA,IAAO,OAAA,YAAA,CAAA;AAAA,GACT,CAAA;AAEA,EAAAE,SAAA,CAAM,iBAAiB,MAAM;AAC3B,IAAA,MAAM,eAAe,gBAAiB,EAAA,CAAA;AAEtC,IAAA,cAAA,CAAe,OAAO,YAAe,GAAA,YAAA,CAAA;AACrC,IAAA,KAAA,CAAM,KAAQ,GAAA,YAAA,CAAA;AAAA,GACf,CAAA,CAAA;AAED,EAAe,cAAA,CAAA,MAAA,CAAO,eAAe,gBAAiB,EAAA,CAAA;AACtD,EAAA,KAAA,CAAM,KAAQ,GAAA,cAAA,CAAe,QAAS,EAAA,IAAK,gBAAiB,EAAA,CAAA;AAE5D,EAAO,OAAA;AAAA,IACL,SAAA;AAAA,IACA,cAAA;AAAA,IACA,eAAA;AAAA,IACA,KAAA;AAAA,GACF,CAAA;AACF;;;;;"}
+{"version":3,"file":"use-condition.js","sources":["../../../../../../src/components/data-model/data-filter-form/composables/use-condition.ts"],"sourcesContent":["import { computed, inject, unref, watch } from \"vue\";\r\nimport { buildProps } from \"@maketribe/utils\";\r\nimport { Operator } from \"@maketribe/dm\";\r\n\r\nimport { BETWEEN_OPTION, OperatorOption } from \"../operator-options\";\r\nimport { DATA_FILTER_ITEM_CONTEXT } from \"../token\";\r\n\r\nexport const dataFilterConditionProps = buildProps({\r\n  defaultValue: {\r\n    default: null,\r\n  },\r\n} as const);\r\n\r\nexport type DataFilterConditionOptions = {\r\n  operator: Operator;\r\n  operatorOptions: OperatorOption[];\r\n  defaultValue: any;\r\n};\r\n\r\nexport function useDataFilterCondition(options: DataFilterConditionOptions) {\r\n  const dataFilterItemContext = inject(DATA_FILTER_ITEM_CONTEXT)!;\r\n  const dataFilterItem = dataFilterItemContext.dataFilterItem;\r\n\r\n  dataFilterItem.setOperatorOptions(options.operatorOptions);\r\n\r\n  dataFilterItem.setOperator(options.operator);\r\n  // if (options.defaultValue !== void 0) {\r\n  //   dataFilterItem.column.defaultValue = options.defaultValue;\r\n  // }\r\n\r\n  const value = computed({\r\n    get: () => dataFilterItem.getValue(),\r\n    set: (v: any) => dataFilterItem.setValue(v === \"\" ? null : v),\r\n  });\r\n\r\n  const isBetween = computed(\r\n    () => unref(currentOperator.value) === BETWEEN_OPTION.value\r\n  );\r\n\r\n  const currentOperator = computed(() => dataFilterItem.currentOperator);\r\n\r\n  const calcDefaultValue = () => {\r\n    const defaultValue = options.defaultValue;\r\n\r\n    if (unref(isBetween) && !Array.isArray(defaultValue)) {\r\n      return [defaultValue, defaultValue];\r\n    }\r\n\r\n    return defaultValue;\r\n  };\r\n\r\n  watch(currentOperator, () => {\r\n    const defaultValue = dataFilterItem.column.defaultValue || calcDefaultValue();\r\n\r\n    dataFilterItem.column.defaultValue = defaultValue;\r\n    value.value = defaultValue;\r\n  });\r\n\r\n  dataFilterItem.column.defaultValue = dataFilterItem.column.defaultValue || calcDefaultValue();\r\n  value.value = dataFilterItem.getValue() || calcDefaultValue();\r\n\r\n  return {\r\n    isBetween,\r\n    dataFilterItem,\r\n    currentOperator,\r\n    value,\r\n  };\r\n}\r\n"],"names":["buildProps","inject","DATA_FILTER_ITEM_CONTEXT","computed","unref","BETWEEN_OPTION","watch"],"mappings":";;;;;;;AAOO,MAAM,2BAA2BA,gBAAW,CAAA;AAAA,EACjD,YAAc,EAAA;AAAA,IACZ,OAAS,EAAA,IAAA;AAAA,GACX;AACF,CAAU,EAAA;AAQH,SAAS,uBAAuB,OAAqC,EAAA;AAC1E,EAAM,MAAA,qBAAA,GAAwBC,WAAOC,8BAAwB,CAAA,CAAA;AAC7D,EAAA,MAAM,iBAAiB,qBAAsB,CAAA,cAAA,CAAA;AAE7C,EAAe,cAAA,CAAA,kBAAA,CAAmB,QAAQ,eAAe,CAAA,CAAA;AAEzD,EAAe,cAAA,CAAA,WAAA,CAAY,QAAQ,QAAQ,CAAA,CAAA;AAK3C,EAAA,MAAM,QAAQC,YAAS,CAAA;AAAA,IACrB,GAAA,EAAK,MAAM,cAAA,CAAe,QAAS,EAAA;AAAA,IACnC,GAAA,EAAK,CAAC,CAAW,KAAA,cAAA,CAAe,SAAS,CAAM,KAAA,EAAA,GAAK,OAAO,CAAC,CAAA;AAAA,GAC7D,CAAA,CAAA;AAED,EAAA,MAAM,SAAY,GAAAA,YAAA;AAAA,IAChB,MAAMC,SAAA,CAAM,eAAgB,CAAA,KAAK,MAAMC,8BAAe,CAAA,KAAA;AAAA,GACxD,CAAA;AAEA,EAAA,MAAM,eAAkB,GAAAF,YAAA,CAAS,MAAM,cAAA,CAAe,eAAe,CAAA,CAAA;AAErE,EAAA,MAAM,mBAAmB,MAAM;AAC7B,IAAA,MAAM,eAAe,OAAQ,CAAA,YAAA,CAAA;AAE7B,IAAA,IAAIC,UAAM,SAAS,CAAA,IAAK,CAAC,KAAM,CAAA,OAAA,CAAQ,YAAY,CAAG,EAAA;AACpD,MAAO,OAAA,CAAC,cAAc,YAAY,CAAA,CAAA;AAAA,KACpC;AAEA,IAAO,OAAA,YAAA,CAAA;AAAA,GACT,CAAA;AAEA,EAAAE,SAAA,CAAM,iBAAiB,MAAM;AAC3B,IAAA,MAAM,YAAe,GAAA,cAAA,CAAe,MAAO,CAAA,YAAA,IAAgB,gBAAiB,EAAA,CAAA;AAE5E,IAAA,cAAA,CAAe,OAAO,YAAe,GAAA,YAAA,CAAA;AACrC,IAAA,KAAA,CAAM,KAAQ,GAAA,YAAA,CAAA;AAAA,GACf,CAAA,CAAA;AAED,EAAA,cAAA,CAAe,MAAO,CAAA,YAAA,GAAe,cAAe,CAAA,MAAA,CAAO,gBAAgB,gBAAiB,EAAA,CAAA;AAC5F,EAAA,KAAA,CAAM,KAAQ,GAAA,cAAA,CAAe,QAAS,EAAA,IAAK,gBAAiB,EAAA,CAAA;AAE5D,EAAO,OAAA;AAAA,IACL,SAAA;AAAA,IACA,cAAA;AAAA,IACA,eAAA;AAAA,IACA,KAAA;AAAA,GACF,CAAA;AACF;;;;;"}

package/dist/cjs/components/data-model/filter-panel/composables/use-condition.js

@@ -15,9 +15,6 @@ function useCondition(options) {
   const filterPanelItem = filterPanelItemContext.filterPanelItem;
   filterPanelItem.setOperatorOptions(options.operatorOptions);
   filterPanelItem.setOperator(options.operator);
-  if (options.defaultValue !== void 0) {
-    filterPanelItem.column.defaultValue = options.defaultValue;
-  }
   const value = vue.computed({
     get: () => filterPanelItem.getValue(),
     set: (v) => filterPanelItem.setValue(v === "" ? null : v)

package/dist/cjs/components/data-model/filter-panel/composables/use-condition.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-condition.js","sources":["../../../../../../src/components/data-model/filter-panel/composables/use-condition.ts"],"sourcesContent":["import { Operator } from \"@maketribe/dm\";\r\nimport { computed, inject, unref, watch } from \"vue\";\r\n\r\nimport { BETWEEN_OPTION, OperatorOption } from \"../operator-options\";\r\nimport { FILTER_PANEL_ITEM_CONTEXT, FilterPanelItem } from \"../token\";\r\nimport { buildProps } from \"@maketribe/utils\";\r\n\r\nexport const conditionProps = buildProps({\r\n  defaultValue: {\r\n    default: null,\r\n  },\r\n} as const);\r\n\r\nexport type ConditionOptions = {\r\n  operator: Operator;\r\n  operatorOptions: OperatorOption[];\r\n  defaultValue: any;\r\n};\r\n\r\nexport function useCondition(options: ConditionOptions) {\r\n  const filterPanelItemContext = inject(FILTER_PANEL_ITEM_CONTEXT) as any;\r\n  const filterPanelItem =\r\n    filterPanelItemContext.filterPanelItem as FilterPanelItem;\r\n\r\n  filterPanelItem.setOperatorOptions(options.operatorOptions);\r\n\r\n  filterPanelItem.setOperator(options.operator);\r\n  if (options.defaultValue !== void 0) {\r\n    filterPanelItem.column.defaultValue = options.defaultValue;\r\n  }\r\n\r\n  const value = computed({\r\n    get: () => filterPanelItem.getValue(),\r\n    set: (v: any) => filterPanelItem.setValue(v === \"\" ? null : v),\r\n  });\r\n\r\n  const isBetween = computed(\r\n    () => unref(currentOperator.value) === BETWEEN_OPTION.value\r\n  );\r\n\r\n  const currentOperator = computed(() => filterPanelItem.currentOperator);\r\n\r\n  watch(\r\n    currentOperator,\r\n    () => {\r\n      const defalutValue = options.defaultValue;\r\n\r\n      if (unref(isBetween)) {\r\n        filterPanelItem.column.defaultValue = [defalutValue, defalutValue];\r\n        value.value = [defalutValue, defalutValue];\r\n        return;\r\n      }\r\n\r\n      filterPanelItem.column.defaultValue = defalutValue;\r\n      value.value = defalutValue;\r\n    },\r\n    { immediate: true }\r\n  );\r\n\r\n  return {\r\n    isBetween,\r\n    filterPanelItem,\r\n    currentOperator,\r\n    value,\r\n  };\r\n}\r\n"],"names":["buildProps","inject","FILTER_PANEL_ITEM_CONTEXT","computed","unref","BETWEEN_OPTION","watch"],"mappings":";;;;;;;AAOO,MAAM,iBAAiBA,gBAAW,CAAA;AAAA,EACvC,YAAc,EAAA;AAAA,IACZ,OAAS,EAAA,IAAA;AAAA,GACX;AACF,CAAU,EAAA;AAQH,SAAS,aAAa,OAA2B,EAAA;AACtD,EAAM,MAAA,sBAAA,GAAyBC,WAAOC,+BAAyB,CAAA,CAAA;AAC/D,EAAA,MAAM,kBACJ,sBAAuB,CAAA,eAAA,CAAA;AAEzB,EAAgB,eAAA,CAAA,kBAAA,CAAmB,QAAQ,eAAe,CAAA,CAAA;AAE1D,EAAgB,eAAA,CAAA,WAAA,CAAY,QAAQ,QAAQ,CAAA,CAAA;AAC5C,EAAI,IAAA,OAAA,CAAQ,iBAAiB,KAAQ,CAAA,EAAA;AACnC,IAAgB,eAAA,CAAA,MAAA,CAAO,eAAe,OAAQ,CAAA,YAAA,CAAA;AAAA,GAChD;AAEA,EAAA,MAAM,QAAQC,YAAS,CAAA;AAAA,IACrB,GAAA,EAAK,MAAM,eAAA,CAAgB,QAAS,EAAA;AAAA,IACpC,GAAA,EAAK,CAAC,CAAW,KAAA,eAAA,CAAgB,SAAS,CAAM,KAAA,EAAA,GAAK,OAAO,CAAC,CAAA;AAAA,GAC9D,CAAA,CAAA;AAED,EAAA,MAAM,SAAY,GAAAA,YAAA;AAAA,IAChB,MAAMC,SAAA,CAAM,eAAgB,CAAA,KAAK,MAAMC,8BAAe,CAAA,KAAA;AAAA,GACxD,CAAA;AAEA,EAAA,MAAM,eAAkB,GAAAF,YAAA,CAAS,MAAM,eAAA,CAAgB,eAAe,CAAA,CAAA;AAEtE,EAAAG,SAAA;AAAA,IACE,eAAA;AAAA,IACA,MAAM;AACJ,MAAA,MAAM,eAAe,OAAQ,CAAA,YAAA,CAAA;AAE7B,MAAI,IAAAF,SAAA,CAAM,SAAS,CAAG,EAAA;AACpB,QAAA,eAAA,CAAgB,MAAO,CAAA,YAAA,GAAe,CAAC,YAAA,EAAc,YAAY,CAAA,CAAA;AACjE,QAAM,KAAA,CAAA,KAAA,GAAQ,CAAC,YAAA,EAAc,YAAY,CAAA,CAAA;AACzC,QAAA,OAAA;AAAA,OACF;AAEA,MAAA,eAAA,CAAgB,OAAO,YAAe,GAAA,YAAA,CAAA;AACtC,MAAA,KAAA,CAAM,KAAQ,GAAA,YAAA,CAAA;AAAA,KAChB;AAAA,IACA,EAAE,WAAW,IAAK,EAAA;AAAA,GACpB,CAAA;AAEA,EAAO,OAAA;AAAA,IACL,SAAA;AAAA,IACA,eAAA;AAAA,IACA,eAAA;AAAA,IACA,KAAA;AAAA,GACF,CAAA;AACF;;;;;"}
+{"version":3,"file":"use-condition.js","sources":["../../../../../../src/components/data-model/filter-panel/composables/use-condition.ts"],"sourcesContent":["import { Operator } from \"@maketribe/dm\";\r\nimport { computed, inject, unref, watch } from \"vue\";\r\n\r\nimport { BETWEEN_OPTION, OperatorOption } from \"../operator-options\";\r\nimport { FILTER_PANEL_ITEM_CONTEXT, FilterPanelItem } from \"../token\";\r\nimport { buildProps } from \"@maketribe/utils\";\r\n\r\nexport const conditionProps = buildProps({\r\n  defaultValue: {\r\n    default: null,\r\n  },\r\n} as const);\r\n\r\nexport type ConditionOptions = {\r\n  operator: Operator;\r\n  operatorOptions: OperatorOption[];\r\n  defaultValue: any;\r\n};\r\n\r\nexport function useCondition(options: ConditionOptions) {\r\n  const filterPanelItemContext = inject(FILTER_PANEL_ITEM_CONTEXT) as any;\r\n  const filterPanelItem =\r\n    filterPanelItemContext.filterPanelItem as FilterPanelItem;\r\n\r\n  filterPanelItem.setOperatorOptions(options.operatorOptions);\r\n\r\n  filterPanelItem.setOperator(options.operator);\r\n  // if (options.defaultValue !== void 0) {\r\n  //   filterPanelItem.column.defaultValue = options.defaultValue;\r\n  // }\r\n\r\n  const value = computed({\r\n    get: () => filterPanelItem.getValue(),\r\n    set: (v: any) => filterPanelItem.setValue(v === \"\" ? null : v),\r\n  });\r\n\r\n  const isBetween = computed(\r\n    () => unref(currentOperator.value) === BETWEEN_OPTION.value\r\n  );\r\n\r\n  const currentOperator = computed(() => filterPanelItem.currentOperator);\r\n\r\n  watch(\r\n    currentOperator,\r\n    () => {\r\n      const defalutValue = options.defaultValue;\r\n\r\n      if (unref(isBetween)) {\r\n        filterPanelItem.column.defaultValue = [defalutValue, defalutValue];\r\n        value.value = [defalutValue, defalutValue];\r\n        return;\r\n      }\r\n\r\n      filterPanelItem.column.defaultValue = defalutValue;\r\n      value.value = defalutValue;\r\n    },\r\n    { immediate: true }\r\n  );\r\n\r\n  return {\r\n    isBetween,\r\n    filterPanelItem,\r\n    currentOperator,\r\n    value,\r\n  };\r\n}\r\n"],"names":["buildProps","inject","FILTER_PANEL_ITEM_CONTEXT","computed","unref","BETWEEN_OPTION","watch"],"mappings":";;;;;;;AAOO,MAAM,iBAAiBA,gBAAW,CAAA;AAAA,EACvC,YAAc,EAAA;AAAA,IACZ,OAAS,EAAA,IAAA;AAAA,GACX;AACF,CAAU,EAAA;AAQH,SAAS,aAAa,OAA2B,EAAA;AACtD,EAAM,MAAA,sBAAA,GAAyBC,WAAOC,+BAAyB,CAAA,CAAA;AAC/D,EAAA,MAAM,kBACJ,sBAAuB,CAAA,eAAA,CAAA;AAEzB,EAAgB,eAAA,CAAA,kBAAA,CAAmB,QAAQ,eAAe,CAAA,CAAA;AAE1D,EAAgB,eAAA,CAAA,WAAA,CAAY,QAAQ,QAAQ,CAAA,CAAA;AAK5C,EAAA,MAAM,QAAQC,YAAS,CAAA;AAAA,IACrB,GAAA,EAAK,MAAM,eAAA,CAAgB,QAAS,EAAA;AAAA,IACpC,GAAA,EAAK,CAAC,CAAW,KAAA,eAAA,CAAgB,SAAS,CAAM,KAAA,EAAA,GAAK,OAAO,CAAC,CAAA;AAAA,GAC9D,CAAA,CAAA;AAED,EAAA,MAAM,SAAY,GAAAA,YAAA;AAAA,IAChB,MAAMC,SAAA,CAAM,eAAgB,CAAA,KAAK,MAAMC,8BAAe,CAAA,KAAA;AAAA,GACxD,CAAA;AAEA,EAAA,MAAM,eAAkB,GAAAF,YAAA,CAAS,MAAM,eAAA,CAAgB,eAAe,CAAA,CAAA;AAEtE,EAAAG,SAAA;AAAA,IACE,eAAA;AAAA,IACA,MAAM;AACJ,MAAA,MAAM,eAAe,OAAQ,CAAA,YAAA,CAAA;AAE7B,MAAI,IAAAF,SAAA,CAAM,SAAS,CAAG,EAAA;AACpB,QAAA,eAAA,CAAgB,MAAO,CAAA,YAAA,GAAe,CAAC,YAAA,EAAc,YAAY,CAAA,CAAA;AACjE,QAAM,KAAA,CAAA,KAAA,GAAQ,CAAC,YAAA,EAAc,YAAY,CAAA,CAAA;AACzC,QAAA,OAAA;AAAA,OACF;AAEA,MAAA,eAAA,CAAgB,OAAO,YAAe,GAAA,YAAA,CAAA;AACtC,MAAA,KAAA,CAAM,KAAQ,GAAA,YAAA,CAAA;AAAA,KAChB;AAAA,IACA,EAAE,WAAW,IAAK,EAAA;AAAA,GACpB,CAAA;AAEA,EAAO,OAAA;AAAA,IACL,SAAA;AAAA,IACA,eAAA;AAAA,IACA,eAAA;AAAA,IACA,KAAA;AAAA,GACF,CAAA;AACF;;;;;"}

package/dist/cjs/dataview/member/MemberTable.js

@@ -18,6 +18,11 @@ class MemberTable extends dm.DataTable {
     await super.initialize();
     await this.initActiveMemberForm();
     this.dataFilter.setColumns([new dm.FilterColumn({
+      name: "fdsafdsaf",
+      label: "fasdfsa",
+      componentInfo: "MKConditionDate",
+      defaultValue: ["2024-01-20 00:00:00", "2024-01-21 00:00:00"]
+    }), new dm.FilterColumn({
       name: "name",
       label: "\u59D3\u540D",
       componentInfo: "MKConditionInput"

package/dist/cjs/dataview/member/MemberTable.js.map

@@ -1 +1 @@
-{"version":3,"file":"MemberTable.js","sources":["../../../../src/dataview/member/MemberTable.tsx"],"sourcesContent":["import { R } from \"@maketribe/request\";\r\nimport {\r\n  TableColumn,\r\n  DataTable,\r\n  DataTableOptions,\r\n  FilterColumn,\r\n  TableActionColumn,\r\n  ActionButton,\r\n  DeleteButton,\r\n  EditButton,\r\n  Messager,\r\n  Dialoger,\r\n  FormColumn,\r\n} from \"@maketribe/dm\";\r\nimport { defineDataTable } from \"../../define-data-table\";\r\nimport { Member, MemberForm, MemberResult } from \"./MemberForm\";\r\n\r\nexport type MemberTableItem = Omit<Member, \"password\" | \"confirmPassword\">;\r\n\r\nexport class MemberTable extends DataTable<MemberResult, MemberTableItem> {\r\n  activeMemberForm: MemberForm;\r\n\r\n  isShowActiveMemberForm: boolean;\r\n\r\n  constructor(options: DataTableOptions = {}) {\r\n    super({ name: \"ms-member\", ...options });\r\n\r\n    this.activeMemberForm = new MemberForm();\r\n\r\n    this.isShowActiveMemberForm = false;\r\n  }\r\n\r\n  protected async initialize() {\r\n    await super.initialize();\r\n\r\n    await this.initActiveMemberForm();\r\n\r\n    this.dataFilter.setColumns([\r\n      new FilterColumn({\r\n        name: \"name\",\r\n        label: \"姓名\",\r\n        componentInfo: \"MKConditionInput\",\r\n      }),\r\n      new FilterColumn({\r\n        name: \"wechatNo\",\r\n        label: \"微信号\",\r\n        componentInfo: \"MKConditionInput\",\r\n      }),\r\n      new FilterColumn({\r\n        name: \"nickName\",\r\n        label: \"昵称\",\r\n        componentInfo: \"MKConditionInput\",\r\n      }),\r\n      new FilterColumn({\r\n        name: \"email\",\r\n        label: \"邮箱\",\r\n        componentInfo: \"MKConditionInput\",\r\n      }),\r\n      new FilterColumn({\r\n        name: \"phone\",\r\n        label: \"手机号\",\r\n        componentInfo: \"MKConditionInput\",\r\n      }),\r\n      new FilterColumn({\r\n        name: \"account\",\r\n        label: \"账号\",\r\n        componentInfo: \"MKConditionInput\",\r\n      }),\r\n    ]);\r\n\r\n    this.setColumns([\r\n      new TableColumn({\r\n        name: \"id\",\r\n        label: \"编号\",\r\n        width: \"190px\",\r\n        visible: false,\r\n      }),\r\n      new TableColumn({ name: \"name\", label: \"姓名\", minWidth: \"150px\" }),\r\n      new TableColumn({ name: \"nickName\", label: \"昵称\", minWidth: \"150px\" }),\r\n      new TableColumn({\r\n        name: \"avatar\",\r\n        label: \"头像\",\r\n        componentInfo: \"MKColumnImage\",\r\n        width: \"80px\",\r\n      }),\r\n      new TableColumn({ name: \"account\", label: \"账号\", minWidth: \"150px\" }),\r\n      new TableColumn({ name: \"email\", label: \"邮箱\", minWidth: \"200px\" }),\r\n      new TableColumn({ name: \"phone\", label: \"手机号\", minWidth: \"120px\" }),\r\n      new TableColumn({ name: \"wechatNo\", label: \"微信号\", minWidth: \"140px\" }),\r\n      new TableColumn({\r\n        name: \"valid\",\r\n        label: \"微信号\",\r\n        minWidth: \"140px\",\r\n        visible: false,\r\n      }),\r\n      new TableActionColumn({\r\n        width: \"200px\",\r\n        buttons: [\r\n          new ActionButton({\r\n            label: \"激活用户\",\r\n            handler: async (row) => {\r\n              const response = await this.activeMemberForm.editRecord(row.id);\r\n\r\n              if (response.data.code !== 200) {\r\n                Messager.instance.error({ message: response.data.msg });\r\n                return;\r\n              }\r\n\r\n              this.isShowActiveMemberForm = true;\r\n            },\r\n            predicate: (member: MemberTableItem) => member.valid === 0,\r\n          }),\r\n          new ActionButton({\r\n            label: \"重置密码\",\r\n            handler: async (row) => {\r\n              const isConfirm = await Dialoger.instance.confirm({\r\n                title: \"重置密码\",\r\n                message: \"是否重置密码\",\r\n                type: \"warning\",\r\n                cancelButtonText: \"取消\",\r\n                confirmButtonText: \"确定\",\r\n              });\r\n              if (!isConfirm) {\r\n                return;\r\n              }\r\n              this.loadingManager.startLoading();\r\n\r\n              const response = await this.dataViewRequest.callDVRequest<\r\n                R<string>\r\n              >({\r\n                action: `${row.id}/password/reset`,\r\n              });\r\n\r\n              this.loadingManager.completeLoading();\r\n              if (response.data.code !== 200) {\r\n                Messager.instance.error({\r\n                  message: response.data.msg || \"重置密码失败\",\r\n                });\r\n                return;\r\n              }\r\n\r\n              const res = await Dialoger.instance.confirm({\r\n                title: \"重置密码成功\",\r\n                message: (\r\n                  <p>\r\n                    <span>你的新密码为{response.data.data}</span>\r\n                  </p>\r\n                ),\r\n                type: \"warning\",\r\n                cancelButtonText: \"取消\",\r\n                confirmButtonText: \"复制\",\r\n              });\r\n              if (!res) {\r\n                return;\r\n              }\r\n\r\n              navigator.clipboard.writeText(response.data.data);\r\n              Messager.instance.success({ message: \"复制成功\" });\r\n            },\r\n            predicate: (member: MemberTableItem) => member.valid === 1,\r\n          }),\r\n          new EditButton({\r\n            predicate: (member: MemberTableItem) => member.valid === 1,\r\n          }),\r\n          new DeleteButton(),\r\n        ],\r\n      }),\r\n    ]);\r\n  }\r\n\r\n  protected async initActiveMemberForm() {\r\n    const activeMemberForm = this.activeMemberForm;\r\n\r\n    await activeMemberForm.init();\r\n\r\n    activeMemberForm.setColumns([\r\n      activeMemberForm.getColumn(\"id\")!,\r\n      new FormColumn({\r\n        name: \"approveResult\",\r\n        label: \"是否通过\",\r\n        defaultValue: \"0\",\r\n        componentInfo: \"MKFormRadioBox\",\r\n        required: true,\r\n        componentProps: {\r\n          options: [\r\n            { label: \"通过\", value: \"1\" },\r\n            { label: \"不通过\", value: \"0\" },\r\n          ],\r\n        },\r\n      }),\r\n      activeMemberForm.getColumn(\"roles\")!,\r\n      activeMemberForm.getColumn(\"depts\")!,\r\n      activeMemberForm.getColumn(\"memo\")!,\r\n    ]);\r\n  }\r\n\r\n  async approveMember() {\r\n    try {\r\n      this.activeMemberForm.getLoadingManager().startLoading();\r\n      const result = await this.activeMemberForm.httpRequest?.post(\r\n        \"/api/dv/ms-member/apply/account/approve\",\r\n        {\r\n          ...this.activeMemberForm.formatSubmitData(this.activeMemberForm.data),\r\n        }\r\n      );\r\n      this.activeMemberForm.getLoadingManager().completeLoading();\r\n\r\n      if (result?.data.code != 200) {\r\n        Messager.instance.error(result?.data.msg || \"请求失败\");\r\n        return;\r\n      }\r\n\r\n      Messager.instance.success({\r\n        message: \"激活通过，密码已发送到邮箱\",\r\n      });\r\n\r\n      this.load();\r\n    } catch (e) {\r\n      console.error(e);\r\n      Messager.instance.error({ message: \"网络异常\" });\r\n    }\r\n  }\r\n\r\n  formatItem(item: MemberResult): MemberTableItem {\r\n    let avatar: string | null;\r\n    try {\r\n      avatar = item.avatar ? new URL(item.avatar).toString() : null;\r\n    } catch (e) {\r\n      avatar = null;\r\n    }\r\n\r\n    return {\r\n      id: item.id,\r\n      name: item.name || \"\",\r\n      wechatNo: item.wechatNo || \"\",\r\n      nickName: item.nickName || \"\",\r\n      email: item.email || \"\",\r\n      phone: item.phone || \"\",\r\n      account: item.account || \"\",\r\n      avatar,\r\n      roles: item.roles?.map((role) => ({\r\n        id: role.id,\r\n        name: role.name || \"\",\r\n        desc: role.desc || \"\",\r\n      })),\r\n      depts: item.depts?.map((department) => ({\r\n        id: department.id,\r\n        name: department.name || \"\",\r\n        // memberID: department.memberID || null,\r\n        pid: department.pid || null,\r\n      })),\r\n      valid: item.valid,\r\n    };\r\n  }\r\n}\r\n\r\ndefineDataTable(MemberTable);\r\n"],"names":["MemberTable","DataTable","constructor","options","name","activeMemberForm","MemberForm","isShowActiveMemberForm","initialize","initActiveMemberForm","dataFilter","setColumns","FilterColumn","label","componentInfo","TableColumn","width","visible","minWidth","TableActionColumn","buttons","ActionButton","handler","row","response","editRecord","id","data","code","Messager","instance","error","message","msg","predicate","member","valid","isConfirm","Dialoger","confirm","title","type","cancelButtonText","confirmButtonText","loadingManager","startLoading","dataViewRequest","callDVRequest","action","completeLoading","res","_createVNode","_createTextVNode","navigator","clipboard","writeText","success","EditButton","DeleteButton","init","getColumn","FormColumn","defaultValue","required","componentProps","value","approveMember","getLoadingManager","result","httpRequest","post","formatSubmitData","load","e","console","formatItem","item","avatar","URL","toString","wechatNo","nickName","email","phone","account","roles","map","role","desc","depts","department","pid","defineDataTable"],"mappings":"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"}
+{"version":3,"file":"MemberTable.js","sources":["../../../../src/dataview/member/MemberTable.tsx"],"sourcesContent":["import { R } from \"@maketribe/request\";\r\nimport {\r\n  TableColumn,\r\n  DataTable,\r\n  DataTableOptions,\r\n  FilterColumn,\r\n  TableActionColumn,\r\n  ActionButton,\r\n  DeleteButton,\r\n  EditButton,\r\n  Messager,\r\n  Dialoger,\r\n  FormColumn,\r\n} from \"@maketribe/dm\";\r\nimport { defineDataTable } from \"../../define-data-table\";\r\nimport { Member, MemberForm, MemberResult } from \"./MemberForm\";\r\n\r\nexport type MemberTableItem = Omit<Member, \"password\" | \"confirmPassword\">;\r\n\r\nexport class MemberTable extends DataTable<MemberResult, MemberTableItem> {\r\n  activeMemberForm: MemberForm;\r\n\r\n  isShowActiveMemberForm: boolean;\r\n\r\n  constructor(options: DataTableOptions = {}) {\r\n    super({ name: \"ms-member\", ...options });\r\n\r\n    this.activeMemberForm = new MemberForm();\r\n\r\n    this.isShowActiveMemberForm = false;\r\n  }\r\n\r\n  protected async initialize() {\r\n    await super.initialize();\r\n\r\n    await this.initActiveMemberForm();\r\n\r\n    this.dataFilter.setColumns([\r\n      new FilterColumn({\r\n        name: \"fdsafdsaf\",\r\n        label: \"fasdfsa\",\r\n        componentInfo: \"MKConditionDate\",\r\n        defaultValue: [\"2024-01-20 00:00:00\", \"2024-01-21 00:00:00\"]\r\n      }),\r\n      new FilterColumn({\r\n        name: \"name\",\r\n        label: \"姓名\",\r\n        componentInfo: \"MKConditionInput\",\r\n      }),\r\n      new FilterColumn({\r\n        name: \"wechatNo\",\r\n        label: \"微信号\",\r\n        componentInfo: \"MKConditionInput\",\r\n      }),\r\n      new FilterColumn({\r\n        name: \"nickName\",\r\n        label: \"昵称\",\r\n        componentInfo: \"MKConditionInput\",\r\n      }),\r\n      new FilterColumn({\r\n        name: \"email\",\r\n        label: \"邮箱\",\r\n        componentInfo: \"MKConditionInput\",\r\n      }),\r\n      new FilterColumn({\r\n        name: \"phone\",\r\n        label: \"手机号\",\r\n        componentInfo: \"MKConditionInput\",\r\n      }),\r\n      new FilterColumn({\r\n        name: \"account\",\r\n        label: \"账号\",\r\n        componentInfo: \"MKConditionInput\",\r\n      }),\r\n    ]);\r\n\r\n    this.setColumns([\r\n      new TableColumn({\r\n        name: \"id\",\r\n        label: \"编号\",\r\n        width: \"190px\",\r\n        visible: false,\r\n      }),\r\n      new TableColumn({ name: \"name\", label: \"姓名\", minWidth: \"150px\" }),\r\n      new TableColumn({ name: \"nickName\", label: \"昵称\", minWidth: \"150px\" }),\r\n      new TableColumn({\r\n        name: \"avatar\",\r\n        label: \"头像\",\r\n        componentInfo: \"MKColumnImage\",\r\n        width: \"80px\",\r\n      }),\r\n      new TableColumn({ name: \"account\", label: \"账号\", minWidth: \"150px\" }),\r\n      new TableColumn({ name: \"email\", label: \"邮箱\", minWidth: \"200px\" }),\r\n      new TableColumn({ name: \"phone\", label: \"手机号\", minWidth: \"120px\" }),\r\n      new TableColumn({ name: \"wechatNo\", label: \"微信号\", minWidth: \"140px\" }),\r\n      new TableColumn({\r\n        name: \"valid\",\r\n        label: \"微信号\",\r\n        minWidth: \"140px\",\r\n        visible: false,\r\n      }),\r\n      new TableActionColumn({\r\n        width: \"200px\",\r\n        buttons: [\r\n          new ActionButton({\r\n            label: \"激活用户\",\r\n            handler: async (row) => {\r\n              const response = await this.activeMemberForm.editRecord(row.id);\r\n\r\n              if (response.data.code !== 200) {\r\n                Messager.instance.error({ message: response.data.msg });\r\n                return;\r\n              }\r\n\r\n              this.isShowActiveMemberForm = true;\r\n            },\r\n            predicate: (member: MemberTableItem) => member.valid === 0,\r\n          }),\r\n          new ActionButton({\r\n            label: \"重置密码\",\r\n            handler: async (row) => {\r\n              const isConfirm = await Dialoger.instance.confirm({\r\n                title: \"重置密码\",\r\n                message: \"是否重置密码\",\r\n                type: \"warning\",\r\n                cancelButtonText: \"取消\",\r\n                confirmButtonText: \"确定\",\r\n              });\r\n              if (!isConfirm) {\r\n                return;\r\n              }\r\n              this.loadingManager.startLoading();\r\n\r\n              const response = await this.dataViewRequest.callDVRequest<\r\n                R<string>\r\n              >({\r\n                action: `${row.id}/password/reset`,\r\n              });\r\n\r\n              this.loadingManager.completeLoading();\r\n              if (response.data.code !== 200) {\r\n                Messager.instance.error({\r\n                  message: response.data.msg || \"重置密码失败\",\r\n                });\r\n                return;\r\n              }\r\n\r\n              const res = await Dialoger.instance.confirm({\r\n                title: \"重置密码成功\",\r\n                message: (\r\n                  <p>\r\n                    <span>你的新密码为{response.data.data}</span>\r\n                  </p>\r\n                ),\r\n                type: \"warning\",\r\n                cancelButtonText: \"取消\",\r\n                confirmButtonText: \"复制\",\r\n              });\r\n              if (!res) {\r\n                return;\r\n              }\r\n\r\n              navigator.clipboard.writeText(response.data.data);\r\n              Messager.instance.success({ message: \"复制成功\" });\r\n            },\r\n            predicate: (member: MemberTableItem) => member.valid === 1,\r\n          }),\r\n          new EditButton({\r\n            predicate: (member: MemberTableItem) => member.valid === 1,\r\n          }),\r\n          new DeleteButton(),\r\n        ],\r\n      }),\r\n    ]);\r\n  }\r\n\r\n  protected async initActiveMemberForm() {\r\n    const activeMemberForm = this.activeMemberForm;\r\n\r\n    await activeMemberForm.init();\r\n\r\n    activeMemberForm.setColumns([\r\n      activeMemberForm.getColumn(\"id\")!,\r\n      new FormColumn({\r\n        name: \"approveResult\",\r\n        label: \"是否通过\",\r\n        defaultValue: \"0\",\r\n        componentInfo: \"MKFormRadioBox\",\r\n        required: true,\r\n        componentProps: {\r\n          options: [\r\n            { label: \"通过\", value: \"1\" },\r\n            { label: \"不通过\", value: \"0\" },\r\n          ],\r\n        },\r\n      }),\r\n      activeMemberForm.getColumn(\"roles\")!,\r\n      activeMemberForm.getColumn(\"depts\")!,\r\n      activeMemberForm.getColumn(\"memo\")!,\r\n    ]);\r\n  }\r\n\r\n  async approveMember() {\r\n    try {\r\n      this.activeMemberForm.getLoadingManager().startLoading();\r\n      const result = await this.activeMemberForm.httpRequest?.post(\r\n        \"/api/dv/ms-member/apply/account/approve\",\r\n        {\r\n          ...this.activeMemberForm.formatSubmitData(this.activeMemberForm.data),\r\n        }\r\n      );\r\n      this.activeMemberForm.getLoadingManager().completeLoading();\r\n\r\n      if (result?.data.code != 200) {\r\n        Messager.instance.error(result?.data.msg || \"请求失败\");\r\n        return;\r\n      }\r\n\r\n      Messager.instance.success({\r\n        message: \"激活通过，密码已发送到邮箱\",\r\n      });\r\n\r\n      this.load();\r\n    } catch (e) {\r\n      console.error(e);\r\n      Messager.instance.error({ message: \"网络异常\" });\r\n    }\r\n  }\r\n\r\n  formatItem(item: MemberResult): MemberTableItem {\r\n    let avatar: string | null;\r\n    try {\r\n      avatar = item.avatar ? new URL(item.avatar).toString() : null;\r\n    } catch (e) {\r\n      avatar = null;\r\n    }\r\n\r\n    return {\r\n      id: item.id,\r\n      name: item.name || \"\",\r\n      wechatNo: item.wechatNo || \"\",\r\n      nickName: item.nickName || \"\",\r\n      email: item.email || \"\",\r\n      phone: item.phone || \"\",\r\n      account: item.account || \"\",\r\n      avatar,\r\n      roles: item.roles?.map((role) => ({\r\n        id: role.id,\r\n        name: role.name || \"\",\r\n        desc: role.desc || \"\",\r\n      })),\r\n      depts: item.depts?.map((department) => ({\r\n        id: department.id,\r\n        name: department.name || \"\",\r\n        // memberID: department.memberID || null,\r\n        pid: department.pid || null,\r\n      })),\r\n      valid: item.valid,\r\n    };\r\n  }\r\n}\r\n\r\ndefineDataTable(MemberTable);\r\n"],"names":["MemberTable","DataTable","constructor","options","name","activeMemberForm","MemberForm","isShowActiveMemberForm","initialize","initActiveMemberForm","dataFilter","setColumns","FilterColumn","label","componentInfo","defaultValue","TableColumn","width","visible","minWidth","TableActionColumn","buttons","ActionButton","handler","row","response","editRecord","id","data","code","Messager","instance","error","message","msg","predicate","member","valid","isConfirm","Dialoger","confirm","title","type","cancelButtonText","confirmButtonText","loadingManager","startLoading","dataViewRequest","callDVRequest","action","completeLoading","res","_createVNode","_createTextVNode","navigator","clipboard","writeText","success","EditButton","DeleteButton","init","getColumn","FormColumn","required","componentProps","value","approveMember","getLoadingManager","result","httpRequest","post","formatSubmitData","load","e","console","formatItem","item","avatar","URL","toString","wechatNo","nickName","email","phone","account","roles","map","role","desc","depts","department","pid","defineDataTable"],"mappings":"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"}

package/dist/esm/components/data-model/data-filter-form/composables/use-condition.js

@@ -13,9 +13,6 @@ function useDataFilterCondition(options) {
   const dataFilterItem = dataFilterItemContext.dataFilterItem;
   dataFilterItem.setOperatorOptions(options.operatorOptions);
   dataFilterItem.setOperator(options.operator);
-  if (options.defaultValue !== void 0) {
-    dataFilterItem.column.defaultValue = options.defaultValue;
-  }
   const value = computed({
     get: () => dataFilterItem.getValue(),
     set: (v) => dataFilterItem.setValue(v === "" ? null : v)
@@ -26,17 +23,17 @@ function useDataFilterCondition(options) {
   const currentOperator = computed(() => dataFilterItem.currentOperator);
   const calcDefaultValue = () => {
     const defaultValue = options.defaultValue;
-    if (unref(isBetween)) {
+    if (unref(isBetween) && !Array.isArray(defaultValue)) {
       return [defaultValue, defaultValue];
     }
     return defaultValue;
   };
   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 {
     isBetween,

package/dist/esm/components/data-model/data-filter-form/composables/use-condition.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-condition.js","sources":["../../../../../../src/components/data-model/data-filter-form/composables/use-condition.ts"],"sourcesContent":["import { computed, inject, unref, watch } from \"vue\";\r\nimport { buildProps } from \"@maketribe/utils\";\r\nimport { Operator } from \"@maketribe/dm\";\r\n\r\nimport { BETWEEN_OPTION, OperatorOption } from \"../operator-options\";\r\nimport { DATA_FILTER_ITEM_CONTEXT } from \"../token\";\r\n\r\nexport const dataFilterConditionProps = buildProps({\r\n  defaultValue: {\r\n    default: null,\r\n  },\r\n} as const);\r\n\r\nexport type DataFilterConditionOptions = {\r\n  operator: Operator;\r\n  operatorOptions: OperatorOption[];\r\n  defaultValue: any;\r\n};\r\n\r\nexport function useDataFilterCondition(options: DataFilterConditionOptions) {\r\n  const dataFilterItemContext = inject(DATA_FILTER_ITEM_CONTEXT)!;\r\n  const dataFilterItem = dataFilterItemContext.dataFilterItem;\r\n\r\n  dataFilterItem.setOperatorOptions(options.operatorOptions);\r\n\r\n  dataFilterItem.setOperator(options.operator);\r\n  if (options.defaultValue !== void 0) {\r\n    dataFilterItem.column.defaultValue = options.defaultValue;\r\n  }\r\n\r\n  const value = computed({\r\n    get: () => dataFilterItem.getValue(),\r\n    set: (v: any) => dataFilterItem.setValue(v === \"\" ? null : v),\r\n  });\r\n\r\n  const isBetween = computed(\r\n    () => unref(currentOperator.value) === BETWEEN_OPTION.value\r\n  );\r\n\r\n  const currentOperator = computed(() => dataFilterItem.currentOperator);\r\n\r\n  const calcDefaultValue = () => {\r\n    const defaultValue = options.defaultValue;\r\n\r\n    if (unref(isBetween)) {\r\n      return [defaultValue, defaultValue];\r\n    }\r\n\r\n    return defaultValue;\r\n  };\r\n\r\n  watch(currentOperator, () => {\r\n    const defaultValue = calcDefaultValue();\r\n\r\n    dataFilterItem.column.defaultValue = defaultValue;\r\n    value.value = defaultValue;\r\n  });\r\n\r\n  dataFilterItem.column.defaultValue = calcDefaultValue();\r\n  value.value = dataFilterItem.getValue() || calcDefaultValue();\r\n\r\n  return {\r\n    isBetween,\r\n    dataFilterItem,\r\n    currentOperator,\r\n    value,\r\n  };\r\n}\r\n"],"names":[],"mappings":";;;;;AAOO,MAAM,2BAA2B,UAAW,CAAA;AAAA,EACjD,YAAc,EAAA;AAAA,IACZ,OAAS,EAAA,IAAA;AAAA,GACX;AACF,CAAU,EAAA;AAQH,SAAS,uBAAuB,OAAqC,EAAA;AAC1E,EAAM,MAAA,qBAAA,GAAwB,OAAO,wBAAwB,CAAA,CAAA;AAC7D,EAAA,MAAM,iBAAiB,qBAAsB,CAAA,cAAA,CAAA;AAE7C,EAAe,cAAA,CAAA,kBAAA,CAAmB,QAAQ,eAAe,CAAA,CAAA;AAEzD,EAAe,cAAA,CAAA,WAAA,CAAY,QAAQ,QAAQ,CAAA,CAAA;AAC3C,EAAI,IAAA,OAAA,CAAQ,iBAAiB,KAAQ,CAAA,EAAA;AACnC,IAAe,cAAA,CAAA,MAAA,CAAO,eAAe,OAAQ,CAAA,YAAA,CAAA;AAAA,GAC/C;AAEA,EAAA,MAAM,QAAQ,QAAS,CAAA;AAAA,IACrB,GAAA,EAAK,MAAM,cAAA,CAAe,QAAS,EAAA;AAAA,IACnC,GAAA,EAAK,CAAC,CAAW,KAAA,cAAA,CAAe,SAAS,CAAM,KAAA,EAAA,GAAK,OAAO,CAAC,CAAA;AAAA,GAC7D,CAAA,CAAA;AAED,EAAA,MAAM,SAAY,GAAA,QAAA;AAAA,IAChB,MAAM,KAAA,CAAM,eAAgB,CAAA,KAAK,MAAM,cAAe,CAAA,KAAA;AAAA,GACxD,CAAA;AAEA,EAAA,MAAM,eAAkB,GAAA,QAAA,CAAS,MAAM,cAAA,CAAe,eAAe,CAAA,CAAA;AAErE,EAAA,MAAM,mBAAmB,MAAM;AAC7B,IAAA,MAAM,eAAe,OAAQ,CAAA,YAAA,CAAA;AAE7B,IAAI,IAAA,KAAA,CAAM,SAAS,CAAG,EAAA;AACpB,MAAO,OAAA,CAAC,cAAc,YAAY,CAAA,CAAA;AAAA,KACpC;AAEA,IAAO,OAAA,YAAA,CAAA;AAAA,GACT,CAAA;AAEA,EAAA,KAAA,CAAM,iBAAiB,MAAM;AAC3B,IAAA,MAAM,eAAe,gBAAiB,EAAA,CAAA;AAEtC,IAAA,cAAA,CAAe,OAAO,YAAe,GAAA,YAAA,CAAA;AACrC,IAAA,KAAA,CAAM,KAAQ,GAAA,YAAA,CAAA;AAAA,GACf,CAAA,CAAA;AAED,EAAe,cAAA,CAAA,MAAA,CAAO,eAAe,gBAAiB,EAAA,CAAA;AACtD,EAAA,KAAA,CAAM,KAAQ,GAAA,cAAA,CAAe,QAAS,EAAA,IAAK,gBAAiB,EAAA,CAAA;AAE5D,EAAO,OAAA;AAAA,IACL,SAAA;AAAA,IACA,cAAA;AAAA,IACA,eAAA;AAAA,IACA,KAAA;AAAA,GACF,CAAA;AACF;;;;"}
+{"version":3,"file":"use-condition.js","sources":["../../../../../../src/components/data-model/data-filter-form/composables/use-condition.ts"],"sourcesContent":["import { computed, inject, unref, watch } from \"vue\";\r\nimport { buildProps } from \"@maketribe/utils\";\r\nimport { Operator } from \"@maketribe/dm\";\r\n\r\nimport { BETWEEN_OPTION, OperatorOption } from \"../operator-options\";\r\nimport { DATA_FILTER_ITEM_CONTEXT } from \"../token\";\r\n\r\nexport const dataFilterConditionProps = buildProps({\r\n  defaultValue: {\r\n    default: null,\r\n  },\r\n} as const);\r\n\r\nexport type DataFilterConditionOptions = {\r\n  operator: Operator;\r\n  operatorOptions: OperatorOption[];\r\n  defaultValue: any;\r\n};\r\n\r\nexport function useDataFilterCondition(options: DataFilterConditionOptions) {\r\n  const dataFilterItemContext = inject(DATA_FILTER_ITEM_CONTEXT)!;\r\n  const dataFilterItem = dataFilterItemContext.dataFilterItem;\r\n\r\n  dataFilterItem.setOperatorOptions(options.operatorOptions);\r\n\r\n  dataFilterItem.setOperator(options.operator);\r\n  // if (options.defaultValue !== void 0) {\r\n  //   dataFilterItem.column.defaultValue = options.defaultValue;\r\n  // }\r\n\r\n  const value = computed({\r\n    get: () => dataFilterItem.getValue(),\r\n    set: (v: any) => dataFilterItem.setValue(v === \"\" ? null : v),\r\n  });\r\n\r\n  const isBetween = computed(\r\n    () => unref(currentOperator.value) === BETWEEN_OPTION.value\r\n  );\r\n\r\n  const currentOperator = computed(() => dataFilterItem.currentOperator);\r\n\r\n  const calcDefaultValue = () => {\r\n    const defaultValue = options.defaultValue;\r\n\r\n    if (unref(isBetween) && !Array.isArray(defaultValue)) {\r\n      return [defaultValue, defaultValue];\r\n    }\r\n\r\n    return defaultValue;\r\n  };\r\n\r\n  watch(currentOperator, () => {\r\n    const defaultValue = dataFilterItem.column.defaultValue || calcDefaultValue();\r\n\r\n    dataFilterItem.column.defaultValue = defaultValue;\r\n    value.value = defaultValue;\r\n  });\r\n\r\n  dataFilterItem.column.defaultValue = dataFilterItem.column.defaultValue || calcDefaultValue();\r\n  value.value = dataFilterItem.getValue() || calcDefaultValue();\r\n\r\n  return {\r\n    isBetween,\r\n    dataFilterItem,\r\n    currentOperator,\r\n    value,\r\n  };\r\n}\r\n"],"names":[],"mappings":";;;;;AAOO,MAAM,2BAA2B,UAAW,CAAA;AAAA,EACjD,YAAc,EAAA;AAAA,IACZ,OAAS,EAAA,IAAA;AAAA,GACX;AACF,CAAU,EAAA;AAQH,SAAS,uBAAuB,OAAqC,EAAA;AAC1E,EAAM,MAAA,qBAAA,GAAwB,OAAO,wBAAwB,CAAA,CAAA;AAC7D,EAAA,MAAM,iBAAiB,qBAAsB,CAAA,cAAA,CAAA;AAE7C,EAAe,cAAA,CAAA,kBAAA,CAAmB,QAAQ,eAAe,CAAA,CAAA;AAEzD,EAAe,cAAA,CAAA,WAAA,CAAY,QAAQ,QAAQ,CAAA,CAAA;AAK3C,EAAA,MAAM,QAAQ,QAAS,CAAA;AAAA,IACrB,GAAA,EAAK,MAAM,cAAA,CAAe,QAAS,EAAA;AAAA,IACnC,GAAA,EAAK,CAAC,CAAW,KAAA,cAAA,CAAe,SAAS,CAAM,KAAA,EAAA,GAAK,OAAO,CAAC,CAAA;AAAA,GAC7D,CAAA,CAAA;AAED,EAAA,MAAM,SAAY,GAAA,QAAA;AAAA,IAChB,MAAM,KAAA,CAAM,eAAgB,CAAA,KAAK,MAAM,cAAe,CAAA,KAAA;AAAA,GACxD,CAAA;AAEA,EAAA,MAAM,eAAkB,GAAA,QAAA,CAAS,MAAM,cAAA,CAAe,eAAe,CAAA,CAAA;AAErE,EAAA,MAAM,mBAAmB,MAAM;AAC7B,IAAA,MAAM,eAAe,OAAQ,CAAA,YAAA,CAAA;AAE7B,IAAA,IAAI,MAAM,SAAS,CAAA,IAAK,CAAC,KAAM,CAAA,OAAA,CAAQ,YAAY,CAAG,EAAA;AACpD,MAAO,OAAA,CAAC,cAAc,YAAY,CAAA,CAAA;AAAA,KACpC;AAEA,IAAO,OAAA,YAAA,CAAA;AAAA,GACT,CAAA;AAEA,EAAA,KAAA,CAAM,iBAAiB,MAAM;AAC3B,IAAA,MAAM,YAAe,GAAA,cAAA,CAAe,MAAO,CAAA,YAAA,IAAgB,gBAAiB,EAAA,CAAA;AAE5E,IAAA,cAAA,CAAe,OAAO,YAAe,GAAA,YAAA,CAAA;AACrC,IAAA,KAAA,CAAM,KAAQ,GAAA,YAAA,CAAA;AAAA,GACf,CAAA,CAAA;AAED,EAAA,cAAA,CAAe,MAAO,CAAA,YAAA,GAAe,cAAe,CAAA,MAAA,CAAO,gBAAgB,gBAAiB,EAAA,CAAA;AAC5F,EAAA,KAAA,CAAM,KAAQ,GAAA,cAAA,CAAe,QAAS,EAAA,IAAK,gBAAiB,EAAA,CAAA;AAE5D,EAAO,OAAA;AAAA,IACL,SAAA;AAAA,IACA,cAAA;AAAA,IACA,eAAA;AAAA,IACA,KAAA;AAAA,GACF,CAAA;AACF;;;;"}

package/dist/esm/components/data-model/filter-panel/composables/use-condition.js

@@ -13,9 +13,6 @@ function useCondition(options) {
   const filterPanelItem = filterPanelItemContext.filterPanelItem;
   filterPanelItem.setOperatorOptions(options.operatorOptions);
   filterPanelItem.setOperator(options.operator);
-  if (options.defaultValue !== void 0) {
-    filterPanelItem.column.defaultValue = options.defaultValue;
-  }
   const value = computed({
     get: () => filterPanelItem.getValue(),
     set: (v) => filterPanelItem.setValue(v === "" ? null : v)

package/dist/esm/components/data-model/filter-panel/composables/use-condition.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-condition.js","sources":["../../../../../../src/components/data-model/filter-panel/composables/use-condition.ts"],"sourcesContent":["import { Operator } from \"@maketribe/dm\";\r\nimport { computed, inject, unref, watch } from \"vue\";\r\n\r\nimport { BETWEEN_OPTION, OperatorOption } from \"../operator-options\";\r\nimport { FILTER_PANEL_ITEM_CONTEXT, FilterPanelItem } from \"../token\";\r\nimport { buildProps } from \"@maketribe/utils\";\r\n\r\nexport const conditionProps = buildProps({\r\n  defaultValue: {\r\n    default: null,\r\n  },\r\n} as const);\r\n\r\nexport type ConditionOptions = {\r\n  operator: Operator;\r\n  operatorOptions: OperatorOption[];\r\n  defaultValue: any;\r\n};\r\n\r\nexport function useCondition(options: ConditionOptions) {\r\n  const filterPanelItemContext = inject(FILTER_PANEL_ITEM_CONTEXT) as any;\r\n  const filterPanelItem =\r\n    filterPanelItemContext.filterPanelItem as FilterPanelItem;\r\n\r\n  filterPanelItem.setOperatorOptions(options.operatorOptions);\r\n\r\n  filterPanelItem.setOperator(options.operator);\r\n  if (options.defaultValue !== void 0) {\r\n    filterPanelItem.column.defaultValue = options.defaultValue;\r\n  }\r\n\r\n  const value = computed({\r\n    get: () => filterPanelItem.getValue(),\r\n    set: (v: any) => filterPanelItem.setValue(v === \"\" ? null : v),\r\n  });\r\n\r\n  const isBetween = computed(\r\n    () => unref(currentOperator.value) === BETWEEN_OPTION.value\r\n  );\r\n\r\n  const currentOperator = computed(() => filterPanelItem.currentOperator);\r\n\r\n  watch(\r\n    currentOperator,\r\n    () => {\r\n      const defalutValue = options.defaultValue;\r\n\r\n      if (unref(isBetween)) {\r\n        filterPanelItem.column.defaultValue = [defalutValue, defalutValue];\r\n        value.value = [defalutValue, defalutValue];\r\n        return;\r\n      }\r\n\r\n      filterPanelItem.column.defaultValue = defalutValue;\r\n      value.value = defalutValue;\r\n    },\r\n    { immediate: true }\r\n  );\r\n\r\n  return {\r\n    isBetween,\r\n    filterPanelItem,\r\n    currentOperator,\r\n    value,\r\n  };\r\n}\r\n"],"names":[],"mappings":";;;;;AAOO,MAAM,iBAAiB,UAAW,CAAA;AAAA,EACvC,YAAc,EAAA;AAAA,IACZ,OAAS,EAAA,IAAA;AAAA,GACX;AACF,CAAU,EAAA;AAQH,SAAS,aAAa,OAA2B,EAAA;AACtD,EAAM,MAAA,sBAAA,GAAyB,OAAO,yBAAyB,CAAA,CAAA;AAC/D,EAAA,MAAM,kBACJ,sBAAuB,CAAA,eAAA,CAAA;AAEzB,EAAgB,eAAA,CAAA,kBAAA,CAAmB,QAAQ,eAAe,CAAA,CAAA;AAE1D,EAAgB,eAAA,CAAA,WAAA,CAAY,QAAQ,QAAQ,CAAA,CAAA;AAC5C,EAAI,IAAA,OAAA,CAAQ,iBAAiB,KAAQ,CAAA,EAAA;AACnC,IAAgB,eAAA,CAAA,MAAA,CAAO,eAAe,OAAQ,CAAA,YAAA,CAAA;AAAA,GAChD;AAEA,EAAA,MAAM,QAAQ,QAAS,CAAA;AAAA,IACrB,GAAA,EAAK,MAAM,eAAA,CAAgB,QAAS,EAAA;AAAA,IACpC,GAAA,EAAK,CAAC,CAAW,KAAA,eAAA,CAAgB,SAAS,CAAM,KAAA,EAAA,GAAK,OAAO,CAAC,CAAA;AAAA,GAC9D,CAAA,CAAA;AAED,EAAA,MAAM,SAAY,GAAA,QAAA;AAAA,IAChB,MAAM,KAAA,CAAM,eAAgB,CAAA,KAAK,MAAM,cAAe,CAAA,KAAA;AAAA,GACxD,CAAA;AAEA,EAAA,MAAM,eAAkB,GAAA,QAAA,CAAS,MAAM,eAAA,CAAgB,eAAe,CAAA,CAAA;AAEtE,EAAA,KAAA;AAAA,IACE,eAAA;AAAA,IACA,MAAM;AACJ,MAAA,MAAM,eAAe,OAAQ,CAAA,YAAA,CAAA;AAE7B,MAAI,IAAA,KAAA,CAAM,SAAS,CAAG,EAAA;AACpB,QAAA,eAAA,CAAgB,MAAO,CAAA,YAAA,GAAe,CAAC,YAAA,EAAc,YAAY,CAAA,CAAA;AACjE,QAAM,KAAA,CAAA,KAAA,GAAQ,CAAC,YAAA,EAAc,YAAY,CAAA,CAAA;AACzC,QAAA,OAAA;AAAA,OACF;AAEA,MAAA,eAAA,CAAgB,OAAO,YAAe,GAAA,YAAA,CAAA;AACtC,MAAA,KAAA,CAAM,KAAQ,GAAA,YAAA,CAAA;AAAA,KAChB;AAAA,IACA,EAAE,WAAW,IAAK,EAAA;AAAA,GACpB,CAAA;AAEA,EAAO,OAAA;AAAA,IACL,SAAA;AAAA,IACA,eAAA;AAAA,IACA,eAAA;AAAA,IACA,KAAA;AAAA,GACF,CAAA;AACF;;;;"}
+{"version":3,"file":"use-condition.js","sources":["../../../../../../src/components/data-model/filter-panel/composables/use-condition.ts"],"sourcesContent":["import { Operator } from \"@maketribe/dm\";\r\nimport { computed, inject, unref, watch } from \"vue\";\r\n\r\nimport { BETWEEN_OPTION, OperatorOption } from \"../operator-options\";\r\nimport { FILTER_PANEL_ITEM_CONTEXT, FilterPanelItem } from \"../token\";\r\nimport { buildProps } from \"@maketribe/utils\";\r\n\r\nexport const conditionProps = buildProps({\r\n  defaultValue: {\r\n    default: null,\r\n  },\r\n} as const);\r\n\r\nexport type ConditionOptions = {\r\n  operator: Operator;\r\n  operatorOptions: OperatorOption[];\r\n  defaultValue: any;\r\n};\r\n\r\nexport function useCondition(options: ConditionOptions) {\r\n  const filterPanelItemContext = inject(FILTER_PANEL_ITEM_CONTEXT) as any;\r\n  const filterPanelItem =\r\n    filterPanelItemContext.filterPanelItem as FilterPanelItem;\r\n\r\n  filterPanelItem.setOperatorOptions(options.operatorOptions);\r\n\r\n  filterPanelItem.setOperator(options.operator);\r\n  // if (options.defaultValue !== void 0) {\r\n  //   filterPanelItem.column.defaultValue = options.defaultValue;\r\n  // }\r\n\r\n  const value = computed({\r\n    get: () => filterPanelItem.getValue(),\r\n    set: (v: any) => filterPanelItem.setValue(v === \"\" ? null : v),\r\n  });\r\n\r\n  const isBetween = computed(\r\n    () => unref(currentOperator.value) === BETWEEN_OPTION.value\r\n  );\r\n\r\n  const currentOperator = computed(() => filterPanelItem.currentOperator);\r\n\r\n  watch(\r\n    currentOperator,\r\n    () => {\r\n      const defalutValue = options.defaultValue;\r\n\r\n      if (unref(isBetween)) {\r\n        filterPanelItem.column.defaultValue = [defalutValue, defalutValue];\r\n        value.value = [defalutValue, defalutValue];\r\n        return;\r\n      }\r\n\r\n      filterPanelItem.column.defaultValue = defalutValue;\r\n      value.value = defalutValue;\r\n    },\r\n    { immediate: true }\r\n  );\r\n\r\n  return {\r\n    isBetween,\r\n    filterPanelItem,\r\n    currentOperator,\r\n    value,\r\n  };\r\n}\r\n"],"names":[],"mappings":";;;;;AAOO,MAAM,iBAAiB,UAAW,CAAA;AAAA,EACvC,YAAc,EAAA;AAAA,IACZ,OAAS,EAAA,IAAA;AAAA,GACX;AACF,CAAU,EAAA;AAQH,SAAS,aAAa,OAA2B,EAAA;AACtD,EAAM,MAAA,sBAAA,GAAyB,OAAO,yBAAyB,CAAA,CAAA;AAC/D,EAAA,MAAM,kBACJ,sBAAuB,CAAA,eAAA,CAAA;AAEzB,EAAgB,eAAA,CAAA,kBAAA,CAAmB,QAAQ,eAAe,CAAA,CAAA;AAE1D,EAAgB,eAAA,CAAA,WAAA,CAAY,QAAQ,QAAQ,CAAA,CAAA;AAK5C,EAAA,MAAM,QAAQ,QAAS,CAAA;AAAA,IACrB,GAAA,EAAK,MAAM,eAAA,CAAgB,QAAS,EAAA;AAAA,IACpC,GAAA,EAAK,CAAC,CAAW,KAAA,eAAA,CAAgB,SAAS,CAAM,KAAA,EAAA,GAAK,OAAO,CAAC,CAAA;AAAA,GAC9D,CAAA,CAAA;AAED,EAAA,MAAM,SAAY,GAAA,QAAA;AAAA,IAChB,MAAM,KAAA,CAAM,eAAgB,CAAA,KAAK,MAAM,cAAe,CAAA,KAAA;AAAA,GACxD,CAAA;AAEA,EAAA,MAAM,eAAkB,GAAA,QAAA,CAAS,MAAM,eAAA,CAAgB,eAAe,CAAA,CAAA;AAEtE,EAAA,KAAA;AAAA,IACE,eAAA;AAAA,IACA,MAAM;AACJ,MAAA,MAAM,eAAe,OAAQ,CAAA,YAAA,CAAA;AAE7B,MAAI,IAAA,KAAA,CAAM,SAAS,CAAG,EAAA;AACpB,QAAA,eAAA,CAAgB,MAAO,CAAA,YAAA,GAAe,CAAC,YAAA,EAAc,YAAY,CAAA,CAAA;AACjE,QAAM,KAAA,CAAA,KAAA,GAAQ,CAAC,YAAA,EAAc,YAAY,CAAA,CAAA;AACzC,QAAA,OAAA;AAAA,OACF;AAEA,MAAA,eAAA,CAAgB,OAAO,YAAe,GAAA,YAAA,CAAA;AACtC,MAAA,KAAA,CAAM,KAAQ,GAAA,YAAA,CAAA;AAAA,KAChB;AAAA,IACA,EAAE,WAAW,IAAK,EAAA;AAAA,GACpB,CAAA;AAEA,EAAO,OAAA;AAAA,IACL,SAAA;AAAA,IACA,eAAA;AAAA,IACA,eAAA;AAAA,IACA,KAAA;AAAA,GACF,CAAA;AACF;;;;"}

package/dist/esm/dataview/member/MemberTable.js

@@ -16,6 +16,11 @@ class MemberTable extends DataTable {
     await super.initialize();
     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: "\u59D3\u540D",
       componentInfo: "MKConditionInput"

package/dist/esm/dataview/member/MemberTable.js.map

@@ -1 +1 @@
-{"version":3,"file":"MemberTable.js","sources":["../../../../src/dataview/member/MemberTable.tsx"],"sourcesContent":["import { R } from \"@maketribe/request\";\r\nimport {\r\n  TableColumn,\r\n  DataTable,\r\n  DataTableOptions,\r\n  FilterColumn,\r\n  TableActionColumn,\r\n  ActionButton,\r\n  DeleteButton,\r\n  EditButton,\r\n  Messager,\r\n  Dialoger,\r\n  FormColumn,\r\n} from \"@maketribe/dm\";\r\nimport { defineDataTable } from \"../../define-data-table\";\r\nimport { Member, MemberForm, MemberResult } from \"./MemberForm\";\r\n\r\nexport type MemberTableItem = Omit<Member, \"password\" | \"confirmPassword\">;\r\n\r\nexport class MemberTable extends DataTable<MemberResult, MemberTableItem> {\r\n  activeMemberForm: MemberForm;\r\n\r\n  isShowActiveMemberForm: boolean;\r\n\r\n  constructor(options: DataTableOptions = {}) {\r\n    super({ name: \"ms-member\", ...options });\r\n\r\n    this.activeMemberForm = new MemberForm();\r\n\r\n    this.isShowActiveMemberForm = false;\r\n  }\r\n\r\n  protected async initialize() {\r\n    await super.initialize();\r\n\r\n    await this.initActiveMemberForm();\r\n\r\n    this.dataFilter.setColumns([\r\n      new FilterColumn({\r\n        name: \"name\",\r\n        label: \"姓名\",\r\n        componentInfo: \"MKConditionInput\",\r\n      }),\r\n      new FilterColumn({\r\n        name: \"wechatNo\",\r\n        label: \"微信号\",\r\n        componentInfo: \"MKConditionInput\",\r\n      }),\r\n      new FilterColumn({\r\n        name: \"nickName\",\r\n        label: \"昵称\",\r\n        componentInfo: \"MKConditionInput\",\r\n      }),\r\n      new FilterColumn({\r\n        name: \"email\",\r\n        label: \"邮箱\",\r\n        componentInfo: \"MKConditionInput\",\r\n      }),\r\n      new FilterColumn({\r\n        name: \"phone\",\r\n        label: \"手机号\",\r\n        componentInfo: \"MKConditionInput\",\r\n      }),\r\n      new FilterColumn({\r\n        name: \"account\",\r\n        label: \"账号\",\r\n        componentInfo: \"MKConditionInput\",\r\n      }),\r\n    ]);\r\n\r\n    this.setColumns([\r\n      new TableColumn({\r\n        name: \"id\",\r\n        label: \"编号\",\r\n        width: \"190px\",\r\n        visible: false,\r\n      }),\r\n      new TableColumn({ name: \"name\", label: \"姓名\", minWidth: \"150px\" }),\r\n      new TableColumn({ name: \"nickName\", label: \"昵称\", minWidth: \"150px\" }),\r\n      new TableColumn({\r\n        name: \"avatar\",\r\n        label: \"头像\",\r\n        componentInfo: \"MKColumnImage\",\r\n        width: \"80px\",\r\n      }),\r\n      new TableColumn({ name: \"account\", label: \"账号\", minWidth: \"150px\" }),\r\n      new TableColumn({ name: \"email\", label: \"邮箱\", minWidth: \"200px\" }),\r\n      new TableColumn({ name: \"phone\", label: \"手机号\", minWidth: \"120px\" }),\r\n      new TableColumn({ name: \"wechatNo\", label: \"微信号\", minWidth: \"140px\" }),\r\n      new TableColumn({\r\n        name: \"valid\",\r\n        label: \"微信号\",\r\n        minWidth: \"140px\",\r\n        visible: false,\r\n      }),\r\n      new TableActionColumn({\r\n        width: \"200px\",\r\n        buttons: [\r\n          new ActionButton({\r\n            label: \"激活用户\",\r\n            handler: async (row) => {\r\n              const response = await this.activeMemberForm.editRecord(row.id);\r\n\r\n              if (response.data.code !== 200) {\r\n                Messager.instance.error({ message: response.data.msg });\r\n                return;\r\n              }\r\n\r\n              this.isShowActiveMemberForm = true;\r\n            },\r\n            predicate: (member: MemberTableItem) => member.valid === 0,\r\n          }),\r\n          new ActionButton({\r\n            label: \"重置密码\",\r\n            handler: async (row) => {\r\n              const isConfirm = await Dialoger.instance.confirm({\r\n                title: \"重置密码\",\r\n                message: \"是否重置密码\",\r\n                type: \"warning\",\r\n                cancelButtonText: \"取消\",\r\n                confirmButtonText: \"确定\",\r\n              });\r\n              if (!isConfirm) {\r\n                return;\r\n              }\r\n              this.loadingManager.startLoading();\r\n\r\n              const response = await this.dataViewRequest.callDVRequest<\r\n                R<string>\r\n              >({\r\n                action: `${row.id}/password/reset`,\r\n              });\r\n\r\n              this.loadingManager.completeLoading();\r\n              if (response.data.code !== 200) {\r\n                Messager.instance.error({\r\n                  message: response.data.msg || \"重置密码失败\",\r\n                });\r\n                return;\r\n              }\r\n\r\n              const res = await Dialoger.instance.confirm({\r\n                title: \"重置密码成功\",\r\n                message: (\r\n                  <p>\r\n                    <span>你的新密码为{response.data.data}</span>\r\n                  </p>\r\n                ),\r\n                type: \"warning\",\r\n                cancelButtonText: \"取消\",\r\n                confirmButtonText: \"复制\",\r\n              });\r\n              if (!res) {\r\n                return;\r\n              }\r\n\r\n              navigator.clipboard.writeText(response.data.data);\r\n              Messager.instance.success({ message: \"复制成功\" });\r\n            },\r\n            predicate: (member: MemberTableItem) => member.valid === 1,\r\n          }),\r\n          new EditButton({\r\n            predicate: (member: MemberTableItem) => member.valid === 1,\r\n          }),\r\n          new DeleteButton(),\r\n        ],\r\n      }),\r\n    ]);\r\n  }\r\n\r\n  protected async initActiveMemberForm() {\r\n    const activeMemberForm = this.activeMemberForm;\r\n\r\n    await activeMemberForm.init();\r\n\r\n    activeMemberForm.setColumns([\r\n      activeMemberForm.getColumn(\"id\")!,\r\n      new FormColumn({\r\n        name: \"approveResult\",\r\n        label: \"是否通过\",\r\n        defaultValue: \"0\",\r\n        componentInfo: \"MKFormRadioBox\",\r\n        required: true,\r\n        componentProps: {\r\n          options: [\r\n            { label: \"通过\", value: \"1\" },\r\n            { label: \"不通过\", value: \"0\" },\r\n          ],\r\n        },\r\n      }),\r\n      activeMemberForm.getColumn(\"roles\")!,\r\n      activeMemberForm.getColumn(\"depts\")!,\r\n      activeMemberForm.getColumn(\"memo\")!,\r\n    ]);\r\n  }\r\n\r\n  async approveMember() {\r\n    try {\r\n      this.activeMemberForm.getLoadingManager().startLoading();\r\n      const result = await this.activeMemberForm.httpRequest?.post(\r\n        \"/api/dv/ms-member/apply/account/approve\",\r\n        {\r\n          ...this.activeMemberForm.formatSubmitData(this.activeMemberForm.data),\r\n        }\r\n      );\r\n      this.activeMemberForm.getLoadingManager().completeLoading();\r\n\r\n      if (result?.data.code != 200) {\r\n        Messager.instance.error(result?.data.msg || \"请求失败\");\r\n        return;\r\n      }\r\n\r\n      Messager.instance.success({\r\n        message: \"激活通过，密码已发送到邮箱\",\r\n      });\r\n\r\n      this.load();\r\n    } catch (e) {\r\n      console.error(e);\r\n      Messager.instance.error({ message: \"网络异常\" });\r\n    }\r\n  }\r\n\r\n  formatItem(item: MemberResult): MemberTableItem {\r\n    let avatar: string | null;\r\n    try {\r\n      avatar = item.avatar ? new URL(item.avatar).toString() : null;\r\n    } catch (e) {\r\n      avatar = null;\r\n    }\r\n\r\n    return {\r\n      id: item.id,\r\n      name: item.name || \"\",\r\n      wechatNo: item.wechatNo || \"\",\r\n      nickName: item.nickName || \"\",\r\n      email: item.email || \"\",\r\n      phone: item.phone || \"\",\r\n      account: item.account || \"\",\r\n      avatar,\r\n      roles: item.roles?.map((role) => ({\r\n        id: role.id,\r\n        name: role.name || \"\",\r\n        desc: role.desc || \"\",\r\n      })),\r\n      depts: item.depts?.map((department) => ({\r\n        id: department.id,\r\n        name: department.name || \"\",\r\n        // memberID: department.memberID || null,\r\n        pid: department.pid || null,\r\n      })),\r\n      valid: item.valid,\r\n    };\r\n  }\r\n}\r\n\r\ndefineDataTable(MemberTable);\r\n"],"names":["MemberTable","DataTable","constructor","options","name","activeMemberForm","MemberForm","isShowActiveMemberForm","initialize","initActiveMemberForm","dataFilter","setColumns","FilterColumn","label","componentInfo","TableColumn","width","visible","minWidth","TableActionColumn","buttons","ActionButton","handler","row","response","editRecord","id","data","code","Messager","instance","error","message","msg","predicate","member","valid","isConfirm","Dialoger","confirm","title","type","cancelButtonText","confirmButtonText","loadingManager","startLoading","dataViewRequest","callDVRequest","action","completeLoading","res","_createVNode","_createTextVNode","navigator","clipboard","writeText","success","EditButton","DeleteButton","init","getColumn","FormColumn","defaultValue","required","componentProps","value","approveMember","getLoadingManager","result","httpRequest","post","formatSubmitData","load","e","console","formatItem","item","avatar","URL","toString","wechatNo","nickName","email","phone","account","roles","map","role","desc","depts","department","pid","defineDataTable"],"mappings":"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"}
+{"version":3,"file":"MemberTable.js","sources":["../../../../src/dataview/member/MemberTable.tsx"],"sourcesContent":["import { R } from \"@maketribe/request\";\r\nimport {\r\n  TableColumn,\r\n  DataTable,\r\n  DataTableOptions,\r\n  FilterColumn,\r\n  TableActionColumn,\r\n  ActionButton,\r\n  DeleteButton,\r\n  EditButton,\r\n  Messager,\r\n  Dialoger,\r\n  FormColumn,\r\n} from \"@maketribe/dm\";\r\nimport { defineDataTable } from \"../../define-data-table\";\r\nimport { Member, MemberForm, MemberResult } from \"./MemberForm\";\r\n\r\nexport type MemberTableItem = Omit<Member, \"password\" | \"confirmPassword\">;\r\n\r\nexport class MemberTable extends DataTable<MemberResult, MemberTableItem> {\r\n  activeMemberForm: MemberForm;\r\n\r\n  isShowActiveMemberForm: boolean;\r\n\r\n  constructor(options: DataTableOptions = {}) {\r\n    super({ name: \"ms-member\", ...options });\r\n\r\n    this.activeMemberForm = new MemberForm();\r\n\r\n    this.isShowActiveMemberForm = false;\r\n  }\r\n\r\n  protected async initialize() {\r\n    await super.initialize();\r\n\r\n    await this.initActiveMemberForm();\r\n\r\n    this.dataFilter.setColumns([\r\n      new FilterColumn({\r\n        name: \"fdsafdsaf\",\r\n        label: \"fasdfsa\",\r\n        componentInfo: \"MKConditionDate\",\r\n        defaultValue: [\"2024-01-20 00:00:00\", \"2024-01-21 00:00:00\"]\r\n      }),\r\n      new FilterColumn({\r\n        name: \"name\",\r\n        label: \"姓名\",\r\n        componentInfo: \"MKConditionInput\",\r\n      }),\r\n      new FilterColumn({\r\n        name: \"wechatNo\",\r\n        label: \"微信号\",\r\n        componentInfo: \"MKConditionInput\",\r\n      }),\r\n      new FilterColumn({\r\n        name: \"nickName\",\r\n        label: \"昵称\",\r\n        componentInfo: \"MKConditionInput\",\r\n      }),\r\n      new FilterColumn({\r\n        name: \"email\",\r\n        label: \"邮箱\",\r\n        componentInfo: \"MKConditionInput\",\r\n      }),\r\n      new FilterColumn({\r\n        name: \"phone\",\r\n        label: \"手机号\",\r\n        componentInfo: \"MKConditionInput\",\r\n      }),\r\n      new FilterColumn({\r\n        name: \"account\",\r\n        label: \"账号\",\r\n        componentInfo: \"MKConditionInput\",\r\n      }),\r\n    ]);\r\n\r\n    this.setColumns([\r\n      new TableColumn({\r\n        name: \"id\",\r\n        label: \"编号\",\r\n        width: \"190px\",\r\n        visible: false,\r\n      }),\r\n      new TableColumn({ name: \"name\", label: \"姓名\", minWidth: \"150px\" }),\r\n      new TableColumn({ name: \"nickName\", label: \"昵称\", minWidth: \"150px\" }),\r\n      new TableColumn({\r\n        name: \"avatar\",\r\n        label: \"头像\",\r\n        componentInfo: \"MKColumnImage\",\r\n        width: \"80px\",\r\n      }),\r\n      new TableColumn({ name: \"account\", label: \"账号\", minWidth: \"150px\" }),\r\n      new TableColumn({ name: \"email\", label: \"邮箱\", minWidth: \"200px\" }),\r\n      new TableColumn({ name: \"phone\", label: \"手机号\", minWidth: \"120px\" }),\r\n      new TableColumn({ name: \"wechatNo\", label: \"微信号\", minWidth: \"140px\" }),\r\n      new TableColumn({\r\n        name: \"valid\",\r\n        label: \"微信号\",\r\n        minWidth: \"140px\",\r\n        visible: false,\r\n      }),\r\n      new TableActionColumn({\r\n        width: \"200px\",\r\n        buttons: [\r\n          new ActionButton({\r\n            label: \"激活用户\",\r\n            handler: async (row) => {\r\n              const response = await this.activeMemberForm.editRecord(row.id);\r\n\r\n              if (response.data.code !== 200) {\r\n                Messager.instance.error({ message: response.data.msg });\r\n                return;\r\n              }\r\n\r\n              this.isShowActiveMemberForm = true;\r\n            },\r\n            predicate: (member: MemberTableItem) => member.valid === 0,\r\n          }),\r\n          new ActionButton({\r\n            label: \"重置密码\",\r\n            handler: async (row) => {\r\n              const isConfirm = await Dialoger.instance.confirm({\r\n                title: \"重置密码\",\r\n                message: \"是否重置密码\",\r\n                type: \"warning\",\r\n                cancelButtonText: \"取消\",\r\n                confirmButtonText: \"确定\",\r\n              });\r\n              if (!isConfirm) {\r\n                return;\r\n              }\r\n              this.loadingManager.startLoading();\r\n\r\n              const response = await this.dataViewRequest.callDVRequest<\r\n                R<string>\r\n              >({\r\n                action: `${row.id}/password/reset`,\r\n              });\r\n\r\n              this.loadingManager.completeLoading();\r\n              if (response.data.code !== 200) {\r\n                Messager.instance.error({\r\n                  message: response.data.msg || \"重置密码失败\",\r\n                });\r\n                return;\r\n              }\r\n\r\n              const res = await Dialoger.instance.confirm({\r\n                title: \"重置密码成功\",\r\n                message: (\r\n                  <p>\r\n                    <span>你的新密码为{response.data.data}</span>\r\n                  </p>\r\n                ),\r\n                type: \"warning\",\r\n                cancelButtonText: \"取消\",\r\n                confirmButtonText: \"复制\",\r\n              });\r\n              if (!res) {\r\n                return;\r\n              }\r\n\r\n              navigator.clipboard.writeText(response.data.data);\r\n              Messager.instance.success({ message: \"复制成功\" });\r\n            },\r\n            predicate: (member: MemberTableItem) => member.valid === 1,\r\n          }),\r\n          new EditButton({\r\n            predicate: (member: MemberTableItem) => member.valid === 1,\r\n          }),\r\n          new DeleteButton(),\r\n        ],\r\n      }),\r\n    ]);\r\n  }\r\n\r\n  protected async initActiveMemberForm() {\r\n    const activeMemberForm = this.activeMemberForm;\r\n\r\n    await activeMemberForm.init();\r\n\r\n    activeMemberForm.setColumns([\r\n      activeMemberForm.getColumn(\"id\")!,\r\n      new FormColumn({\r\n        name: \"approveResult\",\r\n        label: \"是否通过\",\r\n        defaultValue: \"0\",\r\n        componentInfo: \"MKFormRadioBox\",\r\n        required: true,\r\n        componentProps: {\r\n          options: [\r\n            { label: \"通过\", value: \"1\" },\r\n            { label: \"不通过\", value: \"0\" },\r\n          ],\r\n        },\r\n      }),\r\n      activeMemberForm.getColumn(\"roles\")!,\r\n      activeMemberForm.getColumn(\"depts\")!,\r\n      activeMemberForm.getColumn(\"memo\")!,\r\n    ]);\r\n  }\r\n\r\n  async approveMember() {\r\n    try {\r\n      this.activeMemberForm.getLoadingManager().startLoading();\r\n      const result = await this.activeMemberForm.httpRequest?.post(\r\n        \"/api/dv/ms-member/apply/account/approve\",\r\n        {\r\n          ...this.activeMemberForm.formatSubmitData(this.activeMemberForm.data),\r\n        }\r\n      );\r\n      this.activeMemberForm.getLoadingManager().completeLoading();\r\n\r\n      if (result?.data.code != 200) {\r\n        Messager.instance.error(result?.data.msg || \"请求失败\");\r\n        return;\r\n      }\r\n\r\n      Messager.instance.success({\r\n        message: \"激活通过，密码已发送到邮箱\",\r\n      });\r\n\r\n      this.load();\r\n    } catch (e) {\r\n      console.error(e);\r\n      Messager.instance.error({ message: \"网络异常\" });\r\n    }\r\n  }\r\n\r\n  formatItem(item: MemberResult): MemberTableItem {\r\n    let avatar: string | null;\r\n    try {\r\n      avatar = item.avatar ? new URL(item.avatar).toString() : null;\r\n    } catch (e) {\r\n      avatar = null;\r\n    }\r\n\r\n    return {\r\n      id: item.id,\r\n      name: item.name || \"\",\r\n      wechatNo: item.wechatNo || \"\",\r\n      nickName: item.nickName || \"\",\r\n      email: item.email || \"\",\r\n      phone: item.phone || \"\",\r\n      account: item.account || \"\",\r\n      avatar,\r\n      roles: item.roles?.map((role) => ({\r\n        id: role.id,\r\n        name: role.name || \"\",\r\n        desc: role.desc || \"\",\r\n      })),\r\n      depts: item.depts?.map((department) => ({\r\n        id: department.id,\r\n        name: department.name || \"\",\r\n        // memberID: department.memberID || null,\r\n        pid: department.pid || null,\r\n      })),\r\n      valid: item.valid,\r\n    };\r\n  }\r\n}\r\n\r\ndefineDataTable(MemberTable);\r\n"],"names":["MemberTable","DataTable","constructor","options","name","activeMemberForm","MemberForm","isShowActiveMemberForm","initialize","initActiveMemberForm","dataFilter","setColumns","FilterColumn","label","componentInfo","defaultValue","TableColumn","width","visible","minWidth","TableActionColumn","buttons","ActionButton","handler","row","response","editRecord","id","data","code","Messager","instance","error","message","msg","predicate","member","valid","isConfirm","Dialoger","confirm","title","type","cancelButtonText","confirmButtonText","loadingManager","startLoading","dataViewRequest","callDVRequest","action","completeLoading","res","_createVNode","_createTextVNode","navigator","clipboard","writeText","success","EditButton","DeleteButton","init","getColumn","FormColumn","required","componentProps","value","approveMember","getLoadingManager","result","httpRequest","post","formatSubmitData","load","e","console","formatItem","item","avatar","URL","toString","wechatNo","nickName","email","phone","account","roles","map","role","desc","depts","department","pid","defineDataTable"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maketribe/ms-app",
-  "version": "3.0.32",
+  "version": "3.0.33",
   "description": "",
   "main": "dist/cjs",
   "files": [
@@ -21,9 +21,9 @@
     "vue-codemirror": "^6.1.1",
     "vue-router": "^4.2.4",
     "@maketribe/locale": "^1.0.5",
+    "@maketribe/utils": "^1.1.4",
     "@maketribe/request": "^2.0.3",
-    "@maketribe/dm": "^3.0.11",
-    "@maketribe/utils": "^1.1.4"
+    "@maketribe/dm": "^3.0.13"
   },
   "scripts": {
     "build": "npm run clean && npm run build:js && npm run build:type && npm run build:style",

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: "姓名",