plain-design 1.0.0-beta.73 → 1.0.0-beta.74

package/src/packages/components/$object/createObjectService.tsx

@@ -1,215 +1,215 @@
-import {PlainObject} from "plain-utils/utils/event";
-import {iObjectServiceDefaultConfig, iObjectServicePickConfig, iObjectServicePickMultipleConfig, iObjectServicePickSingleConfig} from "./object.service.utils";
-import {$dialog} from "../$dialog";
-import {AutoTable} from "../AutoTable";
-import {PlcCheck} from "../Table/standard/PlcCheck/PlcCheck";
-import {reactive} from "plain-design-composition";
-import {deepcopy} from "plain-utils/object/deepcopy";
-import {convertRowToSelected, convertSelectedToRow} from "./object.conver";
-import {createEffects} from "plain-utils/utils/createEffects";
-import {defer} from "plain-utils/utils/defer";
-import {$message} from "../$message";
-import {delay} from "plain-utils/utils/delay";
-import {getTableRowHeight} from "../Table/table/utils/table.utils";
-import {iDialogServiceOption} from "../useDialog/dialog.service.utils";
-import {TableOptionSpace} from "../AutoTable/utils/TableOption.space";
-import i18n from "../i18n";
-import {ClientZoom} from "../../utils/ClientZoom";
-
-export function createObjectService(defaultConfig: iObjectServiceDefaultConfig) {
-
-  const publicDialogOption: iDialogServiceOption = {
-    headAlign: 'left',
-    title: i18n.$it('base.selectData').d('选择数据'),
-    confirmButton: true,
-    cancelButton: true,
-    noContentPadding: true,
-    maxHeight: ' ',
-    maxWidth: ' ',
-    width: '50vw'
-  };
-
-  function processShowRows(option: TableOptionSpace.iTableOption) {
-    if (option.useConfig.showRows == null) {
-      const { clientHeight } = ClientZoom.getClientSize();
-      const availableHeight = clientHeight * 0.8 - 48 - 44 - 40 - 40 - 28;
-      const { bodyRowHeight } = getTableRowHeight(option.config.size, option.config);
-      const showRows = Math.floor(availableHeight / bodyRowHeight) - 1;
-
-      option.config.showRows = showRows;
-      option.pagination.state.size = option.config.showRows;
-      option.pagination.state.pageSizeOptions.indexOf(showRows) === -1 && (option.pagination.state.pageSizeOptions.unshift(showRows));
-      option.fill.state.showRows = showRows;
-    }
-  }
-
-  function processPermit(option: TableOptionSpace.iTableOption) {
-    /*clear data*/
-    option.config.loadOnStart = false;
-    option.state.list = [];
-    option.hooks.onPageDataChange.exec(null);
-    /*reset showRow*/
-    processShowRows(option);
-    /*clear filters*/
-    option.filterState.clearAll(false);
-    /*默认不可编辑*/
-    if (!option.config.permit) {option.config.permit = {};}
-    if (!option.config.permit.show) {option.config.permit.show = {};}
-    if (option.config.permit.show.insert == null) {option.config.permit.show.insert = false;}
-    if (option.config.permit.show.update == null) {option.config.permit.show.update = false;}
-    if (option.config.permit.show.delete == null) {option.config.permit.show.delete = false;}
-  }
-
-  /**
-   * 单选
-   * @author  韦胜健
-   * @date    2023.1.24 20:32
-   */
-  function single(serviceConfig: iObjectServicePickSingleConfig): Promise<PlainObject> {
-
-    const dfd = defer<PlainObject>();
-
-    const { effects } = createEffects();
-
-    const config = { ...defaultConfig, ...serviceConfig };
-
-    processPermit(config.option);
-
-    const state = reactive({
-      selected: !config.selected ? undefined : deepcopy(convertRowToSelected(config.selected, config.map))
-    });
-
-    const handler = {
-      handleConfirm: async () => {
-        const { selected } = state;
-        if (!selected) {
-          $message(i18n.$it('base.selectPieceOfData').d('请选择一条数据'));
-          return false;
-        }
-        const flag = config.beforeConfirm?.(selected);
-        if (flag === false) {
-          return false;
-        }
-        const row = convertSelectedToRow(selected, config.map);
-        dfd.resolve(row);
-        close();
-        return;
-      },
-    };
-
-    !serviceConfig.readonly && effects.push(
-      config.option.hooks.onRenderColumns.use({
-        processor: ({ list, render }) => {list.push({ render, key: 'object-check', seq: 0 });},
-        render: () => (
-          <PlcCheck field={config.keyField} v-model={state.selected} multiple={false} toggleOnClickRow/>
-        )
-      })
-    );
-
-    const close = $dialog({
-      ...publicDialogOption,
-      ...serviceConfig.dialogProps,
-      ...serviceConfig.readonly ? { confirmButton: false, cancelButton: false } : {},
-      title: serviceConfig.option.config.title || publicDialogOption.title,
-      onClose: () => {effects.clear();},
-      onOpen: () => config.option.methods.pageMethods.reload(),
-      handleConfirm: handler.handleConfirm,
-      handleCancel: () => config.beforeCancel?.(),
-      render: () => {
-        return (
-          <div>
-            <AutoTable option={config.option}/>
-          </div>
-        );
-      }
-    });
-
-    !serviceConfig.readonly && (!config.option.permission.permit.value.show.update || config.option.permission.permit.value.disabled.update) &&
-    effects.push(
-      config.option.hooks.onDblclickRow.use(async () => {
-        await delay();
-        handler.handleConfirm();
-      })
-    );
-
-    return dfd.promise;
-  }
-
-  /**
-   * 多选
-   * @author  韦胜健
-   * @date    2023.1.24 20:33
-   */
-  function multiple(serviceConfig: iObjectServicePickMultipleConfig): Promise<PlainObject[]> {
-    const dfd = defer<PlainObject[]>();
-
-    const { effects } = createEffects();
-
-    const config = { ...defaultConfig, ...serviceConfig };
-
-    processPermit(config.option);
-
-    const state = reactive({
-      selected: (!config.selected ? undefined : deepcopy(convertRowToSelected(config.selected, config.map))) as undefined | PlainObject[]
-    });
-
-    !serviceConfig.readonly && effects.push(
-      config.option.hooks.onRenderColumns.use({
-        processor: ({ list, render }) => {list.push({ render, key: 'object-check', seq: 0 });},
-        render: () => (
-          <PlcCheck field={config.keyField} v-model={state.selected} multiple toggleOnClickRow/>
-        )
-      })
-    );
-
-    $dialog({
-      headAlign: 'left',
-      ...publicDialogOption,
-      ...serviceConfig.dialogProps,
-      ...serviceConfig.readonly ? { confirmButton: false, cancelButton: false } : {},
-      title: serviceConfig.option.config.title || publicDialogOption.title,
-      onClose: () => {effects.clear();},
-      onOpen: () => config.option.methods.pageMethods.reload(),
-      handleConfirm: async () => {
-        const { selected } = state;
-        if (!selected || selected.length === 0) {
-          $message(i18n.$it('base.selectAtLeastOnePieceOfData').d('请至少选择一条数据'));
-          return false;
-        }
-        const flag = config.beforeConfirm?.(selected);
-        if (flag === false) {
-          return false;
-        }
-        const rows = convertSelectedToRow(selected, config.map);
-        dfd.resolve(rows);
-        return;
-      },
-      handleCancel: () => config.beforeCancel?.(),
-      render: () => {
-        return (
-          <div>
-            <AutoTable option={config.option}/>
-          </div>
-        );
-      }
-    });
-
-    return dfd.promise;
-  }
-
-  const service: iObjectServicePicker = (serviceConfig: iObjectServicePickConfig): any =>
-    serviceConfig.multiple ? multiple(serviceConfig) : single(serviceConfig);
-
-  return service;
-}
-
-type iObjectServicePicker =
-  ((config: iObjectServicePickSingleConfig & { clear?: false }) => Promise<PlainObject>)
-  &
-  ((config: iObjectServicePickSingleConfig & { clear: true }) => Promise<PlainObject | null>)
-  &
-  ((config: iObjectServicePickMultipleConfig & { clear?: false }) => Promise<PlainObject[]>)
-  &
-  ((config: iObjectServicePickMultipleConfig & { clear: true }) => Promise<PlainObject[] | null>)
-
-export type iObjectService = ReturnType<typeof createObjectService>
+import {PlainObject} from "plain-utils/utils/event";
+import {iObjectServiceDefaultConfig, iObjectServicePickConfig, iObjectServicePickMultipleConfig, iObjectServicePickSingleConfig} from "./object.service.utils";
+import {$dialog} from "../$dialog";
+import {AutoTable} from "../AutoTable";
+import {PlcCheck} from "../Table/standard/PlcCheck/PlcCheck";
+import {reactive} from "plain-design-composition";
+import {deepcopy} from "plain-utils/object/deepcopy";
+import {convertRowToSelected, convertSelectedToRow} from "./object.conver";
+import {createEffects} from "plain-utils/utils/createEffects";
+import {defer} from "plain-utils/utils/defer";
+import {$message} from "../$message";
+import {delay} from "plain-utils/utils/delay";
+import {getTableRowHeight} from "../Table/table/utils/table.utils";
+import {iDialogServiceOption} from "../useDialog/dialog.service.utils";
+import {TableOptionSpace} from "../AutoTable/utils/TableOption.space";
+import i18n from "../i18n";
+import {ClientZoom} from "../../utils/ClientZoom";
+
+export function createObjectService(defaultConfig: iObjectServiceDefaultConfig) {
+
+  const publicDialogOption: iDialogServiceOption = {
+    headAlign: 'left',
+    title: i18n.$it('base.selectData').d('选择数据'),
+    confirmButton: true,
+    cancelButton: true,
+    noContentPadding: true,
+    maxHeight: ' ',
+    maxWidth: ' ',
+    width: '50vw'
+  };
+
+  function processShowRows(option: TableOptionSpace.iTableOption) {
+    if (option.useConfig.showRows == null) {
+      const { clientHeight } = ClientZoom.getClientSize();
+      const availableHeight = clientHeight * 0.8 - 48 - 44 - 40 - 40 - 28;
+      const { bodyRowHeight } = getTableRowHeight(option.config.size, option.config);
+      const showRows = Math.floor(availableHeight / bodyRowHeight) - 1;
+
+      option.config.showRows = showRows;
+      option.pagination.state.size = option.config.showRows;
+      option.pagination.state.pageSizeOptions.indexOf(showRows) === -1 && (option.pagination.state.pageSizeOptions.unshift(showRows));
+      option.fill.state.showRows = showRows;
+    }
+  }
+
+  function processPermit(option: TableOptionSpace.iTableOption) {
+    /*clear data*/
+    option.config.loadOnStart = false;
+    option.state.list = [];
+    option.hooks.onPageDataChange.exec(null);
+    /*reset showRow*/
+    processShowRows(option);
+    /*clear filters*/
+    option.filterState.clearAll(false);
+    /*默认不可编辑*/
+    if (!option.config.permit) {option.config.permit = {};}
+    if (!option.config.permit.show) {option.config.permit.show = {};}
+    if (option.config.permit.show.insert == null) {option.config.permit.show.insert = false;}
+    if (option.config.permit.show.update == null) {option.config.permit.show.update = false;}
+    if (option.config.permit.show.delete == null) {option.config.permit.show.delete = false;}
+  }
+
+  /**
+   * 单选
+   * @author  韦胜健
+   * @date    2023.1.24 20:32
+   */
+  function single(serviceConfig: iObjectServicePickSingleConfig): Promise<PlainObject> {
+
+    const dfd = defer<PlainObject>();
+
+    const { effects } = createEffects();
+
+    const config = { ...defaultConfig, ...serviceConfig };
+
+    processPermit(config.option);
+
+    const state = reactive({
+      selected: !config.selected ? undefined : deepcopy(convertRowToSelected(config.selected, config.map))
+    });
+
+    const handler = {
+      handleConfirm: async () => {
+        const { selected } = state;
+        if (!selected) {
+          $message(i18n.$it('base.selectPieceOfData').d('请选择一条数据'));
+          return false;
+        }
+        const flag = config.beforeConfirm?.(selected);
+        if (flag === false) {
+          return false;
+        }
+        const row = convertSelectedToRow(selected, config.map);
+        dfd.resolve(row);
+        close();
+        return;
+      },
+    };
+
+    !serviceConfig.readonly && effects.push(
+      config.option.hooks.onRenderColumns.use({
+        processor: ({ list, render }) => {list.push({ render, key: 'object-check', seq: 0 });},
+        render: () => (
+          <PlcCheck field={config.keyField} v-model={state.selected} multiple={false} toggleOnClickRow/>
+        )
+      })
+    );
+
+    const close = $dialog({
+      ...publicDialogOption,
+      ...serviceConfig.dialogProps,
+      ...serviceConfig.readonly ? { confirmButton: false, cancelButton: false } : {},
+      title: serviceConfig.option.config.title || publicDialogOption.title,
+      onClose: () => {effects.clear();},
+      onOpen: () => config.option.methods.pageMethods.reload(),
+      handleConfirm: handler.handleConfirm,
+      handleCancel: () => config.beforeCancel?.(),
+      render: () => {
+        return (
+          <div>
+            <AutoTable option={config.option}/>
+          </div>
+        );
+      }
+    });
+
+    !serviceConfig.readonly && (!config.option.permission.permit.value.show.update || config.option.permission.permit.value.disabled.update) &&
+    effects.push(
+      config.option.hooks.onDblclickRow.use(async () => {
+        await delay();
+        handler.handleConfirm();
+      })
+    );
+
+    return dfd.promise;
+  }
+
+  /**
+   * 多选
+   * @author  韦胜健
+   * @date    2023.1.24 20:33
+   */
+  function multiple(serviceConfig: iObjectServicePickMultipleConfig): Promise<PlainObject[]> {
+    const dfd = defer<PlainObject[]>();
+
+    const { effects } = createEffects();
+
+    const config = { ...defaultConfig, ...serviceConfig };
+
+    processPermit(config.option);
+
+    const state = reactive({
+      selected: (!config.selected ? undefined : deepcopy(convertRowToSelected(config.selected, config.map))) as undefined | PlainObject[]
+    });
+
+    !serviceConfig.readonly && effects.push(
+      config.option.hooks.onRenderColumns.use({
+        processor: ({ list, render }) => {list.push({ render, key: 'object-check', seq: 0 });},
+        render: () => (
+          <PlcCheck field={config.keyField} v-model={state.selected} multiple toggleOnClickRow/>
+        )
+      })
+    );
+
+    $dialog({
+      headAlign: 'left',
+      ...publicDialogOption,
+      ...serviceConfig.dialogProps,
+      ...serviceConfig.readonly ? { confirmButton: false, cancelButton: false } : {},
+      title: serviceConfig.option.config.title || publicDialogOption.title,
+      onClose: () => {effects.clear();},
+      onOpen: () => config.option.methods.pageMethods.reload(),
+      handleConfirm: async () => {
+        const { selected } = state;
+        if (!selected || selected.length === 0) {
+          $message(i18n.$it('base.selectAtLeastOnePieceOfData').d('请至少选择一条数据'));
+          return false;
+        }
+        const flag = config.beforeConfirm?.(selected);
+        if (flag === false) {
+          return false;
+        }
+        const rows = convertSelectedToRow(selected, config.map);
+        dfd.resolve(rows);
+        return;
+      },
+      handleCancel: () => config.beforeCancel?.(),
+      render: () => {
+        return (
+          <div>
+            <AutoTable option={config.option}/>
+          </div>
+        );
+      }
+    });
+
+    return dfd.promise;
+  }
+
+  const service: iObjectServicePicker = (serviceConfig: iObjectServicePickConfig): any =>
+    serviceConfig.multiple ? multiple(serviceConfig) : single(serviceConfig);
+
+  return service;
+}
+
+type iObjectServicePicker =
+  ((config: iObjectServicePickSingleConfig & { clear?: false }) => Promise<PlainObject>)
+  &
+  ((config: iObjectServicePickSingleConfig & { clear: true }) => Promise<PlainObject | null>)
+  &
+  ((config: iObjectServicePickMultipleConfig & { clear?: false }) => Promise<PlainObject[]>)
+  &
+  ((config: iObjectServicePickMultipleConfig & { clear: true }) => Promise<PlainObject[] | null>)
+
+export type iObjectService = ReturnType<typeof createObjectService>

