centaline-data-driven-v3 0.0.79 → 0.0.80

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven-v3",
-  "version": "0.0.79",
+  "version": "0.0.80",
   "private": false,
   "description": "centaline-data-driven-v3",
   "main": "dist/centaline-data-driven-v3.umd.js",

package/src/components/web/AIChat.vue

@@ -9,15 +9,15 @@
             </div>
             <div class="header-item" v-if="model.controlLabel">
                 <h3 style="line-height: 25px;">
-                 {{ model.controlLabel }}</h3>
-                </div>
+                    {{ model.controlLabel }}</h3>
+            </div>
         </div>
         <!-- 消息列表 -->
         <div class="messages" ref="messagesContainer">
             <template v-for="message in model.messages">
                 <div :key="message.id" class="message" v-if="message.content"
                     :class="{ 'user-message': message.sender === 'user', 'ai-message': message.sender === 'ai' }">
-                    <div class="chat-message" v-html="htmlContent(message)">
+                    <div class="chat-message" :style="{color:message.type=='error'?'red':''}" v-html="htmlContent(message)">
                     </div>
                 </div>
                 <div v-else class="loading-container">
@@ -56,16 +56,17 @@
 
 <script setup lang="ts">
 import { ref, reactive, nextTick, watch, computed } from 'vue'
+import AIChat from '../../loader/src/AIChat'
 import common from '../../utils/common'
 import { marked } from 'marked';
 import DOMPurify from 'dompurify'
 
 
