@vue-ui-kit/ant 2.0.3 → 2.0.5

package/src/packages/components/PCanvasGrid.vue

@@ -1,6 +1,533 @@
-<script lang="ts" setup>
+<script
+  lang="ts"
+  setup
+  generic="D extends Recordable = Recordable, F extends Recordable = Recordable"
+  name="PCanvasGrid"
+>
   import PCanvasTable from './PCanvasTable.vue';
+  import {
+    computed,
+    useAttrs,
+    ref,
+    Ref,
+    reactive,
+    onMounted,
+    watch,
+    toRefs,
+    onBeforeUnmount,
+  } from 'vue';
+  import {
+    debounce,
+    get,
+    isBoolean,
+    isFunction,
+    isObject,
+    isString,
+    omit,
+    toNumber,
+    uniq,
+  } from 'xe-utils';
+  import {
+    CanvasColumnProps,
+    PCanvasGridProps,
+    PCanvasTableInstance,
+    PFormItemProps,
+    ResponsePathConfig,
+  } from '#/antProxy';
+  import { v4 as uuid_v4 } from 'uuid';
+  import { isGoodValue } from '@/utils/is';
+  import PFormCol from '@/components/PFormCol.vue';
+  import { defaultLabelCol } from '@/utils/core';
+  import Icon from '@/renders/Icon';
+  import { $confirm, $error, $success, $warning } from '@/hooks/useMessage';
+  import {
+    Button as AButton,
+    Form as AForm,
+    Row as ARow,
+    Spin as ASpin,
+    Pagination as APagination,
+  } from 'ant-design-vue';
+  import { DownOutlined } from '@ant-design/icons-vue';
+  import { getCanvasTableDefaults, getGridDefaults } from '@/utils/config';
+  import { eachTree } from '@/utils/treeHelper';
+  const props = defineProps<PCanvasGridProps<D, F>>();
+  const attrs = useAttrs();
+  const emit = defineEmits<{
+    (
+      event: 'toolbarButtonClick',
+      data: { data: D[]; code: string; selectedKeys: Array<string | number>; records: D[] },
+    ): void;
+    (
+      event: 'toolbarToolClick',
+      data: { data: D[]; code: string; selectedKeys: Array<string | number>; records: D[] },
+    ): void;
+    (event: 'pick', data: { row: D; field: string }): void;
+    (event: 'resetQuery'): void;
+  }>();
+
+  const { formConfig, pageConfig, columns, toolbarConfig, proxyConfig, config, selectConfig } =
+    toRefs(props);
+  const gridDefaults = getGridDefaults();
+  const canvasTableDefaults = getCanvasTableDefaults();
+  const renderFormKey = ref(uuid_v4());
+  const queryFormData = ref<Partial<F>>({}) as Ref<Partial<F>>;
+  const propsWithDefaults = computed(() => ({
+    ...props,
+    config: {
+      ...canvasTableDefaults,
+      ...props.config,
+    },
+    lazyReset: props.lazyReset ?? gridDefaults.lazyReset ?? false,
+    fitCanvasHeight: props.fitHeight ?? gridDefaults.fitCanvasHeight ?? 100,
+  }));
+  const mode = computed<'list' | 'pagination' | 'bad'>(() =>
+    proxyConfig.value && proxyConfig.value.ajax
+      ? pageConfig.value
+        ? 'pagination'
+        : 'list'
+      : 'bad',
+  );
+  const pg = computed(() =>
+    mode.value === 'pagination'
+      ? {
+          current: pagination.page,
+          total: totalCount.value,
+          pageSize: pagination.size,
+          responsive: false,
+          showSizeChanger: true,
+          showTotal: (total: number) => `共${total}条数据`,
+        }
+      : false,
+  );
+
+  const fc = computed(() => omit({ labelCol: defaultLabelCol, ...formConfig.value }, ['items']));
+  const loading = reactive({
+    toolbar: false,
+    form: false,
+    table: false,
+  });
+  const pagination = reactive<IPage>({
+    page: 1,
+    size: pageConfig.value?.pageSize ?? 10,
+  });
+  const dataSeed = ref(0);
+  const totalCount = ref(0);
+  const tableData = ref<D[]>([]) as Ref<D[]>;
+  const formEl = ref<InstanceType<typeof AForm>>();
+  const canvasTableRef = ref<PCanvasTableInstance<D>>();
+  const boxEl = ref<HTMLDivElement>();
+  const pFormWrapper = ref<HTMLDivElement>();
+  const renderHeight = ref(500);
+  /* 分页时缓存的跨页选择数据,风险：数据可能会更新导致串页，读取计算的时候要去重 */
+  const pageSelections = ref<{
+    [key: number]: D[];
+  }>({});
+  const handleSelectionChange = (selection: D[]) => {
+    pageSelections.value[pagination.page] = selection;
+  };
+
+  const codeLoadings = reactive<Record<string, boolean>>(
+    [
+      ...(props.toolbarConfig?.buttons?.map((m) => m.code) ?? []).filter((f) => f),
+      ...(props.toolbarConfig?.tools?.map((m) => m.code) ?? []).filter((f) => f),
+    ].reduce(
+      (acc, cur) => {
+        acc[cur!] = false;
+        return acc;
+      },
+      {} as Record<string, boolean>,
+    ),
+  );
+  const setBtnLoading = (code: string, value: boolean) => {
+    codeLoadings[code] = value;
+  };
+  const setLoadings = (value: boolean | Record<string, boolean>) => {
+    if (isObject(value)) {
+      /* 判断value的toolbar和form 有则更新loading对应值，再判断value的table字段，有则canvasTableRef.value.setLoading*/
+      if (Object.prototype.hasOwnProperty.call(value, 'toolbar')) {
+        loading.toolbar = value.toolbar;
+      }
+      if (Object.prototype.hasOwnProperty.call(value, 'form')) {
+        loading.form = value.form;
+      }
+      if (Object.prototype.hasOwnProperty.call(value, 'table')) {
+        loading.table = value.table;
+      }
+    } else if (isBoolean(value)) {
+      loading.form = value;
+      loading.toolbar = value;
+      loading.table = value;
+    }
+  };
+  const selectedRecords = computed<D[]>(() =>
+    uniq(
+      Object.values(pageSelections.value).flat(),
+      (f) => f[props.config?.ROW_KEY ?? 'id'] as string | number,
+    ),
+  );
+  const handleFormSubmit = () => {
+    resetPage();
+  };
+  const selectedRowKeys = computed<Array<string | number>>(() =>
+    selectedRecords.value.map((f) => f[props.config?.ROW_KEY ?? 'id'] as string | number),
+  );
+  const handleResponse = (response: Recordable, pathConfig?: ResponsePathConfig<D>) =>
+    pathConfig
+      ? {
+          list: isString(pathConfig.list)
+            ? get(response, pathConfig.list)
+            : isFunction(pathConfig.list)
+              ? pathConfig.list(response)
+              : undefined,
+          total: isString(pathConfig.total)
+            ? get(response, pathConfig.total)
+            : isFunction(pathConfig.total)
+              ? pathConfig.total(response)
+              : undefined,
+          result: isString(pathConfig.result)
+            ? get(response, pathConfig.result)
+            : isFunction(pathConfig.result)
+              ? pathConfig.result(response)
+              : undefined,
+          message: isString(pathConfig.message)
+            ? get(response, pathConfig.message)
+            : isFunction(pathConfig.message)
+              ? pathConfig.message(response)
+              : undefined,
+        }
+      : {
+          list: response,
+        };
+  const toolBtnClick = (code: string) => {
+    emit('toolbarButtonClick', {
+      data: tableData.value,
+      code,
+      selectedKeys: selectedRowKeys.value,
+      records: selectedRecords.value,
+    });
+    innerToolbarHandler(code);
+  };
+  const debounceToolBtnClick = debounce(toolBtnClick, 100);
+  const toolBtnMenuClick = ({ key }) => debounceToolBtnClick(key);
+  const toolToolClick = (code: string) => {
+    emit('toolbarToolClick', {
+      data: tableData.value,
+      code,
+      selectedKeys: selectedRowKeys.value,
+      records: selectedRecords.value,
+    });
+    innerToolbarHandler(code);
+  };
+  const debounceToolToolClick = debounce(toolToolClick, 100);
+
+  const fetchData = () =>
+    new Promise<D[]>((resolve) => {
+      if (mode.value !== 'bad') {
+        setLoadings({ table: true, form: true });
+        const { ajax } = proxyConfig.value!;
+        ajax
+          .query({
+            form: queryFormData.value,
+            page: pagination,
+          })
+          .then((response) => {
+            const { list, total, result, message } = handleResponse(
+              response,
+              proxyConfig.value!.response,
+            );
+            if (list) {
+              tableData.value = list as D[];
+              dataSeed.value++;
+            } else if (result) {
+              tableData.value = result as D[];
+              totalCount.value = total ?? result.length;
+              dataSeed.value++;
+            } else {
+              tableData.value = [];
+              dataSeed.value++;
+              if (message) {
+                $warning(message);
+              }
+            }
+            resolve(tableData.value as D[]);
+          })
+          .catch((e) => {
+            console.error('fetchData error', e);
+            resolve([] as D[]);
+          })
+          .finally(() => {
+            setLoadings({ table: false, form: false });
+          });
+      }
+    });
+  const handleTableChange = (current: number, pageSize: number) => {
+    pagination.page = current;
+    pagination.size = pageSize;
+    return fetchData();
+  };
+  const resetPage = () => {
+    pagination.page = 1;
+    pageSelections.value = {};
+    return fetchData();
+  };
+  const debounceFetchData = debounce(fetchData, 160);
+  const passQuery = (params: Partial<F>, lazy?: boolean) => {
+    Object.assign(queryFormData.value, params);
+    pagination.page = 1;
+    return lazy ? Promise.resolve() : debounceFetchData();
+  };
+  const innerToolbarHandler = (code: string) => {
+    const { ajax } = proxyConfig.value!;
+    switch (code) {
+      case 'multiDelete':
+        if (ajax.multiDelete) {
+          if (selectedRowKeys.value.length > 0) {
+            $confirm({
+              title: '警告',
+              content: '确认删除选中的数据吗？',
+            }).then(() => {
+              setLoadings({ table: true, toolbar: true });
+              ajax.multiDelete!(selectedRowKeys.value)
+                .then(() => {
+                  $success('删除成功');
+                  resetPage();
+                })
+                .catch(() => {
+                  $error('删除失败');
+                })
+                .finally(() => {
+                  setLoadings({ table: false, toolbar: false });
+                  codeLoadings.multiDelete = false;
+                });
+            });
+          } else {
+            $warning('请选择要删除的数据');
+          }
+        }
+        break;
+    }
+  };
+  const finalColumns = computed<CanvasColumnProps<D>[]>(() =>
+    selectConfig.value?.multiple
+      ? [
+          {
+            type: 'selection',
+            width: 40,
+            widthFillDisable: true,
+            title: '',
+          },
+          ...columns.value,
+        ]
+      : columns.value,
+  );
+  const resetQueryFormData = (lazy?: boolean) => {
+    if (formConfig.value && formConfig.value.items.length > 0) {
+      if (formConfig.value.customReset) {
+        formConfig.value.customReset();
+      } else {
+        const obj: Partial<F> = {};
+        eachTree(formConfig.value.items, (item) => {
+          if (item.field && item.itemRender) {
+            if (isGoodValue(item.itemRender.defaultValue)) {
+              obj[item.field as keyof F] = item.itemRender.defaultValue;
+            } else {
+              obj[item.field as keyof F] = undefined;
+            }
+          } else if (item.field && item.slots) {
+            if (isGoodValue(item.slots.defaultValue)) {
+              obj[item.field as keyof F] = item.slots.defaultValue;
+            } else {
+              obj[item.field as keyof F] = undefined;
+            }
+          }
+        });
+        queryFormData.value = obj;
+      }
+      emit('resetQuery');
+    }
+
+    pagination.page = 1;
+    if (!lazy) {
+      debounceFetchData();
+    }
+  };
+  const reload = () => {
+    pageSelections.value = {};
+    return resetQueryFormData();
+  };
+  const resizeTable = () => {
+    const pNode = boxEl.value?.parentElement;
+    const ph = pNode ? window.getComputedStyle(pNode).height : '0px';
+    const formOriginHeight = pFormWrapper.value
+      ? window.getComputedStyle(pFormWrapper.value).height
+      : '0px';
+    const formHeight = formOriginHeight.includes('px')
+      ? toNumber(formOriginHeight.replace('px', ''))
+      : 0;
+    const showCountHeight = selectConfig.value?.showCount ? 22 : 0;
+    renderHeight.value =
+      toNumber(ph.replace('px', '')) -
+      propsWithDefaults.value.fitCanvasHeight -
+      (props.toolbarConfig ? 30 : 0) -
+      formHeight -
+      showCountHeight;
+  };
+  let observer: MutationObserver;
+  onMounted(() => {
+    resizeTable();
+    window.addEventListener('resize', resizeTable);
+    // 还需要在组件根节点由不可见转为可见时重新计算高度（display:none等样式控制时）
+    observer = new MutationObserver((mutations) => {
+      mutations.forEach((mutation) => {
+        if (mutation.type === 'attributes' && mutation.attributeName === 'style') {
+          const el = mutation.target as HTMLElement;
+          const style = window.getComputedStyle(el);
+          if (style.display !== 'none') {
+            resizeTable();
+          }
+        }
+      });
+    });
+    if (boxEl.value) {
+      observer.observe(boxEl.value, { attributes: true, attributeFilter: ['style'] });
+    }
+    resetQueryFormData(props.manualFetch);
+  });
+  onBeforeUnmount(() => {
+    window.removeEventListener('resize', resizeTable);
+    observer.disconnect();
+  });
+  defineExpose({
+    commitProxy: {
+      query: debounceFetchData,
+      reload,
+      reloadPage: resetPage,
+      passQuery,
+    },
+    $canvasTable: computed(() => canvasTableRef.value),
+    selectedRowKeys,
+    setBtnLoading,
+    selectedRecords,
+    $form: computed(() => formEl.value),
+    getFormData: () => queryFormData.value,
+    setLoadings,
+    resizeTable,
+  });
 </script>
 <template>