package/src/packages/components/$object/index.ts

@@ -1,5 +1,5 @@
-import {createObjectService} from "./createObjectService";
-
-export {createObjectService};
-
-export default createObjectService;
+import {createObjectService} from "./createObjectService";
+
+export {createObjectService};
+
+export default createObjectService;

package/src/packages/components/$object/object.conver.ts

@@ -1,56 +1,56 @@
-import {PlainObject} from "plain-utils/utils/event";
-import {iObjectServicePickPublicConfig} from "./object.service.utils";
-
-/**
- * 转化器函数类型，将选中行对象经过这个函数计算之后得到的对象，再将这个对象的值assign到绑定行对象上；
- * 逆转化函数类型也是这个
- * @author  韦胜健
- * @date    2022/8/4 14:24
- */
-export interface iObjectConverter {
-  (data: PlainObject): PlainObject;
-}
-
-/**
- * 将绑定行对象转化为选择行对象的格式，以判断选择的行对象是否被选中
- * @author  韦胜健
- * @date    2022/8/4 17:22
- */
-export function convertRowToSelected<DATA extends PlainObject | PlainObject[] | null | undefined>(
-  row: DATA,
-  map: undefined | iObjectServicePickPublicConfig['map']
-): DATA {
-  if (!map || row == null) {
-    return row;
-  }
-  const convert = Array.isArray(map)
-    ? map[1]
-    : (row: PlainObject) =>
-      Object.entries(map).reduce((selected, [key, value]) => {
-        selected[value] = row[key];
-        return selected;
-      }, {} as any);
-  return Array.isArray(row) ? row.map((i) => convert(i)) : convert(row);
-}
-
-/**
- * 将选择行对象转化为绑定行对象，对绑定行对象进行赋值
- * @author  韦胜健
- * @date    2022/8/4 17:23
- */
-export function convertSelectedToRow<DATA extends PlainObject | PlainObject[] | undefined | null>(
-  selected: DATA,
-  map: undefined | iObjectServicePickPublicConfig['map']
-): DATA {
-  if (!map || selected == null) {
-    return selected;
-  }
-  const convert = Array.isArray(map)
-    ? map[0]
-    : (selected: PlainObject) =>
-      Object.entries(map).reduce((row, [key, value]) => {
-        row[key] = selected[value];
-        return row;
-      }, {} as any);
-  return Array.isArray(selected) ? selected.map((i) => convert(i)) : convert(selected);
-}
+import {PlainObject} from "plain-utils/utils/event";
+import {iObjectServicePickPublicConfig} from "./object.service.utils";
+
+/**
+ * 转化器函数类型，将选中行对象经过这个函数计算之后得到的对象，再将这个对象的值assign到绑定行对象上；
+ * 逆转化函数类型也是这个
+ * @author  韦胜健
+ * @date    2022/8/4 14:24
+ */
+export interface iObjectConverter {
+  (data: PlainObject): PlainObject;
+}
+
+/**
+ * 将绑定行对象转化为选择行对象的格式，以判断选择的行对象是否被选中
+ * @author  韦胜健
+ * @date    2022/8/4 17:22
+ */
+export function convertRowToSelected<DATA extends PlainObject | PlainObject[] | null | undefined>(
+  row: DATA,
+  map: undefined | iObjectServicePickPublicConfig['map']
+): DATA {
+  if (!map || row == null) {
+    return row;
+  }
+  const convert = Array.isArray(map)
+    ? map[1]
+    : (row: PlainObject) =>
+      Object.entries(map).reduce((selected, [key, value]) => {
+        selected[value] = row[key];
+        return selected;
+      }, {} as any);
+  return Array.isArray(row) ? row.map((i) => convert(i)) : convert(row);
+}
+
+/**
+ * 将选择行对象转化为绑定行对象，对绑定行对象进行赋值
+ * @author  韦胜健
+ * @date    2022/8/4 17:23
+ */
+export function convertSelectedToRow<DATA extends PlainObject | PlainObject[] | undefined | null>(
+  selected: DATA,
+  map: undefined | iObjectServicePickPublicConfig['map']
+): DATA {
+  if (!map || selected == null) {
+    return selected;
+  }
+  const convert = Array.isArray(map)
+    ? map[0]
+    : (selected: PlainObject) =>
+      Object.entries(map).reduce((row, [key, value]) => {
+        row[key] = selected[value];
+        return row;
+      }, {} as any);
+  return Array.isArray(selected) ? selected.map((i) => convert(i)) : convert(selected);
+}