plain-design 1.0.0-beta.136 → 1.0.0-beta.138

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "plain-design",
-  "version": "1.0.0-beta.136",
+  "version": "1.0.0-beta.138",
   "description": "",
   "main": "dist/plain-design.min.js",
   "module": "dist/plain-design.commonjs.min.js",

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

@@ -12,30 +12,30 @@ import {defer} from "@peryl/utils/defer";
 import {toArray} from "@peryl/utils/toArray";
 
 export const $ai = (() => {
+
   const getConfig = (): iAiConfiguration => {
     const aiConfig = $configuration.get('aiConfig');
     if (!aiConfig) {
       throw new Error('There is a lack of aiConfig when initializing the $configuration.');
     }
     return aiConfig;
+
   };
-  const chat = async (userContent: string, systemContent?: string, _aiConfig?: iAiConfiguration): Promise<{ message: string, chatData: iAiChatResponse }> => {
+
+  const chatHistories = async (histories: iAiHistory[], _aiConfig?: iAiConfiguration): Promise<{ message: string, chatData: iAiChatResponse }> => {
     const axios = Axios.create();
     const aiConfig = _aiConfig || getConfig();
-    const messages: { role: 'system' | 'user', content: string }[] = [];
-    !!systemContent && messages.push({ role: 'system', content: systemContent });
-    messages.push({ role: 'user', content: userContent });
     try {
       const resp = await axios.request({
         method: 'post',
-        url: aiConfig.api_url,
+        url: aiConfig.url,
         headers: {
-          'Authorization': `Bearer ${aiConfig.api_key}`,
+          'Authorization': `Bearer ${aiConfig.key}`,
           "Content-Type": 'application/json'
         },
         data: {
           "model": aiConfig.model,
-          "messages": messages
+          "messages": histories
         }
       });
 
@@ -43,14 +43,9 @@ export const $ai = (() => {
 
       let message = result.choices[0].message.content;
 
-      /*todo 先在这里处理一下json的返回结果吧*/
-      /*const pattern = /^```json([\s\S]*?)```/;
-      if (pattern.test(message)) {
-        const match = message.match(pattern);
-        if (match && match[1]) {
-          message = match[1].trim();
-        }
-      }*/
+      if (message.slice(0, 7) === '```json' && message.slice(-3) === '```') {
+        message = message.slice(7, -3).trim();
+      }
 
       return { message, chatData: result };
     } catch (e: any) {
@@ -58,6 +53,20 @@ export const $ai = (() => {
       throw e;
     }
   };
+
+  const chatSystem = async (userContent: string, systemContent?: string, _aiConfig?: iAiConfiguration) => {
+    const messages = [{ "role": "user", "content": userContent }];
+    if (!!systemContent) {
+      messages.unshift({ "role": "system", "content": systemContent });
+    }
+    return chatHistories(messages, _aiConfig);
+  };
+
+  const chat = async (userContent: string, _aiConfig?: iAiConfiguration): Promise<{ message: string, chatData: iAiChatResponse }> => {
+    return chatSystem(userContent, '', _aiConfig);
+  };
+
+
   /**
    * 根据ai对话，将用户描述转化为表单数据对象，
    * @author  韦胜健
@@ -77,7 +86,7 @@ export const $ai = (() => {
 
     const systemContent = `
         当前时间是：${createSimpleDate()["YYYY-MM-DD HH:mm:ss"]}
-        你是一名专业的自然一样分析师，你需要将用户描述转化为一个json对象数据；这个json对象的属性是确定的，json对象的属性名来源于以下的字段的field，这个属性对应的值需要你从用户描述中获取，没有的话就给默认值null；
+        你是一名专业的自然语言分析师，你需要将用户描述转化为一个json对象数据；这个json对象的属性是确定的，json对象的属性名来源于以下的字段的field，这个属性对应的值需要你从用户描述中获取，没有的话就给默认值null；
         目前支持的字段：
         ${JSON.stringify(fields)}
 
@@ -126,6 +135,8 @@ export const $ai = (() => {
 
   return {
     chat,
+    chatSystem,
+    chatHistories,
     getConfig,
     getFormDataByChat,
   };
@@ -133,13 +144,18 @@ export const $ai = (() => {
 
 export interface iAiConfiguration {
   /*大模型的调用地址*/
-  api_url: string,
+  url: string,
   /*大模型的调用key*/
-  api_key: string,
+  key: string,
   /*调用的大模型名称*/
   model: string,
 }
 
+export interface iAiHistory {
+  content: string,
+  role: string,
+}
+
 export interface iAiChoice {
   /**
    * 模型停止生成 token 的原因。取值范围：
@@ -167,10 +183,7 @@ export interface iAiChoice {
    */
   logprobs: any,
   /*模型输出内容*/
-  message: {
-    content: string,
-    role: string,
-  }
+  message: iAiHistory
 }
 
 export interface iAiChatResponse {

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

@@ -71,7 +71,7 @@ export const AiChatBox = designComponent({
         state.histories.push({ role: 'user', content: userContent, id: uuid() });
         await methods.scrollEnd();
 
-        const { message, chatData } = await $ai.chat(userContent, props.systemContent, aiConfig);
+        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() });

package/src/packages/components/AutoTable/use/useTableOption.ai.tsx

@@ -207,7 +207,7 @@ export const useTableOptionAi = AutoModule.createRegistration((option) => {
       /*---------------------------------------处理搜索-------------------------------------------*/
 
       let hasSearch = false;
-      const searchData: iTableAiOperateSearch['data'] | undefined = operateItems.find(i => i.type === "search")?.data;
+      const searchData: iTableAiOperateSearch['data'] | undefined = (operateItems as any).find((i: iTableAiOperate) => i.type === "search")?.data;
       if (!!searchData) {
 
         hasSearch = true;
@@ -320,7 +320,7 @@ export const useTableOptionAi = AutoModule.createRegistration((option) => {
 
       /*---------------------------------------处理排序-------------------------------------------*/
       let hasSort = false;
-      const sortData: iTableAiOperateSort['data'] | undefined = operateItems.find(i => i.type === "sort")?.data;
+      const sortData: iTableAiOperateSort['data'] | undefined = (operateItems as any).find((i: iTableAiOperate) => i.type === "sort")?.data;
       if (!!sortData) {
         hasSort = true;
         option.settingSeniorSort.methods.update(sortData, false);
@@ -328,7 +328,7 @@ export const useTableOptionAi = AutoModule.createRegistration((option) => {
 
       /*---------------------------------------处理配置-------------------------------------------*/
       let hasConfig = false;
-      const configData: iTableAiOperateConfig['data'] | undefined = operateItems.find(i => i.type === "config")?.data;
+      const configData: iTableAiOperateConfig['data'] | undefined = (operateItems as any).find((i: iTableAiOperate) => i.type === "config")?.data;
       if (!!configData) {
         hasConfig = true;
         await option.settingConfig.methods.updateItemPlc({

package/src/packages/components/FilterService/filter/filter.city.tsx

@@ -54,9 +54,10 @@ export function installFilterCity(
         );
       },
       getQueryParam: async ({ formData, option }) => {
-        const { isEmpty, value, field } = checkEmpty(formData, option);
+        const { isEmpty, value: _value, field } = checkEmpty(formData, option);
         if (isEmpty) {return;}
-        return { queries: [{ field, value: value.city, operator: eFilterOperator.eq }] };
+        const value = typeof _value === "string" ? _value : _value.city;
+        return { queries: [{ field, value: value, operator: eFilterOperator.eq }] };
       },
     })
     .setHandler('in', {

package/src/packages/components/FilterService/filter/filter.district.tsx

@@ -55,9 +55,10 @@ export function installFilterDistrict(
         );
       },
       getQueryParam: async ({ formData, option }) => {
-        const { isEmpty, value, field } = checkEmpty(formData, option);
+        const { isEmpty, value: _value, field } = checkEmpty(formData, option);
         if (isEmpty) {return;}
-        return { queries: [{ field, value: value.district, operator: eFilterOperator.eq }] };
+        const value = typeof _value === "string" ? _value : _value.city;
+        return { queries: [{ field, value: value, operator: eFilterOperator.eq }] };
       },
     })
     .setHandler('in', {

package/src/packages/components/Form/validate/useFormItemValidation.tsx

@@ -55,14 +55,17 @@ export function useFormItemValidation({ props }: { props: iFormItemValidateProps
    * @author  韦胜健
    * @date    2022.11.6 0:00
    */
-  const getValueByRule = (rule: iValidateRule): { label?: string | null, field?: string, value?: string } | null => {
+  const getValueByRule = (rule: iValidateRule): { label?: string | null, field?: string } | null => {
     if (formValidation.props.validateMode === eFormValidateMode.table) {return null;}
-    const { field, label, valueGetter } = rule;
+    // const { field, label, valueGetter } = rule;
+    const { field, label } = rule;
     if (!rule.field && !rule.valueGetter) {return null;}
     return {
       label,
       field,
-      value: getRuleValue({ formData: formValidation.props.modelValue, field, validateValueGetter: valueGetter, formItemProps: props }),
+      /*这里不能调用valueGetter，这样会导致值变化也会触发教研，设计是触发onChange才触发校验而不是值变化就触发*/
+      /*这里调用valueGetter的话，会导致触发watch，进而触发onFieldChange*/
+      // value: getRuleValue({ formData: formValidation.props.modelValue, field, validateValueGetter: valueGetter, formItemProps: props }),
     };
   };
 
@@ -88,9 +91,9 @@ export function useFormItemValidation({ props }: { props: iFormItemValidateProps
           return;
         }
         /*值没有变化*/
-        if (newValue.value == oldValue.value) {
+        /*if (newValue.value == oldValue.value) {
           return;
-        }
+        }*/
         formValidation.handler.onFieldChange({ label: newValue.label, field: newValue.field });
       }
     ));

package/src/packages/components/Form/validate/useFormValidation.tsx

@@ -70,7 +70,7 @@ export function useFormValidation({ props }: { props: iFormValidatePropsType })
       return parentValidation.methods.validateItem({ label, field, trigger: eFormValidateTrigger.change, state, formData: props.modelValue });
     },
     onEditChange: ({ label, field }: { label: string | null | undefined, field: string | undefined }) => {
-      if (props.validateMode !== eFormValidateMode.table) {return; }
+      // if (props.validateMode !== eFormValidateMode.table) {return; }
       return handler.onFieldChange({ label, field });
     },
     onBlurChange: ({ label, field }: { label: string | null | undefined, field: string | undefined }) => {

package/src/packages/entry.tsx

@@ -138,7 +138,7 @@ export type {iContextmenuOption} from './components/useContextmenuOptions';
 export {AiChatBox} from './components/AiChatBox';
 export type {iChatBoxHistory} from './components/AiChatBox';
 export {$ai} from './components/$ai';
-export type {iAiChoice, iAiChatResponse, iAiConfiguration} from './components/$ai';
+export type {iAiChoice, iAiChatResponse, iAiConfiguration, iAiHistory} from './components/$ai';
 
 export {VirtualTable} from './components/VirtualTable';
 export {Table} from './components/Table';
@@ -198,6 +198,7 @@ export type {
   iTableOperationPermitConfig
 } from './components/Table/standard/PlcOperation/PlcOperation.utils';
 export type {iTreeProps, iTreeState, iTreeKey2CheckStatus, iTreeKeyOrNode, iTreeNodeComputedData} from './components/TreeCore/TreeCore.type';
+export type {iTreeNodeWithMenuOption} from './components/TreeNodeWithMenu/treeNodeWithMenu.utils';
 
 export {$configuration} from './components/$configuration';
 export {createAddressService} from './components/createAddressService';

package/src/packages/uses/useEdit.ts

@@ -1,6 +1,8 @@
 import {useFunctionWrapper} from "./useFunctionWrapper";
 import {computed, inject, onBeforeUnmount, PropType, provide, reactive} from '@peryl/react-compose';
 import {eMultipleValueType} from "./useMultipleModel";
+import {PlainObject} from "@peryl/utils/event";
+import {createEffects} from "@peryl/utils/createEffects";
 
 export const EDIT_PROVIDER = '@@EDIT_PROVIDER';
 
@@ -29,6 +31,9 @@ export const useEdit = useFunctionWrapper(
   'edit',
   (ctx, option: { adjust?: (data: EditProvideData) => void | EditProvideData } = {}) => {
 
+    /*销毁时处理掉useEdit产生的副作用*/
+    const { effects } = createEffects();
+
     const parentEditComputed = inject(EDIT_PROVIDER, null) as null | { value: EditProvideData };
 
     const editState = reactive({ loading: null as null | boolean });
@@ -55,6 +60,11 @@ export const useEdit = useFunctionWrapper(
         data.loading = editState.loading;
       }
 
+      /*合并自身的onChange以及父edit的onChange*/
+      data.onChange = mergeHandlers({ methodName: 'onChange', parent: parentEditComputed?.value, self: data, });
+      /*合并自身的onBlur以及父edit的onBlur*/
+      data.onBlur = mergeHandlers({ methodName: 'onBlur', parent: parentEditComputed?.value, self: data, });
+
       if (!!option.adjust) data = option.adjust(data) || data;
 
       return {
@@ -62,25 +72,25 @@ export const useEdit = useFunctionWrapper(
         editable: !data.disabled && !data.readonly && !data.loading
       };
     });
+    effects.push(() => {editComputed.effect.stop();});
 
     provide(EDIT_PROVIDER, editComputed);
 
     const event = (ctx as any).event;
 
-    if (!!parentEditComputed) {
-      if (!!parentEditComputed.value.onBlur && !!event && !!event.on.onBlur) {
-        event.on.onBlur(parentEditComputed.value.onBlur);
-        onBeforeUnmount(() => event.off.onBlur(parentEditComputed.value.onBlur!));
-      }
-      if (!!parentEditComputed.value.onChange && !!event && !!event.on.onChange) {
-        event.on.onChange(parentEditComputed.value.onChange);
-        onBeforeUnmount(() => event.off.onChange(parentEditComputed.value.onChange!));
-      }
+    /*处理onBlur事件传递*/
+    if (event.on.onBlur && !!editComputed.value.onBlur) {
+      event.on.onBlur(editComputed.value.onBlur);
+      effects.push(() => event.off.onBlur(editComputed.value.onBlur));
     }
 
-    onBeforeUnmount(() => {
-      editComputed.effect.stop();
-    });
+    /*处理onChange传递*/
+    if (event.on.onChange && !!editComputed.value.onChange) {
+      event.on.onChange(editComputed.value.onChange);
+      effects.push(() => event.off.onChange(editComputed.value.onChange));
+    }
+
+    onBeforeUnmount(effects.clear);
 
     return {
       editState,
@@ -91,3 +101,16 @@ export const useEdit = useFunctionWrapper(
 export type tEditControl = ReturnType<typeof useEdit>
 
 export type tEditComputed = tEditControl["editComputed"]
+
+const mergeHandlers = ({ methodName, parent, self }: { methodName: string, parent: PlainObject | undefined, self: PlainObject }) => {
+  if (parent?.[methodName] || self[methodName]) {
+    const selfOnChange = self[methodName];
+    const parentOnChange = parent?.[methodName];
+    return (...args: any[]) => {
+      // console.log({ args, methodName, parentOnChange, selfOnChange });
+      selfOnChange?.(...args);
+      parentOnChange?.(...args);
+    };
+  }
+  return undefined;
+};