-  <div>todo</div>
+  <div ref="boxEl" class="h-full p-wrapper flex flex-col gap-8px overflow-y-auto" v-bind="attrs">
+    <div v-if="mode === 'bad'">请检查配置</div>
+    <template v-else>
+      <div
+        v-if="formConfig?.items?.some((s: PFormItemProps<F>) => s.field && s.itemRender)"
+        class="p-pane p-form-wrapper"
+        ref="pFormWrapper"
+      >
+        <a-spin :spinning="loading.form">
+          <a-form
+            :key="renderFormKey"
+            ref="formEl"
+            :model="queryFormData"
+            v-bind="fc"
+            @submit="handleFormSubmit"
+          >
+            <a-row :gutter="[6, 12]">
+              <p-form-col
+                v-for="(item, idx) in formConfig!.items"
+                :key="`_col_${item.field || idx}`"
+                :form-data="queryFormData"
+                :item="item as PFormItemProps<Partial<F>>"
+                @reset="resetQueryFormData(propsWithDefaults.lazyReset)"
+              />
+            </a-row>
+          </a-form>
+        </a-spin>
+      </div>
+      <div
+        v-if="toolbarConfig"
+        class="p-canvas-toolbar-wrapper flex items-center w-full justify-between p-theme-bg pt-8px px-16px"
+      >
+        <div class="flex items-center flex-1 gap-4px">
+          <template v-if="toolbarConfig.buttons && toolbarConfig.buttons.length > 0">
+            <template v-for="(btn, idx) in toolbarConfig.buttons" :key="idx">
+              <a-dropdown v-if="btn.dropdowns && btn.dropdowns.length">
+                <template #overlay>
+                  <a-menu @click="toolBtnMenuClick">
+                    <a-menu-item v-for="sub in btn.dropdowns" :key="sub.code"
+                      >{{ sub.content }}
+                    </a-menu-item>
+                  </a-menu>
+                </template>
+                <a-button
+                  :type="btn.type"
+                  :size="btn.size ?? 'middle'"
+                  :disabled="toolbarConfig.disabled || btn.disabled"
+                  :loading="loading.toolbar || (!!btn.code && codeLoadings[btn.code])"
+                >
+                  <Icon v-if="btn.icon" :icon="btn.icon" />
+                  {{ btn.content }}
+                  <DownOutlined />
+                </a-button>
+              </a-dropdown>
+              <a-button
+                v-else-if="btn.code"
+                :type="btn.type"
+                :size="btn.size ?? 'middle'"
+                :disabled="toolbarConfig.disabled || btn.disabled"
+                :loading="loading.toolbar || (!!btn.code && codeLoadings[btn.code])"
+                @click="debounceToolBtnClick(btn.code)"
+              >
+                <Icon v-if="btn.icon" :icon="btn.icon" />
+                {{ btn.content }}
+              </a-button>
+              <div v-else></div>
+            </template>
+          </template>
+        </div>
+        <span class="flex items-center gap-4px">
+          <template v-if="toolbarConfig.tools && toolbarConfig.tools.length > 0">
+            <a-button
+              v-for="(tool, idx) in toolbarConfig.tools"
+              :key="idx"
+              :type="tool.type"
+              :size="tool.size ?? 'middle'"
+              :disabled="toolbarConfig.disabled || tool.disabled"
+              @click="debounceToolToolClick(tool.code)"
+              :loading="loading.toolbar || (!!tool.code && codeLoadings[tool.code])"
+            >
+              <Icon :icon="tool.icon" />
+            </a-button>
+          </template>
+        </span>
+      </div>
+      <div :class="`p-pane flex-1 h-0 p-inner-scroll`">
+        <div
+          v-if="selectConfig?.multiple && selectConfig.showCount"
+          class="w-full text-slate-5 pl-4"
+        >
+          已选：{{ selectedRowKeys.length }}
+        </div>
+        <p-canvas-table
+          ref="canvasTableRef"
+          :columns="finalColumns"
+          :config="{
+            ...config,
+            HEIGHT: renderHeight,
+          }"
+          @selection-change="handleSelectionChange"
+          :data="tableData"
+          :loading="loading.table"
+        />
+        <a-pagination
+          class="p-canvas-pagination"
+          v-if="mode === 'pagination'"
+          size="small"
+          :current="pagination.page"
+          :page-size="pagination.size"
+          :total="totalCount"
+          @change="handleTableChange"
+        />
+      </div>
+    </template>
+  </div>
 </template>

