plain-design 1.0.0-beta.14 → 1.0.0-beta.141

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,10 +30,11 @@ 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 });},
+    separate: false,
     render: () => (
       <Cascade
         modelValue={state.modelMetas}

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;
     }
@@ -58,6 +57,7 @@ export function createAddressCascadeSingle(
 
   effects.push(hooks.onRender.use({
     processor: ({ list, render }) => {list.push({ render, key: '1', seq: 1 });},
+    separate: false,
     render: () => (
       <Cascade
         modelValue={metaArray.value}

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";
@@ -8,6 +8,7 @@ import {createAddressCascadeHooks} from "./createAddressCascade.hooks";
 import {useWatchAutoClear} from "../../utils/watchEffectAutoClear";
 import {createAddressCascadeMultiple} from "./createAddressCascade.multiple";
 import {createAddressCascadeSingle} from "./createAddressCascade.single";
+import {useEdit} from "../../uses/useEdit";
 
 export const AddressCascade = designComponent({
   name: 'address-cascade',
@@ -17,6 +18,7 @@ export const AddressCascade = designComponent({
   setup({ props, event }) {
 
     useStyle();
+    useEdit();
 
     const hooks = createAddressCascadeHooks();
 

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;
+    }
+  }
+}

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

@@ -0,0 +1,154 @@
+import {designComponent, getComponentCls, PropType, reactive, useClasses, useRefs} from "@peryl/react-compose";
+import Input from "../Input";
+import {EditProps, useEdit} from "../../uses/useEdit";
+import {StyleProps, useStyle} from "../../uses/useStyle";
+import i18n from "../i18n";
+import Button from "../Button";
+import './ai-chat-box.scss';
+import $message from "../$message";
+import {uuid} from "@peryl/utils/uuid";
+import {$ai, iAiChatResponse, iAiConfiguration} from "../$ai";
+import $configuration from "../$configuration";
+import Scroll from "../Scroll";
+import {delay} from "@peryl/utils/delay";
+import {toArray} from "@peryl/utils/toArray";
+
+export const AiChatBox = designComponent({
+  props: {
+    ...EditProps,
+    ...StyleProps,
+    /*ai配置信息*/
+    aiConfig: { type: Object as PropType<iAiConfiguration> },
+    /*填充高度*/
+    fitHeight: { type: Boolean },
+    /*已有的对话历史信息*/
+    histories: { type: Array as PropType<iChatBoxHistory[]> },
+    /*系统提示词*/
+    systemContent: { type: String },
+    /*手动处理大模型返回的message*/
+    handleMessage: { type: Function as PropType<(param: { message: string, userContent: string, chatData: iAiChatResponse, addHistory: (history: iChatBoxHistory) => void }) => void | iChatBoxHistory | iChatBoxHistory[] | Promise<void | iChatBoxHistory | iChatBoxHistory[]>> },
+    inputMinHeight: { type: String, default: '80px' },
+    inputMaxHeight: { type: String, default: '225px' },
+  },
+  slots: ['prepend'],
+  setup({ props, slots }) {
+
+    const { refs, onRef } = useRefs({ scroll: Scroll });
+
+    useEdit();
+    const { styleComputed } = useStyle();
+
+    const aiConfig = props.aiConfig || $configuration.use('aiConfig');
+
+    const classes = useClasses(() => [
+      getComponentCls('ai-chat-box'),
+      `ai-chat-box-size-${styleComputed.value.size}`,
+      {
+        'ai-chat-box-fit-height': props.fitHeight
+      }
+    ]);
+
+    const state = reactive({
+      userContent: '',
+      histories: props.histories || [] as iChatBoxHistory[],
+      loading: false
+    });
+
+    const methods = {
+      scrollEnd: async () => {
+        if (!!refs.scroll) {
+          await delay(78);
+          refs.scroll.methods.scrollEnd();
+        }
+      },
+      addHistory: async (history: iChatBoxHistory) => {
+        state.histories.push(history);
+        await methods.scrollEnd();
+      },
+      send: async (userContent: string) => {
+        await delay(23);
+        state.userContent = '';
+        state.histories.push({ role: 'user', content: userContent, id: uuid() });
+        await methods.scrollEnd();
+
+        const { message, chatData } = await $ai.chatSystem(userContent, props.systemContent, aiConfig);
+
+        /*可以手动处理返回的消息，自定义往对话框插入内容*/
+        const newHistory: iChatBoxHistory | iChatBoxHistory[] = await props.handleMessage?.({ message, userContent, chatData, addHistory: methods.addHistory }) || ({ role: 'assistant', content: message, id: uuid() });
+
+        state.histories.push(...toArray(newHistory));
+        await methods.scrollEnd();
+
+        return { message, chatData };
+      },
+    };
+
+    const handler = {
+      onClickSend: async () => {
+        state.loading = true;
+        try {
+          const userContent = state.userContent;
+          if (!userContent?.trim().length) {
+            $message.error(i18n.$it('ai.require').d('提问的内容不能为空'));
+            return;
+          }
+          await methods.send(userContent);
+        } finally {
+          state.loading = false;
+        }
+      },
+    };
+
+    return {
+      refer: {},
+      render: () => (
+        <div className={classes.value}>
+          {slots.prepend.isExist() && (
+            <div className="ai-chat-box-history-prepend">
+              {slots.prepend()}
+            </div>
+          )}
+          {(!!state.histories.length || props.fitHeight || slots.prepend.isExist()) && (
+            <div className="ai-chat-box-histories">
+              {(() => {
+                const content = state.histories.map((history) => (
+                  <div className="ai-chat-box-history-item" key={history.id} data-role={history.role}>
+                    <div className="ai-chat-box-history-item-inner">
+                      {!!history.render ? history.render() : history.content}
+                    </div>
+                  </div>
+                ));
+                if (props.fitHeight) {
+                  return <Scroll ref={onRef.scroll}>{content}</Scroll>;
+                } else {
+                  return content;
+                }
+              })()}
+            </div>
+          )}
+          <div className="ai-chat-box-input">
+            <Input
+              readonly={state.loading}
+              textarea
+              v-model={state.userContent}
+              placeholder={props.placeholder || i18n.$it('ai.placeholder').d('请输入要发送给ai的内容如：你是谁')}
+              minHeight={props.inputMinHeight}
+              maxHeight={props.inputMaxHeight}
+              onEnter={handler.onClickSend}
+            />
+            <Button shape="round" mode="fill" icon="pi-send" className="ai-chat-box-send-button" onClick={handler.onClickSend} loading={state.loading}/>
+          </div>
+        </div>
+      )
+    };
+  },
+});
+
+export interface iChatBoxHistory {
+  id: string,
+  role: 'user' | 'assistant';
+  content?: string,
+  render?: () => any,
+}
+
+export default AiChatBox;

package/src/packages/components/Alert/alert.scss

@@ -4,15 +4,16 @@
   border-radius: plv(box-size-normal-border-radius);
   position: relative;
   padding: 8px 16px;
+  line-height: initial;
 
   .alert-label {
     font-size: plv(font-size-small);
-    line-height: 1.5715;
+    line-height: plv(line-height);
   }
 
   .alert-desc {
     font-size: plv(font-size-small);
-    line-height: 1.5715;
+    line-height: plv(line-height);
   }
 
   &.alert-has-icon {
@@ -23,7 +24,7 @@
       position: absolute;
       width: $icon-width-normal;
       left: 0;
-      top: 0.15em;
+      top: 0.075em;
       padding-top: inherit;
       display: inline-flex;
       align-items: center;
@@ -37,6 +38,7 @@
     padding-right: $close-width;
 
     .alert-close {
+      border-radius: inherit;
       position: absolute;
       top: 0;
       right: 0;
@@ -112,6 +114,7 @@
 
   &.alert-theme-lite {
     @include statusMixin(alert) {
+      border:solid 1px $color-3;
       background-color: $color-light-2;
       color: $color-6;
       .alert-close {
@@ -125,7 +128,7 @@
   &.alert-theme-deep {
     @include statusMixin(alert) {
       background-color: $color-6;
-      color: white;
+      color: plv(pbfc);
       .alert-close {
         &:hover {
           background-color: $color-8;

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

@@ -1,5 +1,5 @@
 import './alert.scss';
-import {computed, designComponent, getComponentCls, mergeAttrs, PropType, reactive, useClasses, useRefs} from "plain-design-composition";
+import {computed, designComponent, getComponentCls, mergeAttrs, PropType, reactive, useClasses, useRefs} from "@peryl/react-compose";
 import {StyleProps, ThemeStatus, useStyle} from "../../uses/useStyle";
 import CollapseTransition from "../CollapseTransition";
 import Icon from "../Icon";
@@ -17,7 +17,7 @@ export const Alert = designComponent({
     theme: { type: String, default: 'lite' },                     // 主题，lite轻色，deep深色
     noClose: { type: Boolean },                                   // 禁用关闭
     icon: { type: String as PropType<string | null | undefined>, default: undefined },     // 显示的图标
-    message: { type: String },                                    // desc内容消息
+    description: { type: String },                                    // desc内容消息
   },
   slots: ['desc', 'close', 'default'],
   setup({ props, slots, attrs }) {
@@ -46,7 +46,7 @@ export const Alert = designComponent({
       `alert-align-${props.align}`,
       {
         'alert-has-icon': !!icon.value,
-        'alert-has-desc': !!props.message || slots.desc.isExist(),
+        'alert-has-desc': !!props.description || slots.desc.isExist(),
         'alert-has-close': !props.noClose,
       }
     ]);
@@ -76,9 +76,9 @@ export const Alert = designComponent({
                   {slots.default(props.label)}
                 </div>
               )}
-              {(props.message || slots.desc.isExist()) && (
+              {(props.description || slots.desc.isExist()) && (
                 <div className="alert-desc">
-                  {slots.desc(props.message)}
+                  {slots.desc(props.description)}
                 </div>
               )}
             </div>

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

@@ -1,16 +1,18 @@
-import {computed, designComponent, getComponentPrefix, PropType} from "plain-design-composition";
+import {computed, designComponent, getComponentPrefix, PropType} from "@peryl/react-compose";
 import {ApplicationConfigurationProvider, ApplicationHooks, iApplicationConfiguration} from "./utils/application.utils";
 import {DeepPartial} from "../../utils/type";
 import './application.scss';
 import {useApplicationService} from "./service/useApplicationService";
 import {createThemeConfigurationData} from "./theme/theme";
-import {ThemeShape, ThemeSize} from "../../uses/useStyle";
+import {InputMode, ThemeMode, ThemeShape, ThemeSize} from "../../uses/useStyle";
 import {useApplicationPopup} from "../usePopup/usePopupManager";
 
 export const Application = designComponent({
   name: 'application',
   props: {
-    configuration: { type: Object as PropType<DeepPartial<iApplicationConfiguration>>, }
+    configuration: { type: Object as PropType<DeepPartial<iApplicationConfiguration>>, },
+    defaultInputMode: { type: String as PropType<typeof InputMode.TYPE>, default: InputMode.flat },
+    defaultButtonMode: { type: String as PropType<typeof ThemeMode.TYPE>, default: ThemeMode.stroke },
   },
   slots: ['default'],
   setup({ props, slots }) {
@@ -21,7 +23,8 @@ export const Application = designComponent({
       default: {
         size: ThemeSize.normal,
         shape: ThemeShape.square,
-        inputMode: 'flat',
+        inputMode: props.defaultInputMode,
+        buttonMode: props.defaultButtonMode,
         ...props.configuration?.default,
       },
     }));

package/src/packages/components/Application/service/createApplicationService.tsx

@@ -1,6 +1,6 @@
 import {ApplicationHolder, iApplicationHolderData, iApplicationManagerData} from "./useApplicationService";
-import {defer} from "plain-utils/utils/defer";
-import {App} from "plain-design-composition";
+import {defer} from "@peryl/utils/defer";
+import {App} from "@peryl/react-compose";
 import {createError} from "../../../utils/createError";
 
 export function createApplicationService<ManagerComponent extends { use: { class: { props: { getManagerData: () => iApplicationManagerData }, event: { emit: { onReady: () => void } } } } },

package/src/packages/components/Application/service/createApplicationServiceComponent.tsx

@@ -1,4 +1,4 @@
-import {designComponent, onMounted, RenderNode} from "plain-design-composition";
+import {designComponent, onMounted, RenderNode} from "@peryl/react-compose";
 
 /**
  * 创建应用服务组件

package/src/packages/components/Application/service/createApplicationServiceManager.tsx

@@ -1,6 +1,6 @@
-import {designComponent, onMounted, PropType, ref, toRaw, useRefList} from "plain-design-composition";
+import {designComponent, onMounted, PropType, ref, toRaw, useRefList} from "@peryl/react-compose";
 import {iApplicationManagerData} from "./useApplicationService";
-import {createCounter} from "plain-utils/utils/createCounter";
+import {createCounter} from "@peryl/utils/createCounter";
 import {createServiceReadyObserver} from "../utils/createServiceReadyObserver";
 
 const nextCount = createCounter('manager-service');
@@ -84,8 +84,11 @@ export function createApplicationServiceManager<Option extends { hold?: boolean
                 option={item}
                 ref={onRefList(i)}
                 onDestroy={() => {
-                  options.value.splice(i, 1);
-                  optionIds.splice(i, 1);
+                  const index = options.value.indexOf(item);
+                  if (index > -1) {
+                    options.value.splice(index, 1);
+                    optionIds.splice(index, 1);
+                  }
                 }}
                 onReady={() => serviceReadyObserver.onReady({ option: item, ins: refList[i] })}
               />

package/src/packages/components/Application/service/useApplicationService.tsx

@@ -1,7 +1,8 @@
-import {getComponentCls, getCurrentDesignInstance, markRaw, onBeforeUnmount, Portal, reactive, useRefList} from "plain-design-composition";
-import {defer, DFD} from 'plain-utils/utils/defer';
-import {createCounter} from "plain-utils/utils/createCounter";
+import {getComponentCls, getCurrentDesignInstance, markRaw, onBeforeUnmount, Portal, reactive, useRefList} from "@peryl/react-compose";
+import {defer, DFD} from '@peryl/utils/defer';
+import {createCounter} from "@peryl/utils/createCounter";
 import {APPLICATION_SERVICE_CONTAINER_CLASS, ApplicationHooks} from "../utils/application.utils";
+import {$previewer} from "../../$previewer";
 
 /**
  * applications渲染manager数组的时候，给manager传递的 getManagerData函数的返回值类型
@@ -104,6 +105,7 @@ export function useApplicationService() {
       render: () => (
         <Portal to="body">
           <div className={getComponentCls(APPLICATION_SERVICE_CONTAINER_CLASS)}>
+            {$previewer.render()}
             {state.managers.map(({ getManagerData, RenderComponent, dfd, id }, index) => {
               return (
                 <RenderComponent