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

package/src/packages/components/$configuration/index.tsx

@@ -1,58 +1,58 @@
-import {createHooks, inject} from "plain-design-composition";
-import {iUploadService} from "../$upload/createUploadService";
-import {iHttp} from "../createHttp";
-import {iAddressService} from "../$address/createAddressService";
-import {iObjectService} from "../$object/createObjectService";
-import {iOvService} from "../$ov/createOvService";
-import TableOptionSpace from "../TableOptionSpace";
-
-export interface iConfiguration {
-  address?: iAddressService,
-  ov?: iOvService,
-  upload?: iUploadService,
-  object?: iObjectService,
-  http: iHttp,
-  useTableOption: TableOptionSpace.iTableOptionUser,
-  getExcelJS?: () => Promise<{ Workbook: any }>,
-  getFileSaver?: () => Promise<{ saveAs: (...args: any[]) => void }>,
-}
-
-/**
- * 初始化configuration的时候通知其他模块
- * @author  韦胜健
- * @date    2022/7/13 10:56
- */
-export const onInitializeConfigurationHook = createHooks<(configuration: iConfiguration) => void>();
-
-export const $configuration = (() => {
-  let _configuration: iConfiguration;
-  const set = (configuration: iConfiguration) => {
-    _configuration = { ..._configuration, ...configuration };
-    // console.warn('set config', configuration);
-    onInitializeConfigurationHook.exec(configuration);
-
-    /*环境变量中配置了主题的话，就覆盖主题颜色变量*/
-    // !!configuration.env.theme && Theme.overlap(configuration.env.theme);
-  };
-
-  function setItem<K extends keyof iConfiguration>(key: K, val: iConfiguration[K]) {
-    if (!_configuration) {
-      _configuration = {} as any;
-    }
-    _configuration[key] = val;
-  }
-
-  const get = <T extends keyof iConfiguration>(name: T): iConfiguration[T] => {
-    if (!_configuration) {
-      throw new Error(`Configuration未初始化，请检查初始化逻辑！get name:${name}`);
-    }
-    return _configuration[name];
-  };
-  const use = <T extends keyof iConfiguration>(name: T): iConfiguration[T] => {
-    const data = inject<null | iConfiguration[T]>(`$${name}`, null);
-    return data || _configuration[name];
-  };
-  return Object.assign(set, { get, use, setItem });
-})();
-
-export default $configuration;
+import {createHooks, inject} from "plain-design-composition";
+import {iUploadService} from "../$upload/createUploadService";
+import {iHttp} from "../createHttp";
+import {iAddressService} from "../$address/createAddressService";
+import {iObjectService} from "../$object/createObjectService";
+import {iOvService} from "../$ov/createOvService";
+import TableOptionSpace from "../TableOptionSpace";
+
+export interface iConfiguration {
+  address?: iAddressService,
+  ov?: iOvService,
+  upload?: iUploadService,
+  object?: iObjectService,
+  http: iHttp,
+  useTableOption: TableOptionSpace.iTableOptionUser,
+  getExcelJS?: () => Promise<{ Workbook: any }>,
+  getFileSaver?: () => Promise<{ saveAs: (...args: any[]) => void }>,
+}
+
+/**
+ * 初始化configuration的时候通知其他模块
+ * @author  韦胜健
+ * @date    2022/7/13 10:56
+ */
+export const onInitializeConfigurationHook = createHooks<(configuration: iConfiguration) => void>();
+
+export const $configuration = (() => {
+  let _configuration: iConfiguration;
+  const set = (configuration: iConfiguration) => {
+    _configuration = { ..._configuration, ...configuration };
+    // console.warn('set config', configuration);
+    onInitializeConfigurationHook.exec(configuration);
+
+    /*环境变量中配置了主题的话，就覆盖主题颜色变量*/
+    // !!configuration.env.theme && Theme.overlap(configuration.env.theme);
+  };
+
+  function setItem<K extends keyof iConfiguration>(key: K, val: iConfiguration[K]) {
+    if (!_configuration) {
+      _configuration = {} as any;
+    }
+    _configuration[key] = val;
+  }
+
+  const get = <T extends keyof iConfiguration>(name: T): iConfiguration[T] => {
+    if (!_configuration) {
+      throw new Error(`Configuration未初始化，请检查初始化逻辑！get name:${name}`);
+    }
+    return _configuration[name];
+  };
+  const use = <T extends keyof iConfiguration>(name: T): iConfiguration[T] => {
+    const data = inject<null | iConfiguration[T]>(`$${name}`, null);
+    return data || _configuration[name];
+  };
+  return Object.assign(set, { get, use, setItem });
+})();
+
+export default $configuration;

