plain-design 1.0.0-beta.16 → 1.0.0-beta.161

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

@@ -0,0 +1,56 @@
+import $dialog from "../$dialog";
+import ImageSelector, {iImageSelectOption} from "../ImageSelector";
+import {iDialogServiceOption} from "../useDialog/dialog.service.utils";
+import $message from "../$message";
+import i18n from "../i18n";
+
+export const $imageSelector = (
+  {
+    selectOptions,
+    selectValue,
+    dialogServiceOption,
+    handleConfirm,
+    title,
+    aspectRatio,
+    imageFit,
+    imagePosition,
+  }: {
+    title?: string,
+    selectOptions: iImageSelectOption[],
+    selectValue?: any,
+    dialogServiceOption?: iDialogServiceOption,
+    handleConfirm?: (selectValue: string, selectOption: iImageSelectOption) => void | boolean | Promise<void | boolean>,
+    aspectRatio?: string,
+    imageFit?: string,
+    imagePosition?: string,
+  }
+) => {
+  const _handleConfirm = async () => {
+    if (!selectValue) {
+      $message.error(i18n.$it('base.pleaseSelect').d('请选择'));
+      return false;
+    }
+    const flag = await handleConfirm?.(selectValue, selectOptions.find(i => i.val === selectValue)!);
+    if (flag !== false) {close();}
+  };
+  const close = $dialog({
+    title,
+    width: 800,
+    render: () => <ImageSelector
+      imageFit={imageFit}
+      imagePosition={imagePosition}
+      modelValue={selectValue}
+      onUpdateModelValue={val => selectValue = val}
+      selectOptions={selectOptions}
+      aspectRatio={aspectRatio}
+      onDoubleClickOption={() => {_handleConfirm();}}
+    />,
+    confirmButton: true,
+    cancelButton: true,
+    handleConfirm: () => {
+      _handleConfirm();
+      return false;
+    },
+    ...dialogServiceOption,
+  });
+};

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

@@ -0,0 +1,3 @@
+import useLoading from "../useLoading";
+
+export const $loading = useLoading().$loading;

package/src/packages/components/$message/image.service.utils.tsx

@@ -3,7 +3,7 @@
  * @author  韦胜健
  * @date    2021/1/21 11:46
  */
-import {defer} from "plain-utils/utils/defer";
+import {defer} from "@peryl/utils/defer";
 import $file from "../$file";
 import i18n from "../i18n";
 
