plain-design 1.0.0-beta.99 → 3.0.1

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";
 

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 {getComponentCls, 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";

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,7 +1,7 @@
-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 "plain-design-composition";
+import {ComponentPropsType} from "@peryl/react-compose";
 import {Dialog} from "../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

@@ -1,11 +1,11 @@
-import {designComponent, getComponentCls, iHTMLDivElement, nextIndex, onBeforeUnmount, onMounted, PropType, reactive, useClasses, useRefs, useStyles} from "plain-design-composition";
+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 "plain-utils/dom/getRectAutoFormat";
-import {unit} from "plain-utils/string/unit";
-import {createEffects} from "plain-utils/utils/createEffects";
-import {addElementListener} from "plain-utils/dom/addElementListener";
-import {delay} from "plain-utils/utils/delay";
+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({

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

@@ -1,4 +1,4 @@
-import {reactive} from "plain-design-composition";
+import {reactive} from "@peryl/react-compose";
 import {createImagePreviewerOption, iImagePreviewerOption, iImagePreviewerParamOption} from "../ImagePreviewer/image-previewer.utils";
 import {ImagePreviewerFixedContainer} from "./ImagePreviewerFixedContainer";
 import {getDeviceInfo} from "../../utils/getDeviceInfo";

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

@@ -1,4 +1,4 @@
-import {designPage} from "plain-design-composition";
+import {designPage} from "@peryl/react-compose";
 import {i18n} from "../i18n";
 
 export const SearchFooter = designPage(() => {

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

@@ -1,7 +1,7 @@
-import {computed, designComponent, iMouseEvent, PropType, reactive, useRefs} from "plain-design-composition";
+import {computed, designComponent, iMouseEvent, PropType, reactive, useRefs} from "@peryl/react-compose";
 import {iSearchDataMeta, iSearchServiceConfig, SearchOptionButton, SearchTreeIcon, SearchType2Icon} from "./search.utils";
 import {createListUtils} from "../../utils/createListUtils";
-import {delay} from "plain-utils/utils/delay";
+import {delay} from "@peryl/utils/delay";
 import {VirtualList} from "../VirtualList";
 import {i18n} from "../i18n";
 

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

@@ -1,7 +1,7 @@
-import {computed, createStore, designComponent, getComponentCls, onMounted, PropType, reactive, useClassCache, useRefs} from "plain-design-composition";
+import {computed, createStore, designComponent, getComponentCls, iKeyboardEvent, onMounted, PropType, reactive, useClassCache, useRefs} from "@peryl/react-compose";
 import {iSearchDataMeta, iSearchServiceConfig} from "./search.utils";
-import {debounce} from "plain-utils/utils/debounce";
-import {handleKeyboard} from "../KeyboardService";
+import {debounce} from "@peryl/utils/debounce";
+import {handleKeyboard} from "@peryl/utils/keyboard";
 import {Box} from "../Box";
 import Input from "../Input";
 import {SearchList} from "./SearchList";
@@ -105,7 +105,7 @@ export const SearchServicePanel = designComponent({
        * @author  韦胜健
        * @date    2024.6.23 21:24
        */
-      onKeydown: handleKeyboard({
+      onKeydown: handleKeyboard<iKeyboardEvent>({
         up: async (e) => {
           e.preventDefault();
           e.stopPropagation();

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

@@ -1,6 +1,6 @@
 import {iSearchServiceConfig, iSearchServiceCustomConfig, iSearchServiceDefaultConfig} from "./search.utils";
 import $dialog from "../$dialog";
-import {getComponentCls} from "plain-design-composition";
+import {getComponentCls} from "@peryl/react-compose";
 import './search-service.scss';
 import {i18n} from "../i18n";
 

package/src/packages/components/$search/search-service.scss

@@ -210,6 +210,7 @@
       .search-service-empty {
         padding-bottom: $margin;
         margin: $margin 0;
+        text-align: center;
 
         svg + div {
           margin-top: $margin;

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

@@ -1,4 +1,4 @@
-import {iMouseEvent} from "plain-design-composition";
+import {iMouseEvent} from "@peryl/react-compose";
 
 export interface iSearchDataRender {
   (dataMeta: iSearchDataMeta): any;

package/src/packages/components/$upload/upload.utils.ts

@@ -1,12 +1,13 @@
 import {iHttp} from "../createHttp";
-import {PlainObject} from "plain-utils/utils/event";
+import {PlainObject} from "@peryl/utils/event";
 
 export interface iUploadServiceConfig {
-  http: iHttp,
-  action: string,
-  filename: string,
-  prefix?: string,
-  process?: (uploadData: iUploadData) => void | iUploadData | Promise<iUploadData | void>
+  http: iHttp,                                      // 上传的http请求服务对象
+  action: string,                                   // 默认上传路径
+  filename: string,                                 // 上传文件名
+  getFilePathFromResponse: (resp: any) => string,   // 从返回值中获取上传返回的图片路径
+  prefix?: string,                                  // 默认图片路径前缀
+  process?: (uploadData: iUploadData) => void | iUploadData | Promise<iUploadData | void> // 处理请求参数uploadData拦截器
 }
 
 export interface iUploadData {

package/src/packages/components/Address/index.tsx

@@ -1,10 +1,10 @@
-import {computed, designComponent, PropType, reactive, useModel, watch} from "plain-design-composition";
+import {computed, designComponent, PropType, reactive, useModel, watch} from "@peryl/react-compose";
 import {EditProps, useEdit} from "../../uses/useEdit";
 import {StyleProps, useStyle} from "../../uses/useStyle";
 import {$configuration} from "../$configuration";
 import {iAddressService} from "../$address/createAddressService";
 import {iAddressLazyMeta} from "../$address/address.utils";
-import {defer, DFD} from "plain-utils/utils/defer";
+import {defer, DFD} from "@peryl/utils/defer";
 import {Select} from "../Select";
 import {SelectOption} from "../SelectOption";
 

package/src/packages/components/AddressCascade/address-cascade.utils.ts

@@ -1,6 +1,6 @@
 import {EditProps} from "../../uses/useEdit";
 import {StyleProps} from "../../uses/useStyle";
-import {ComponentEvent, ExtractPropTypes, PropType} from "plain-design-composition";
+import {ComponentEvent, ExtractPropTypes, PropType} from "@peryl/react-compose";
 import {iAddressService} from "../$address/createAddressService";
 import {iAddressSyncMeta} from "../$address/address.utils";
 import {iAddressCascadeHooks} from "./createAddressCascade.hooks";

package/src/packages/components/AddressCascade/createAddressCascade.hooks.ts

@@ -1,4 +1,4 @@
-import {createRenderHook} from "plain-design-composition";
+import {createRenderHook} from "@peryl/react-compose";
 
 export function createAddressCascadeHooks() {
   return {

package/src/packages/components/AddressCascade/createAddressCascade.multiple.tsx

@@ -1,16 +1,15 @@
 import {iAddressCascadeCompositionParam} from "./address-cascade.utils";
-import {createEffects} from "plain-utils/utils/createEffects";
 import Cascade from "../Cascade";
 import {useMultipleModel} from "../../uses/useMultipleModel";
-import {reactive, watch} from "plain-design-composition";
+import {createEffectsOfReaction, reactive} from "@peryl/react-compose";
 import {iAddressLazyMeta} from "../$address/address.utils";
 
 export function createAddressCascadeMultiple(
   { props, event: { emit }, service, hooks, filterData }: iAddressCascadeCompositionParam,
 ) {
-  const model = useMultipleModel(() => props.modelValue, emit.onUpdateModelValue, props);
+  const { effects, effectWatch } = createEffectsOfReaction();
 
-  const { effects } = createEffects();
+  const model = useMultipleModel(() => props.modelValue, emit.onUpdateModelValue, props, undefined, effects);
 
   const state = reactive({
     modelMetas: [] as iAddressLazyMeta[],
@@ -23,7 +22,7 @@ export function createAddressCascadeMultiple(
     },
   };
 
-  effects.push(watch(() => model.value as string[] | null | undefined, async (value, oldValue) => {
+  effectWatch(() => model.value as string[] | null | undefined, async (value, oldValue) => {
     if (!!value && !!oldValue && value.length == oldValue.length && value.every(i => oldValue.indexOf(i) > -1)) {
       return;
     }
@@ -31,7 +30,7 @@ export function createAddressCascadeMultiple(
     const newMetas = !value ? [] : await service.getAddressByCodes(value as string[]);
     if (newMetas.length === 0 && state.modelMetas.length === 0) {return;}
     state.modelMetas = newMetas;
-  }, { immediate: true }));
+  }, { immediate: true });
 
   effects.push(hooks.onRender.use({
     processor: ({ list, render }) => {list.push({ render, key: '1', seq: 1 });},

package/src/packages/components/AddressCascade/createAddressCascade.single.tsx

@@ -1,8 +1,7 @@
 import {AddressCascadeType2map, iAddressCascadeCompositionParam} from "./address-cascade.utils";
-import {computed, useModel} from "plain-design-composition";
+import {createEffectsOfReaction, useModel} from "@peryl/react-compose";
 import {iAddressSyncMeta} from "../$address/address.utils";
 import Cascade from "../Cascade";
-import {createEffects} from "plain-utils/utils/createEffects";
 
 export function createAddressCascadeSingle(
   {
@@ -10,15 +9,15 @@ export function createAddressCascadeSingle(
   }: iAddressCascadeCompositionParam
 ) {
 
-  const { effects } = createEffects();
+  const { effects, effectComputed } = createEffectsOfReaction();
 
   const model = {
-    province: useModel(() => props.province, emit.onUpdateProvince),
-    city: useModel(() => props.city, emit.onUpdateCity),
-    district: useModel(() => props.district, emit.onUpdateDistrict),
+    province: useModel(() => props.province, emit.onUpdateProvince, undefined, effects),
+    city: useModel(() => props.city, emit.onUpdateCity, undefined, effects),
+    district: useModel(() => props.district, emit.onUpdateDistrict, undefined, effects),
   };
 
-  const metaArray = computed((): iAddressSyncMeta[] | null => {
+  const metaArray = effectComputed((): iAddressSyncMeta[] | null => {
     if (!filterData.value) {
       return null;
     }

package/src/packages/components/AddressCascade/index.tsx

@@ -1,4 +1,4 @@
-import {computed, designComponent, reactive} from "plain-design-composition";
+import {computed, designComponent, reactive} from "@peryl/react-compose";
 import Cascade from "../Cascade";
 import {useStyle} from "../../uses/useStyle";
 import $configuration from "../$configuration";

package/src/packages/components/AiChatBox/ai-chat-box.scss

@@ -0,0 +1,74 @@
+@include comp(ai-chat-box) {
+  .ai-chat-box-input {
+    position: relative;
+
+    .ai-chat-box-send-button {
+      position: absolute;
+      bottom: 4px;
+      right: 4px;
+      z-index: 2;
+
+      &.button-loading {
+        @include comp(loading) {
+          top: 1px;
+          left: -0.5px;
+        }
+      }
+    }
+  }
+
+  .ai-chat-box-histories {
+    .ai-chat-box-history-item {
+
+      word-break: break-all;
+
+      &[data-role=user] {
+        text-align: right;
+
+        .ai-chat-box-history-item-inner {
+          display: inline-block;
+          background-color: plv(secondary-2);
+          color: plv(text-1);
+        }
+      }
+
+      &[data-role=assistant] {
+
+      }
+    }
+  }
+
+  &.ai-chat-box-fit-height {
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    align-items: stretch;
+
+    .ai-chat-box-histories {
+      flex: 1;
+      overflow: hidden;
+    }
+  }
+
+  @include sizeMixin(ai-chat-box, ()) {
+    .ai-chat-box-history-item {
+      &[data-role=user] {
+        .ai-chat-box-history-item-inner {
+          padding: calc(#{$margin} / 2) $margin;
+          border-radius: $border-radius;
+        }
+      }
+
+      & + * {
+        margin-top: $margin;
+      }
+    }
+
+    .ai-chat-box-histories {
+      margin-bottom: $margin;
+    }
+    .ai-chat-box-history-prepend {
+      margin-bottom: $margin;
+    }
+  }
+}