-const emit = defineEmits(['loaded', "change", "click", "hideAI"])
+const emit = defineEmits(['loaded', "getRefFieldPara", "hideAI"])
 const props = defineProps({
-    api: String,
-    vmodel: Object,
-    actionRouter: Array,
+    field: Object,
+    router: Object,
+    actionRouters: Array,
     form: Object,
 })
 interface StreamEventData {
@@ -73,6 +74,7 @@ interface StreamEventData {
     conversation_id?: string
     answer?: string
     task_id?: string
+    message?: string
 }
 
 const model = ref({});
@@ -89,7 +91,7 @@ let scrollPending = false;//滚动输入
 const headers = computed(() => {
     return {
         'Content-Type': 'application/json',
-        Authorization: "Bearer " + props.vmodel?.code2,
+        Authorization: "Bearer " + props.field?.code2,
     };
 })
 
@@ -97,8 +99,8 @@ init()
 //初始化数据
 function init() {
     nextTick(function () {
-        if (props.vmodel) {
-            load(props.vmodel);
+        if (props.field) {
+            load(AIChat.AIModel(props));
             emit("loaded");
         }
     });
@@ -111,8 +113,8 @@ function action() {
         showAI.value = true;
         rtn = model.value.action;
     }
-    else if (props.actionRouter) {
-        var router = props.actionRouter.find((v1) => {
+    else if (props.actionRouters) {
+        var router = props.actionRouters.find((v1) => {
             return v1.key === model.value.fieldName1;
         });
         rtn = router.action;
@@ -189,7 +191,8 @@ const sendMessage = async () => {
     // 添加AI消息
     addMessage({
         content: "",
-        sender: 'ai'
+        sender: 'ai',
+        type: ''
     })
 
     // AI回复
@@ -212,6 +215,12 @@ const appendMessage = (message) => {
     scheduleScroll()
 }
 
+const UpdateMessageType = (type) => {
+    if (model.value.messages[model.value.messages.length - 1].type != 'error') {
+        model.value.messages[model.value.messages.length - 1].type = type;
+    }
+}
+
 // 防抖滚动
 const scheduleScroll = () => {
     if (!scrollPending) {
@@ -235,14 +244,27 @@ const scheduleScroll = () => {
 //获取关联列返回对象
 function getRefFieldJson() {
     let rtn = {};
-    if (props.form?.AIRouter.refFieldName) {
-        let refFieldName = props.form.AIRouter.refFieldName.split(',');
-        if (refFieldName.length > 0) {
-            rtn = props.form.getRefFieldPara(refFieldName);
+    let router = props.router;
+    if (router.refFieldName) {
+        let refFieldName = router.refFieldName.split(',');
+        let submitData = props.form.getFormObj();
+        if (refFieldName.length > 0 && submitData) {
+            rtn = getRefFieldPara(submitData, refFieldName);
         }
     }
     return JSON.stringify(rtn);
 }
+//绑定联动参数组件
+function getRefFieldPara(tempFormData, refFieldNameArr) {
+    let submitData = {};
+    if (tempFormData) {
+        refFieldNameArr.forEach((v) => {
+            submitData[v] = common.getDataOfUpperLower(tempFormData, v);
+        });
+    }
+    return submitData;
+}
+
 
 //获取Token
 function getToken() {
@@ -336,11 +358,14 @@ const fetchAIResponse = async (params) => {
         });
     }).then(() => {
         // 在所有行处理完毕后执行 startTypingEffect
-
-
+        if (outtext.value == '') {
+            outtext.value = '  ';
+        }
+        UpdateMessageType('message');
         startTypingEffect(outtext.value);
         outtext.value = '';
     }).catch(error => {
+        UpdateMessageType('error');
         if (error.name === 'AbortError') {
             console.log('Request aborted');
         } else {
@@ -407,6 +432,11 @@ const handleStreamEvent = (eventData: StreamEventData) => {
     if (eventData.conversation_id) {
         conversationId.value = eventData.conversation_id
     }
+    if (eventData.event == 'error') {
+        UpdateMessageType('error');
+        outtext.value += '\n\n' + eventData.message;
+        return;
+    }
 
     if (eventData.answer) {
         const lastMessage = model.value.messages[model.value.messages.length - 1]
@@ -420,7 +450,7 @@ const handleStreamEvent = (eventData: StreamEventData) => {
     }
 }
 
-const getTemplateType= (fullText)=>{ 
+const getTemplateType = (fullText) => {
 
 
 
@@ -436,8 +466,8 @@ function startTypingEffect(fullText) {
             return;
         }
 
-       // 随机生成3到10之间的字符数
-       const randomChars = Math.floor(Math.random() * 8) + 3; // 3到10（包括3和10）
+        // 随机生成3到10之间的字符数
+        const randomChars = Math.floor(Math.random() * 8) + 3; // 3到10（包括3和10）
         const charsToLoad = Math.min(randomChars, fullText.length - index);
 
         // 获取当前要加载的字符
@@ -482,7 +512,7 @@ function hideAI() {
 
     /* 子元素之间的间距为5像素 */
     .header-item {
-        padding: 10px; 
+        padding: 10px;
     }
 }
 

package/src/components/web/Form.vue

@@ -156,14 +156,14 @@
 
 
             </div>
-            <template v-if="model?.AIattr?.showAI">
-                <div :style="{ flex: ' 0 0 ' + model.AIattr.width + 'px', 'box-shadow': '-10px 0 5px -9px rgba(0, 0, 0, 0.3)' }"
+            <template v-if="model?.aiAttr?.showAI">
+                <div :style="{ flex: ' 0 0 ' + model.aiAttr.width + 'px',  position: 'sticky', top: '0' ,'margin-left': '10px'}"
                     v-show="showAI">
                     <div
                         :style="{ position: 'sticky', top: '0', height: dialogHeight + 'px', overflow: 'hidden', 'border-bottom-right-radius': '4px' }">
                         <AIChat :height="dialogHeight"
                             :style="{ position: 'sticky', top: '0', height: dialogHeight + 'px' }"
-                            :vmodel="model.AIModel" :actionRouter="model.actionRouters" :form="model"
+                            :field="model.aiChat" :router="model.aiRouter" :actionRouter="model.actionRouters" :form="model"
                             @hideAI="AIToggle">
 
                         </AIChat>
@@ -172,17 +172,11 @@
             </template>
 
         </div>
-        <template v-if="model?.AIattr?.showAI && !showAI">
-            <div class="btn-avatar" @click="AIToggle"
-                :style="{ 'float': model.AIRouter.isCheckbox ? model.AIRouter.alignCss : '' }">
-                <img class="avatar-img" :src="util.getAssetsImage('AIChat.png')" :alt="model?.AIRouter.controlLabel"
-                    :title="model?.AIRouter.controlLabel">
+        <template v-if="model?.aiAttr?.showAI && !showAI">
+            <div class="btn-avatar" @click="AIToggle">
+                <img class="avatar-img" :src="util.getAssetsImage('AIChat.png')" :alt="model?.aiRouter.controlLabel"
+                    :title="model?.aiRouter.controlLabel">
             </div>
-
-            <!-- <component :is="model.AIRouter.is" :vmodel="model.AIRouter"
-                                        v-if="model.AIRouter.show" @fieldClick="AIToggle"
-                                        :style="{ 'float': model.AIRouter.isCheckbox ? model.AIRouter.alignCss : '' }">
-                                    </component> -->
         </template>
         <div style="min-height:200px" v-if="loading"></div>
         <iframe :src="downloadUrl" style="height:0px;width:0px;border-width: 0px;display: none;"> </iframe>
@@ -262,6 +256,9 @@ const refForm = ref()
 const qrtimer = ref(null)
 const downloadUrl = ref('')
 const minHeight = ref('auto')
+const showAI = ref(false);
+const dialogHeight = ref(props.dialogHeight || (window.innerHeight - 60));
+
 onUpdated(() => {
     nextTick(() => {
         qrtimer.value = setTimeout(getisScroll, 100);
@@ -321,28 +318,7 @@ function load(data) {
 function failLoad() {
     emit('failLoad', model.value);
 }
-const showAI = ref(false);
-const dialogHeight = ref(props.dialogHeight || (window.innerHeight - 60));
 
-function AIToggle() {
-    showAI.value = !showAI.value;
-    let width = model.value.AIattr.width;
-    dialogHeight.value = (props.dialogHeight || (window.innerHeight - 60));
-    emit('AIToggle', (showAI.value ? width : -width));
-}
-
-
-function buttonsWidth() {
-    let rtn = '100%';
-    if (showAI.value) {
-        rtn = props.dialoWidth - model.value.AIattr.width - 4 + 'px';
-    }
-    else if (props.pageWidth) {
-        rtn = props.pageWidth - 20 + 'px';
-
-    }
-    return rtn;
-}
 
 //获取关联数据
 function getFileData(field) {
@@ -649,6 +625,28 @@ function setCss() {
         minHeight.value = (document.documentElement.clientHeight - props.topHeight - 20) + 'px';
     }
 }
+
+
+function AIToggle() {
+    showAI.value = !showAI.value;
+    let width = model.value.aiAttr.width;
+    dialogHeight.value = (props.dialogHeight || (window.innerHeight - 60));
+    emit('AIToggle', (showAI.value ? width : -width));
+}
+
+
+function buttonsWidth() {
+    let rtn = '100%';
+    if (showAI.value) {
+        rtn = props.dialoWidth - model.value.aiAttr.width - 4 + 'px';
+    }
+    else if (props.pageWidth) {
+        rtn = props.pageWidth - 20 + 'px';
+
+    }
+    return rtn;
+}
+ 
 </script>
 
 <style scoped>

package/src/loader/src/AIChat.js

@@ -1,6 +1,7 @@
 import base from '../index';
 import valid from '../../utils/validate';
 
+
 function loadFromModel(source, messages, router) {
 
     var init = function (data) {
@@ -42,9 +43,27 @@ function selfValidExcute(eventName, model) {
     model.valid = true;
     return model.valid;
 }
+  
+function AIModel(source) {
+    let airtn = null
+  if (source.field) {
+      
+      let field = source.field; 
+
+      var messages = [];
+      if (Array.isArray(field.code1)) {
+        messages = field.code1;
+      } else {
+        messages = field.code1 && field.code1 != "[]" ? JSON.parse(field.code1) : [];
+      }
+      airtn = loadFromModel(field, messages, source.router);
+    } 
+    return airtn; 
+}
 
 const AI = {
     loadFromModel,//获取有效文件数量
-    selfValidExcute
+    selfValidExcute,
+    AIModel
 };
 export default AI;

package/src/loader/src/Form.js

@@ -3,9 +3,7 @@ import LibFunction from './LibFunction';
 import Router from './Router';
 import Enum from '../../utils/Enum';
 import common from '../../utils/common';
-import request from '../../utils/request';
-import Field from './Field';
-import AIChat from './AIChat';
+import request from '../../utils/request'; 
 
 function loadFormApi(api, callBack, apiParam, failCallBack, isFormList) {
   if (api) {
@@ -722,10 +720,10 @@ function loadFromModel(source, isFormList) {
       return source.flagAlertCloseWindowAfterSave === true;
     },
 
-    _AIattr: null,
-    get AIattr() {
-      if (rtn._AIattr !== null) {
-        return rtn._AIattr;
+    _aiAttr: null,
+    get aiAttr() {
+      if (rtn._aiAttr !== null) {
+        return rtn._aiAttr;
       }
       else {
         let aiattr = { showAI: false, width: 0 };
@@ -733,14 +731,14 @@ function loadFromModel(source, isFormList) {
           aiattr.showAI = true;
           aiattr.width = parseFloat(source.aiChat.width || 300);
         }
-        rtn._AIattr = aiattr;
-        return rtn._AIattr;
+        rtn._aiAttr = aiattr;
+        return rtn._aiAttr;
       }
     },
-    _AIRouter: null,
-    get AIRouter() {
-      if (rtn._AIRouter !== null) {
-        return rtn._AIRouter;
+    _aiRouter: null,
+    get aiRouter() {
+      if (rtn._aiRouter !== null) {
+        return rtn._aiRouter;
       }
       else {
         var router = {};
@@ -750,28 +748,13 @@ function loadFromModel(source, isFormList) {
             return v1.key === field.fieldName1;
           });
         }
-        rtn._AIRouter = router;
-        return rtn._AIRouter;
+        rtn._aiRouter= router;
+        return rtn._aiRouter;
       }
+    },  
+    get aiChat() {
+      return source.aiChat;
     }, 
-    get AIModel() {
-        let airtn = null
-      if (source.aiChat) {
-          
-          let field = source.aiChat;
-          let item = Field(field, []);
-
-          var messages = [];
-          if (Array.isArray(field.code1)) {
-            messages = field.code1;
-          } else {
-            messages = field.code1 && field.code1 != "[]" ? JSON.parse(field.code1) : [];
-          }
-          airtn = AIChat.loadFromModel(item, messages, rtn.AIRouter);
-        } 
-        return airtn; 
-     
-    },
     //获取表单数据
     getFormObj() {
       var rtnFormObj = {};