knt-shared 1.8.6 → 1.8.8

package/dist/index.esm.js

@@ -4244,6 +4244,21 @@ const componentsNeedSelectPlaceholder$1 = /* @__PURE__ */ new Set([
   "ApiCascader",
   "TreeSelect"
 ]);
+const componentsWithAllowClear = /* @__PURE__ */ new Set([
+  "Input",
+  "InputNumber",
+  "InputPassword",
+  "Textarea",
+  "Select",
+  "TreeSelect",
+  "Cascader",
+  "DatePicker",
+  "TimePicker",
+  "RangePicker",
+  "AutoComplete",
+  "ApiSelect",
+  "ApiCascader"
+]);
 const componentsNeedUploadPlaceholder$1 = /* @__PURE__ */ new Set([
   "Upload",
   "BasicUpload"
@@ -5144,11 +5159,14 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
     };
     const getComponentProps = (schema) => {
       const propsData = unref(getProps);
+      const componentType = typeof schema.component === "string" ? schema.component : "";
+      const defaultAllowClear = componentsWithAllowClear.has(componentType) ? { allowClear: true } : {};
       let disabled = propsData.disabled;
       if (schema.disabled !== void 0) {
         disabled = typeof schema.disabled === "boolean" ? schema.disabled : schema.disabled(formModel);
       }
       return {
+        ...defaultAllowClear,
         ...resolveComponentProps(schema),
         disabled
       };
@@ -6980,6 +6998,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
       []
     );
     const checkedColumns = ref(storedColumns.value);
+    const isColumnSettingReady = ref(false);
     watch(checkedColumns, (newValue) => {
       if (getStorageKey()) {
         setStoredColumns(newValue);
@@ -7244,7 +7263,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
         const indexColumn = {
           title: "序号",
           dataIndex: "__index__",
-          width: 60,
+          width: 70,
           align: "center",
           fixed: "left",
           slotName: "__index__",
@@ -7263,7 +7282,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
         };
         columns.push(actionColumn);
       }
-      if (getToolbarConfig.value.showColumnSetting && checkedColumns.value.length > 0) {
+      if (getToolbarConfig.value.showColumnSetting && isColumnSettingReady.value) {
         columns = columns.filter((col) => {
           if (col.dataIndex === "__index__" || col.dataIndex === "action") {
             return true;
@@ -7297,6 +7316,14 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
         return col.ifShow !== false && col.dataIndex;
       });
     });
+    watch(settingColumns, (newCols) => {
+      if (!isColumnSettingReady.value) return;
+      const currentKeys = new Set(checkedColumns.value);
+      const newKeys = newCols.filter((col) => col.dataIndex && !currentKeys.has(col.dataIndex)).map((col) => col.dataIndex);
+      if (newKeys.length > 0) {
+        checkedColumns.value = [...checkedColumns.value, ...newKeys];
+      }
+    });
     const getBindValues = computed(() => {
       const mergedProps = getMergedProps.value;
       const {
@@ -7720,6 +7747,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
       } else {
         checkedColumns.value = settingColumns.value.filter((col) => !col.defaultHidden).map((col) => col.dataIndex);
       }
+      isColumnSettingReady.value = true;
     };
     const getDataSource = () => dataSource.value;
     const setDataSource = async (data) => {
@@ -8334,7 +8362,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const BasicTable = /* @__PURE__ */ _export_sfc(_sfc_main$6, [["__scopeId", "data-v-84dbe67a"]]);
+const BasicTable = /* @__PURE__ */ _export_sfc(_sfc_main$6, [["__scopeId", "data-v-f752ab5b"]]);
 function useTable(options = {}) {
   const tableRef = ref(null);
   const formRef = ref(null);