package/src/packages/components/PCanvasTable.vue

@@ -20,16 +20,28 @@
   import type { CanvasColumnProps, CanvasTableProps, FormatterFunc, CellRender } from '#/antProxy';
   import { v4 as uuidv4 } from 'uuid';
   import { antFormatters } from '@/utils/AFormatters';
+  import { getCanvasTableDefaults } from '@/utils/config';
 
   const emit = defineEmits<{
     (e: 'change', value: any[]): void; // 需要默认实现change，不能动态绑定
+    (e: 'selectionChange', value: T[]): void;
     (e: 'ready', value: EVirtTable): void;
   }>();
-  const defaultConfig = {
-    DISABLED: true,
-  };
+
   const selectedRecords = ref<T[]>([]);
-  const props = defineProps<CanvasTableProps<T, B>>();
+  const props = withDefaults(defineProps<CanvasTableProps<T, B>>(), {
+    config: () => ({}),
+  });
+  // 应用默认值 - 参考PGrid的模式
+  const canvasTableDefaults = getCanvasTableDefaults();
+  const propsWithDefaults = computed(() => ({
+    ...props,
+    config: {
+      DISABLED: true, // 内部写死的默认配置
+      ...canvasTableDefaults, // 全局配置
+      ...props.config, // 用户传入的配置
+    },
+  }));
   let eVirtTable: EVirtTable | null = null;
   const attrs = useAttrs();
   const eVirtTableRef = ref(null);