@@ -149,11 +149,11 @@ export const imageCompress = (() => {
     }*/
     let image = await urlToImage(url);
     if (!!config.maxHeight || !!config.maxWidth) {
-      let file = await compressByMeasure(image, config, `${i18n('image.compressByImageMeasure').d('根据尺寸压缩图片')}.png`);
+      let file = await compressByMeasure(image, config, `${i18n.$it('image.compressByImageMeasure').d('根据尺寸压缩图片')}.png`);
       return !file ? null : fileToDataURL(file);
     }
     if (!!config.maxSize) {
-      let file = await compressByMaxSize(image, config.maxSize, `${i18n('image.compressByImageCapacity').d('根据大小压缩图片')}.png`);
+      let file = await compressByMaxSize(image, config.maxSize, `${i18n.$it('image.compressByImageCapacity').d('根据大小压缩图片')}.png`);
       return !file ? null : fileToDataURL(file);
     }
     throw new Error('compress: maxSize, maxHeight, maxWidth is empty!');

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

@@ -1,15 +1,15 @@
-import {PlainObject} from "plain-utils/utils/event";
+import {PlainObject} from "@peryl/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 {getComponentCls, reactive} from "@peryl/react-compose";
+import {deepcopy} from "@peryl/utils/deepcopy";
 import {convertRowToSelected, convertSelectedToRow} from "./object.conver";
-import {createEffects} from "plain-utils/utils/createEffects";
-import {defer} from "plain-utils/utils/defer";
+import {createEffects} from "@peryl/utils/createEffects";
+import {defer} from "@peryl/utils/defer";
 import {$message} from "../$message";
-import {delay} from "plain-utils/utils/delay";
+import {delay} from "@peryl/utils/delay";
 import {getTableRowHeight} from "../Table/table/utils/table.utils";
 import {iDialogServiceOption} from "../useDialog/dialog.service.utils";
 import {TableOptionSpace} from "../AutoTable/utils/TableOption.space";
@@ -19,23 +19,28 @@ import {ClientZoom} from "../../utils/ClientZoom";
 export function createObjectService(defaultConfig: iObjectServiceDefaultConfig) {
 
   const publicDialogOption: iDialogServiceOption = {
-    title: i18n('base.selectData').d('选择数据'),
+    headAlign: 'left',
+    title: i18n.$it('base.selectData').d('选择数据'),
     confirmButton: true,
     cancelButton: true,
+    noContentPadding: true,
     maxHeight: ' ',
-    maxWidth: '60vw',
+    maxWidth: ' ',
+    width: '50vw'
   };
 
   function processShowRows(option: TableOptionSpace.iTableOption) {
-    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;
+    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) {
@@ -78,7 +83,7 @@ export function createObjectService(defaultConfig: iObjectServiceDefaultConfig)
       handleConfirm: async () => {
         const { selected } = state;
         if (!selected) {
-          $message(i18n('base.selectPieceOfData').d('请选择一条数据'));
+          $message(i18n.$it('base.selectPieceOfData').d('请选择一条数据'));
           return false;
         }
         const flag = config.beforeConfirm?.(selected);
@@ -92,7 +97,7 @@ export function createObjectService(defaultConfig: iObjectServiceDefaultConfig)
       },
     };
 
-    effects.push(
+    !serviceConfig.readonly && effects.push(
       config.option.hooks.onRenderColumns.use({
         processor: ({ list, render }) => {list.push({ render, key: 'object-check', seq: 0 });},
         render: () => (
@@ -101,16 +106,12 @@ export function createObjectService(defaultConfig: iObjectServiceDefaultConfig)
       })
     );
 
-    (!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();
-      })
-    );
-
     const close = $dialog({
       ...publicDialogOption,
+      ...serviceConfig.dialogProps,
+      ...serviceConfig.readonly ? { confirmButton: false, cancelButton: false } : {},
+      title: serviceConfig.option.config.title || publicDialogOption.title,
+      externalClass: [serviceConfig.dialogProps?.externalClass, getComponentCls('object-dialog')].filter(Boolean).join(' '),
       onClose: () => {effects.clear();},
       onOpen: () => config.option.methods.pageMethods.reload(),
       handleConfirm: handler.handleConfirm,
@@ -124,6 +125,14 @@ export function createObjectService(defaultConfig: iObjectServiceDefaultConfig)
       }
     });
 
+    !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;
   }
 
@@ -145,7 +154,7 @@ export function createObjectService(defaultConfig: iObjectServiceDefaultConfig)
       selected: (!config.selected ? undefined : deepcopy(convertRowToSelected(config.selected, config.map))) as undefined | PlainObject[]
     });
 