package/src/packages/components/$dialog/index.tsx

@@ -1,7 +1,7 @@
-import useDialog from "../useDialog";
-
-export const $dialog = useDialog().$dialog;
-
-export type iDialogService = typeof $dialog
-
-export default $dialog;
+import useDialog from "../useDialog";
+
+export const $dialog = useDialog().$dialog;
+
+export type iDialogService = typeof $dialog
+
+export default $dialog;

package/src/packages/components/$file/index.tsx

@@ -1,212 +1,212 @@
-import {defer} from "plain-utils/utils/defer";
-import {$message} from "../$message";
-import i18n from "../i18n";
-
-export type FileServiceSingleFile = File & { calcSize: number, data?: any }
-export type FileServiceValidator = (file: FileServiceSingleFile) => boolean | undefined
-
-export type FileServiceChooseFileConfig = {
-  multiple?: boolean,                 // 是否多选
-  accept?: string,                    // 选择的文件类型， input组件的accept属性值
-  validator?: FileServiceValidator,   // 自定义校验函数
-  max?: number,                       // 最大文件大小
-}
-
-export type FileServiceUploadErrorEvent = Error & {
-  status: number,
-  method: string,
-  url: string,
-  config: FileServiceUploadConfig,
-}
-
-export type FileServiceUploadConfig = {
-  action: string,                             // 上传地址
-  file: File | File[],                        // 上传的文件
-  filename: string,                           // 上传文件接收的文件名
-  data?: Record<string, string>,               // 上传的额外数据
-  headers?: Record<string, string>,           // 请求头
-  withCredentials?: boolean,                  // 是否带cookies凭证
-  onProgress?: (percent: number, e: ProgressEvent) => void,
-  onSuccess?: (data: string | Record<string, string>) => void,
-  onError?: (e: FileServiceUploadErrorEvent | ProgressEvent) => void,
-}
-
-export const FileServiceDefaultAccept = {
-  // image: 'image/gif, image/jpeg, image/png, image/jpg',
-  image: 'bmp,jpg,jpeg,png,tif,gif,pcx,tga,exif,fpx,svg,psd,cdr,pcd,dxf,ufo,eps,ai,raw,WMF,webp,avif'.split(',').map(i => `image/${i}`).join(', '),
-  excel: 'application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-} as Record<string, string>;
-
-export function createFileService() {
-
-  /**
-   * 选择文件
-   * @author  韦胜健
-   * @date    2021/1/1 17:03
-   */
-  const chooseFile = (config?: FileServiceChooseFileConfig) => {
-    config = config || {};
-    const input = getInput();
-
-    /*multiple*/
-    if (config.multiple) {
-      input.setAttribute('multiple', 'multiple');
-    } else {
-      input.removeAttribute('multiple');
-    }
-    /*accept*/
-    if (!!config.accept) {
-      const defaultInputAccept = FileServiceDefaultAccept[config.accept];
-      input.setAttribute('accept', defaultInputAccept || config.accept);
-    } else {
-      input.removeAttribute('accept');
-    }
-    const dfd = defer<FileServiceSingleFile | FileServiceSingleFile[]>();
-
-    if (!!input.__change) {
-      input.value = null as any;
-      input.removeEventListener('change', input.__change);
-    }
-    input.__change = (e) => {
-      const targetFiles = (e as any).target.files as FileServiceSingleFile[];
-      const files = [];
-      for (let i = 0; i < targetFiles.length; i++) {
-        const file = targetFiles[i];
-        file.calcSize = Number((file.size / (1024 * 1024)).toFixed(2));
-        if (!!config!.validator && !config!.validator(file)) return;
-        if (!!config!.max && file.calcSize > config!.max) {
-          return $message.error(
-            i18n.$it('file.oversize', { filename: file.name, filesize: file.calcSize, max: config!.max }).d(`[${file.name}]大小为${file.calcSize}MB，超过最大限制${config!.max}MB`),
-            { time: 5000 });
-        }
-        files.push(file);
-      }
-      dfd.resolve(config!.multiple ? files : files[0]);
-    };
-    input.addEventListener('change', input.__change);
-    input.click();
-
-    return dfd.promise;
-  };
-
-  /**
-   * 选择tupiuan
-   * @author  韦胜健
-   * @date    2021/1/1 17:03
-   */
-  const chooseImage = (multiple?: boolean) => {
-    const config: FileServiceChooseFileConfig = { accept: "image", multiple };
-    return chooseFile(config);
-  };
-
-  /**
-   * 读取文件为base64字符串
-   * @author  韦胜健
-   * @date    2021/1/1 17:04
-   */
-  const readAsDataURL = (file: File) => {
-    const dfd = defer<string | ArrayBuffer | null>();
-    let fr = new FileReader();
-    fr.onloadend = e => dfd.resolve(e.target!.result);
-    fr.onerror = () => dfd.reject();
-    fr.readAsDataURL(file);
-    return dfd.promise;
-  };
-
-  /**
-   * 上传文件
-   * @author  韦胜健
-   * @date    2021/1/1 17:07
-   */
-  const upload = (uploadConfig: FileServiceUploadConfig) => {
-    const xhr = ('XMLHttpRequest' in window ? new XMLHttpRequest() : new (Window as any).ActiveXObject('Microsoft.XMLHTTP')) as XMLHttpRequest;
-    xhr.open('post', uploadConfig.action, true);
-
-    if (!!xhr.upload) {
-      xhr.upload.addEventListener('progress', (e) => {
-        const percent = Number((e.loaded / e.total * 100).toFixed(2));
-        !!uploadConfig.onProgress && uploadConfig.onProgress(percent, e);
-      });
-    }
-
-    if (uploadConfig.withCredentials != null && 'withCredentials' in xhr) {
-      xhr.withCredentials = uploadConfig.withCredentials;
-    }
-
-    if (!!uploadConfig.headers)
-      Object.entries(uploadConfig.headers)
-        .forEach(([key, value]) => xhr.setRequestHeader(key, value));
-
-    xhr.onerror = (e) => !!uploadConfig.onError && uploadConfig.onError(e);
-    xhr.onload = () => {
-      if (xhr.status < 200 || xhr.status > 300) {
-        !!uploadConfig.onError && uploadConfig.onError(getError(uploadConfig, xhr));
-      } else {
-        !!uploadConfig.onSuccess && uploadConfig.onSuccess(getResponseBody(xhr));
-      }
-    };
-    const formData = new FormData();
-    if (!!uploadConfig.data) Object.entries(uploadConfig.data).forEach(([key, value]) => formData.append(key, value));
-    if (Array.isArray(uploadConfig.file)) {
-      uploadConfig.file.forEach(f => formData.append(uploadConfig.filename, f));
-    } else {
-      formData.append(uploadConfig.filename, uploadConfig.file);
-    }
-    xhr.send(formData);
-    return xhr;
-  };
-
-  return {
-    chooseFile,
-    chooseImage,
-    readAsDataURL,
-    upload,
-  };
-}
-
-const getInput = (() => {
-  let input: HTMLInputElement & { __change?: (e: Event) => void };
-  return () => {
-    if (!input) {
-      input = document.createElement('input');
-      input.setAttribute('type', 'file');
-      input.style.display = 'none';
-      document.body.appendChild(input);
-    }
-    return input;
-  };
-})();
-
-function getError(config: FileServiceUploadConfig, xhr: XMLHttpRequest) {
-  let message: string;
-  console.log(xhr);
-  if (!!xhr.response) {
-    message = xhr.response.error || xhr.response;
-  } else if (!!xhr.responseText) {
-    message = xhr.responseText;
-  } else {
-    message = `file to post ${config.action} ${xhr.status}`;
-  }
-
-  const error = new Error(message) as FileServiceUploadErrorEvent;
-  error.status = xhr.status;
-  error.method = 'post';
-  error.url = config.action;
-  error.config = config;
-
-  return error;
-}
-
-function getResponseBody(xhr: XMLHttpRequest) {
-  let result = xhr.responseText || xhr.response;
-  if (!result) return result;
-  try {
-    return JSON.parse(result);
-  } catch (e) {
-    return result;
-  }
-}
-
-export const $file = createFileService();
-
-export default $file;
+import {defer} from "plain-utils/utils/defer";
+import {$message} from "../$message";
+import i18n from "../i18n";
+
+export type FileServiceSingleFile = File & { calcSize: number, data?: any }
+export type FileServiceValidator = (file: FileServiceSingleFile) => boolean | undefined
+
+export type FileServiceChooseFileConfig = {
+  multiple?: boolean,                 // 是否多选
+  accept?: string,                    // 选择的文件类型， input组件的accept属性值
+  validator?: FileServiceValidator,   // 自定义校验函数
+  max?: number,                       // 最大文件大小
+}
+
+export type FileServiceUploadErrorEvent = Error & {
+  status: number,
+  method: string,
+  url: string,
+  config: FileServiceUploadConfig,
+}
+
+export type FileServiceUploadConfig = {
+  action: string,                             // 上传地址
+  file: File | File[],                        // 上传的文件
+  filename: string,                           // 上传文件接收的文件名
+  data?: Record<string, string>,               // 上传的额外数据
+  headers?: Record<string, string>,           // 请求头
+  withCredentials?: boolean,                  // 是否带cookies凭证
+  onProgress?: (percent: number, e: ProgressEvent) => void,
+  onSuccess?: (data: string | Record<string, string>) => void,
+  onError?: (e: FileServiceUploadErrorEvent | ProgressEvent) => void,
+}
+
+export const FileServiceDefaultAccept = {
+  // image: 'image/gif, image/jpeg, image/png, image/jpg',
+  image: 'bmp,jpg,jpeg,png,tif,gif,pcx,tga,exif,fpx,svg,psd,cdr,pcd,dxf,ufo,eps,ai,raw,WMF,webp,avif'.split(',').map(i => `image/${i}`).join(', '),
+  excel: 'application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+} as Record<string, string>;
+
+export function createFileService() {
+
+  /**
+   * 选择文件
+   * @author  韦胜健
+   * @date    2021/1/1 17:03
+   */
+  const chooseFile = (config?: FileServiceChooseFileConfig) => {
+    config = config || {};
+    const input = getInput();
+
+    /*multiple*/
+    if (config.multiple) {
+      input.setAttribute('multiple', 'multiple');
+    } else {
+      input.removeAttribute('multiple');
+    }
+    /*accept*/
+    if (!!config.accept) {
+      const defaultInputAccept = FileServiceDefaultAccept[config.accept];
+      input.setAttribute('accept', defaultInputAccept || config.accept);
+    } else {
+      input.removeAttribute('accept');
+    }
+    const dfd = defer<FileServiceSingleFile | FileServiceSingleFile[]>();
+
+    if (!!input.__change) {
+      input.value = null as any;
+      input.removeEventListener('change', input.__change);
+    }
+    input.__change = (e) => {
+      const targetFiles = (e as any).target.files as FileServiceSingleFile[];
+      const files = [];
+      for (let i = 0; i < targetFiles.length; i++) {
+        const file = targetFiles[i];
+        file.calcSize = Number((file.size / (1024 * 1024)).toFixed(2));
+        if (!!config!.validator && !config!.validator(file)) return;
+        if (!!config!.max && file.calcSize > config!.max) {
+          return $message.error(
+            i18n.$it('file.oversize', { filename: file.name, filesize: file.calcSize, max: config!.max }).d(`[${file.name}]大小为${file.calcSize}MB，超过最大限制${config!.max}MB`),
+            { time: 5000 });
+        }
+        files.push(file);
+      }
+      dfd.resolve(config!.multiple ? files : files[0]);
+    };
+    input.addEventListener('change', input.__change);
+    input.click();
+
+    return dfd.promise;
+  };
+
+  /**
+   * 选择tupiuan
+   * @author  韦胜健
+   * @date    2021/1/1 17:03
+   */
+  const chooseImage = (multiple?: boolean) => {
+    const config: FileServiceChooseFileConfig = { accept: "image", multiple };
+    return chooseFile(config);
+  };
+
+  /**
+   * 读取文件为base64字符串
+   * @author  韦胜健
+   * @date    2021/1/1 17:04
+   */
+  const readAsDataURL = (file: File) => {
+    const dfd = defer<string | ArrayBuffer | null>();
+    let fr = new FileReader();
+    fr.onloadend = e => dfd.resolve(e.target!.result);
+    fr.onerror = () => dfd.reject();
+    fr.readAsDataURL(file);
+    return dfd.promise;
+  };
+
+  /**
+   * 上传文件
+   * @author  韦胜健
+   * @date    2021/1/1 17:07
+   */
+  const upload = (uploadConfig: FileServiceUploadConfig) => {
+    const xhr = ('XMLHttpRequest' in window ? new XMLHttpRequest() : new (Window as any).ActiveXObject('Microsoft.XMLHTTP')) as XMLHttpRequest;
+    xhr.open('post', uploadConfig.action, true);
+
+    if (!!xhr.upload) {
+      xhr.upload.addEventListener('progress', (e) => {
+        const percent = Number((e.loaded / e.total * 100).toFixed(2));
+        !!uploadConfig.onProgress && uploadConfig.onProgress(percent, e);
+      });
+    }
+
+    if (uploadConfig.withCredentials != null && 'withCredentials' in xhr) {
+      xhr.withCredentials = uploadConfig.withCredentials;
+    }
+
+    if (!!uploadConfig.headers)
+      Object.entries(uploadConfig.headers)
+        .forEach(([key, value]) => xhr.setRequestHeader(key, value));
+
+    xhr.onerror = (e) => !!uploadConfig.onError && uploadConfig.onError(e);
+    xhr.onload = () => {
+      if (xhr.status < 200 || xhr.status > 300) {
+        !!uploadConfig.onError && uploadConfig.onError(getError(uploadConfig, xhr));
+      } else {
+        !!uploadConfig.onSuccess && uploadConfig.onSuccess(getResponseBody(xhr));
+      }
+    };
+    const formData = new FormData();
+    if (!!uploadConfig.data) Object.entries(uploadConfig.data).forEach(([key, value]) => formData.append(key, value));
+    if (Array.isArray(uploadConfig.file)) {
+      uploadConfig.file.forEach(f => formData.append(uploadConfig.filename, f));
+    } else {
+      formData.append(uploadConfig.filename, uploadConfig.file);
+    }
+    xhr.send(formData);
+    return xhr;
+  };
+
+  return {
+    chooseFile,
+    chooseImage,
+    readAsDataURL,
+    upload,
+  };
+}
+
+const getInput = (() => {
+  let input: HTMLInputElement & { __change?: (e: Event) => void };
+  return () => {
+    if (!input) {
+      input = document.createElement('input');
+      input.setAttribute('type', 'file');
+      input.style.display = 'none';
+      document.body.appendChild(input);
+    }
+    return input;
+  };
+})();
+
+function getError(config: FileServiceUploadConfig, xhr: XMLHttpRequest) {
+  let message: string;
+  console.log(xhr);
+  if (!!xhr.response) {
+    message = xhr.response.error || xhr.response;
+  } else if (!!xhr.responseText) {
+    message = xhr.responseText;
+  } else {
+    message = `file to post ${config.action} ${xhr.status}`;
+  }
+
+  const error = new Error(message) as FileServiceUploadErrorEvent;
+  error.status = xhr.status;
+  error.method = 'post';
+  error.url = config.action;
+  error.config = config;
+
+  return error;
+}
+
+function getResponseBody(xhr: XMLHttpRequest) {
+  let result = xhr.responseText || xhr.response;
+  if (!result) return result;
+  try {
+    return JSON.parse(result);
+  } catch (e) {
+    return result;
+  }
+}
+
+export const $file = createFileService();
+
+export default $file;

package/src/packages/components/$image/index.tsx

@@ -1,7 +1,7 @@
-import useImage from "../useImage";
-
-export const $image = useImage().$image;
-
-export default $image;
-
-export type iImageService = typeof $image
+import useImage from "../useImage";
+
+export const $image = useImage().$image;
+
+export default $image;
+
+export type iImageService = typeof $image