@@ -129,10 +141,7 @@
       return;
     }
     eVirtTable = new EVirtTable(eVirtTableRef.value, {
-      config: {
-        ...defaultConfig,
-        ...props.config,
-      },
+      config: propsWithDefaults.value.config,
       columns: props.columns.map((col) => parseToEVirtColumn(col)),
       data: props.data,
       footerData: props.footerData,
@@ -167,6 +176,7 @@
     });
     eVirtTable.on('selectionChange', (selection) => {
       selectedRecords.value = selection;
+      emit('selectionChange', selection);
     });
     emit('ready', eVirtTable);
   });
@@ -181,7 +191,7 @@
     return document.body;
   };
   watch(
-    props.data,
+    () => props.data,
     (newValue) => {
       eVirtTable?.loadData(newValue);
     },
@@ -197,7 +207,7 @@
     { deep: true },
   );
   watch(
-    () => props.config,
+    () => propsWithDefaults.value.config,
     (newValue) => {
       eVirtTable?.loadConfig(newValue);
     },
@@ -210,9 +220,21 @@
     },
     { deep: true },
   );
+  watch(
+    () => props.loading,
+    (n, p) => {
+      if (n !== p) {
+        eVirtTable?.setLoading(n);
+      }
+    },
+    { immediate: true },
+  );
   defineExpose({
     $table: eVirtTable,
     selectedRecords: computed(() => selectedRecords.value),
+    reloadData: () => {
+      eVirtTable?.loadData(props.data);
+    },
   });
 </script>
 <template>
@@ -272,7 +294,7 @@
         >
           <div :style="view.style" v-for="view in wrapper.views" :key="view.key">
             <div
-              class="cell"
+              class="canvas-cell"
               v-for="cell in view.cells"
               :key="`${cell.rowKey}_${cell.key}`"
               :style="cell.style"
@@ -280,6 +302,7 @@
               <component
                 v-if="typeof cell.render === 'function'"
                 :is="cell.render(cell)"
+                :bordered="false"
               ></component>
               <template
                 v-else-if="typeof cell.render === 'string' && cell.render.startsWith('slot:')"

package/src/packages/components/PGrid.vue

@@ -138,8 +138,8 @@
     });
     return cols;
   });
-  const formEl = ref();
-  const tableEl = ref();
+  const formEl = ref<InstanceType<typeof AForm>>();
+  const tableEl = ref<InstanceType<typeof ATable>>();
   const renderFormKey = ref(uuid_v4());
   const renderTableKey = ref(uuid_v4());