-    effects.push(
+    !serviceConfig.readonly && effects.push(
       config.option.hooks.onRenderColumns.use({
         processor: ({ list, render }) => {list.push({ render, key: 'object-check', seq: 0 });},
         render: () => (
@@ -155,13 +164,18 @@ export function createObjectService(defaultConfig: iObjectServiceDefaultConfig)
     );
 
     $dialog({
+      headAlign: 'left',
       ...publicDialogOption,
+      ...serviceConfig.dialogProps,
+      ...serviceConfig.readonly ? { confirmButton: false, cancelButton: false } : {},
+      title: serviceConfig.option.config.title || publicDialogOption.title,
+      externalClass: [serviceConfig.dialogProps?.externalClass, getComponentCls('object-dialog')].filter(Boolean).join(' '),
       onClose: () => {effects.clear();},
       onOpen: () => config.option.methods.pageMethods.reload(),
       handleConfirm: async () => {
         const { selected } = state;
         if (!selected || selected.length === 0) {
-          $message(i18n('base.selectAtLeastOnePieceOfData').d('请至少选择一条数据'));
+          $message(i18n.$it('base.selectAtLeastOnePieceOfData').d('请至少选择一条数据'));
           return false;
         }
         const flag = config.beforeConfirm?.(selected);

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

@@ -1,4 +1,4 @@
-import {PlainObject} from "plain-utils/utils/event";
+import {PlainObject} from "@peryl/utils/event";
 import {iObjectServicePickPublicConfig} from "./object.service.utils";
 
 /**
@@ -30,7 +30,7 @@ export function convertRowToSelected<DATA extends PlainObject | PlainObject[] |
         selected[value] = row[key];
         return selected;
       }, {} as any);
-  return Array.isArray(row) ? row.map((i) => convert(i)) : convert(row);
+  return Array.isArray(row) ? (row.map((i) => convert(i)) as any) : convert(row);
 }
 
 /**
@@ -52,5 +52,5 @@ export function convertSelectedToRow<DATA extends PlainObject | PlainObject[] |
         row[key] = selected[value];
         return row;
       }, {} as any);
-  return Array.isArray(selected) ? selected.map((i) => convert(i)) : convert(selected);
+  return Array.isArray(selected) ? (selected.map((i) => convert(i)) as any) : convert(selected);
 }

package/src/packages/components/$object/object.service.utils.ts

@@ -1,6 +1,8 @@
-import {PlainObject} from "plain-utils/utils/event";
+import {PlainObject} from "@peryl/utils/event";
 import {iObjectConverter} from "./object.conver";
 import {TableOptionSpace} from "../AutoTable/utils/TableOption.space";
+import {ComponentPropsType} from "@peryl/react-compose";
+import {Dialog} from "../Dialog";
 
 /**
  * 创建Object服务需要的默认的配置参数
@@ -17,9 +19,11 @@ export interface iObjectServiceDefaultConfig {
  * @date    2023.1.24 20:14
  */
 export interface iObjectServicePickPublicConfig extends Partial<iObjectServiceDefaultConfig> {
-  option: TableOptionSpace.iTableOption,                                                       // TableOption对象
-  map?: Record<string, string> | [iObjectConverter, iObjectConverter],         // 用来转化选中行与目标行对象的规则
-  beforeCancel?: () => void | boolean | Promise<void | boolean>,              // 取消之前的动作
+  option: TableOptionSpace.iTableOption,                                                        // TableOption对象
+  map?: Record<string, string> | [iObjectConverter, iObjectConverter],                          // 用来转化选中行与目标行对象的规则
+  beforeCancel?: () => void | boolean | Promise<void | boolean>,                                // 取消之前的动作
+  readonly?: boolean,                                                                           // 只读，不需要选择数据，只需要关闭
+  dialogProps?: Partial<ComponentPropsType<typeof Dialog>>                                       // dialog属性
 }
 
 /**

package/src/packages/components/$ov/createOvService.ts

@@ -1,6 +1,6 @@
 import {iOvMeta, iOvServiceConfig} from "./ov.utils";
-import {defer, DFD} from "plain-utils/utils/defer";
-import {reactive} from "plain-design-composition";
+import {defer, DFD} from "@peryl/utils/defer";
+import {reactive} from "@peryl/react-compose";
 
 export function createOvService(
   config: iOvServiceConfig

package/src/packages/components/$previewer/ImagePreviewerFixedContainer.tsx

@@ -0,0 +1,108 @@
+import {designComponent, getComponentCls, iHTMLDivElement, nextIndex, onBeforeUnmount, onMounted, PropType, reactive, useClasses, useRefs, useStyles} from "@peryl/react-compose";
+import {getCenterRect, iImagePreviewerOption, ImagePreviewerHooks} from "../ImagePreviewer/image-previewer.utils";
+import {ImagePreviewer} from "../ImagePreviewer";
+import {getRectAutoFormat} from "@peryl/utils/getRectAutoFormat";
+import {unit} from "@peryl/utils/unit";
+import {createEffects} from "@peryl/utils/createEffects";
+import {addElementListener} from "@peryl/utils/addElementListener";
+import {delay} from "@peryl/utils/delay";
+import './image-previewer-fixed-container.scss';
+
+export const ImagePreviewerFixedContainer = designComponent({
+  name: 'image-previewer-fixed-container',
+  props: {
+    option: { type: Object as PropType<iImagePreviewerOption>, required: true }
+  },
+  setup({ props }) {
+
+    const { refs, onRef } = useRefs({ el: iHTMLDivElement });
+
+    const state = reactive({
+      ready: false,
+    });
+
+    const classes = useClasses(() => [
+      getComponentCls('image-previewer-fixed-container')
+    ]);
+
+    const styles = useStyles(style => {style.zIndex = nextIndex();});
+
+    const { effects: setupEffects } = createEffects();
+
+    onMounted(async () => {
+      const containerWidth = Math.floor(refs.el!.offsetWidth);
+      const containerHeight = Math.floor(refs.el!.offsetHeight - props.option.galleryHeight - props.option.separatorHeight);
+      const containerRatio = Number((containerWidth / containerHeight).toFixed(1));
+
+      const imageElement = props.option.imageElement;
+
+      if (!imageElement) {
+        state.ready = true;
+        return;
+      }
+      /**
+       * 如果原始imageElement存在，则创建一个影子图片元素展示过度动画
+       * @author  韦胜健
+       * @date    2024/1/5 11:22
+       */
+      const shadowImageElement = imageElement.cloneNode(true) as HTMLImageElement;
+      const imageElementRect = getRectAutoFormat(imageElement);
+      props.option.oldSourceImageOpacity = imageElement.style.opacity;
+      imageElement.style.opacity = "0";
+
+      shadowImageElement.style.position = 'fixed';
+      shadowImageElement.style.top = unit(imageElementRect.top)!;
+      shadowImageElement.style.left = unit(imageElementRect.left)!;
+      shadowImageElement.style.width = unit(imageElementRect.width)!;
+      shadowImageElement.style.height = unit(imageElementRect.height)!;
+      shadowImageElement.style.transition = 'all ease 300ms';
+      shadowImageElement.style.zIndex = '999999';
+      shadowImageElement.style.objectFit = window.getComputedStyle(imageElement).objectFit
+
+      /*开启动画时阻止页面滚动*/
+      setupEffects.push(
+        addElementListener(shadowImageElement, 'wheel', e => {
+          e.preventDefault();
+          e.stopPropagation();
+        })
+      );
+
+      const newRect = getCenterRect({ containerElement: { containerHeight, containerWidth, containerRatio }, imageElement });
+
+      document.body.appendChild(shadowImageElement);
+      setupEffects.push(() => {document.body.removeChild(shadowImageElement);});
+      await delay();
+      shadowImageElement.style.top = unit(newRect.top.toFixed(0))!;
+      shadowImageElement.style.left = unit(newRect.left.toFixed(0))!;
+      shadowImageElement.style.height = unit(newRect.height.toFixed(0))!;
+      shadowImageElement.style.width = unit(newRect.width.toFixed(0))!;
+      const clearListener = addElementListener(shadowImageElement, 'transitionend', () => {
+        state.ready = true;
+        const clearHook = ImagePreviewerHooks.onImagePreviewerReady.use(async (data) => {
+          if (data.option.id !== props.option.id) {
+            return;
+          }
+          await delay();
+          clearHook();
+          setupEffects.clear();
+        });
+        setupEffects.push(clearHook);
+      });
+      setupEffects.push(clearListener);
+    });
+
+    onBeforeUnmount(setupEffects.clear);
+
+    return () => (
+      <div className={classes.value} ref={onRef.el}>
+        {state.ready && (
+          <ImagePreviewer
+            closable
+            option={props.option}
+            style={styles.value}
+          />
+        )}
+      </div>
+    );
+  },
+});

package/src/packages/components/$previewer/image-previewer-fixed-container.scss

@@ -0,0 +1,18 @@
+@include comp(image-previewer-fixed-container) {
+  position: fixed;
+  inset: 0;
+
+  @include comp(carousel) {
+    position: absolute;
+    top: 0;
+    right: 0;
+    left: 0;
+  }
+
+  .image-previewer-component-gallery {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    right: 0;
+  }
+}

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

@@ -0,0 +1,52 @@
+import {reactive} from "@peryl/react-compose";
+import {createImagePreviewerOption, iImagePreviewerOption, iImagePreviewerParamOption} from "../ImagePreviewer/image-previewer.utils";
+import {ImagePreviewerFixedContainer} from "./ImagePreviewerFixedContainer";
+import {getDeviceInfo} from "../../utils/getDeviceInfo";
+
+/**
+ * 图片预览服务
+ * @author  韦胜健
+ * @date    2024/1/8 10:04
+ */
+export const $previewer = (() => {
+
+  const state = reactive({
+    /*有service option不同，image previewer同时只能显示一个*/
+    option: null as null | iImagePreviewerOption,
+  });
+
+  /**
+   * 大图查看图片
+   * @author  韦胜健
+   * @date    2024/1/5 11:22
+   */
+  const preview = async (param: iImagePreviewerParamOption, imageElement?: HTMLImageElement) => {
+
+    const isMobile = getDeviceInfo().deviceType === 'mobile';
+
+    state.option = createImagePreviewerOption(param, imageElement, {
+      autoHeight: false,
+      mask: true,
+      globalKeyboardEvent: true,
+      button: true,
+      ...isMobile ? {
+        gallery: false,
+        button: false,
+        swipeButton: false,
+        galleryHeight: 0,
+      } : {},
+    });
+  };
+
+  const close = (optionOrId: string | iImagePreviewerOption) => {
+    const optionId = typeof optionOrId === "string" ? optionOrId : optionOrId.id;
+    if (!!state.option && state.option.id === optionId) {state.option = null;}
+  };
+
+  const render = () => !!state.option && <ImagePreviewerFixedContainer option={state.option}/>;
+
+  return { preview, render, close };
+
+})();
+
+export default $previewer;

package/src/packages/components/$search/SearchFooter.tsx

@@ -0,0 +1,32 @@
+import {designPage} from "@peryl/react-compose";
+import {i18n} from "../i18n";
+
+export const SearchFooter = designPage(() => {
+  return () => (
+    <>
+      <svg width="15" height="15" aria-label="Enter key" role="img">
+        <g fill="none" stroke="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="1.2">
+          <path d="M12 3.53088v3c0 1-1 2-2 2H4M7 11.53088l-3-3 3-3"></path>
+        </g>
+      </svg>
+      <span>{i18n.$it('search.select').d('选择')}</span>
+      <svg width="15" height="15" aria-label="Arrow down" role="img">
+        <g fill="none" stroke="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="1.2">
+          <path d="M7.5 3.5v8M10.5 8.5l-3 3-3-3"></path>
+        </g>
+      </svg>
+      <svg width="15" height="15" aria-label="Arrow up" role="img">
+        <g fill="none" stroke="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="1.2">
+          <path d="M7.5 11.5v-8M10.5 6.5l-3-3-3 3"></path>
+        </g>
+      </svg>
+      <span>{i18n.$it('search.switch').d('切换')}</span>
+      <svg width="15" height="15" aria-label="Escape key" role="img">
+        <g fill="none" stroke="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="1.2">
+          <path d="M13.6167 8.936c-.1065.3583-.6883.962-1.4875.962-.7993 0-1.653-.9165-1.653-2.1258v-.5678c0-1.2548.7896-2.1016 1.653-2.1016.8634 0 1.3601.4778 1.4875 1.0724M9 6c-.1352-.4735-.7506-.9219-1.46-.8972-.7092.0246-1.344.57-1.344 1.2166s.4198.8812 1.3445.9805C8.465 7.3992 8.968 7.9337 9 8.5c.032.5663-.454 1.398-1.4595 1.398C6.6593 9.898 6 9 5.963 8.4851m-1.4748.5368c-.2635.5941-.8099.876-1.5443.876s-1.7073-.6248-1.7073-2.204v-.4603c0-1.0416.721-2.131 1.7073-2.131.9864 0 1.6425 1.031 1.5443 2.2492h-2.956"></path>
+        </g>
+      </svg>
+      <span>{i18n.$it('base.close').d('关闭')}</span>
+    </>
+  );
+});