centaline-data-driven-v3 0.0.82 → 0.0.84

package/package.json

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

package/src/components/Layout/Layout.vue

@@ -301,11 +301,9 @@ function clickHandler(routerKey, rowindex, forname, forrowindex, flagHaveAlert)
     if (typeof rowindex !== "undefined") {
         if (props.flagFormList) {
             emit("rolRouterclick", routerKey, rowindex, props.vmodel.$sourceIndex);
-
         }
         else {
-            emit("rolRouterclick", routerKey, rowindex, forname, forrowindex, flagHaveAlert);
-
+            emit("rolRouterclick", routerKey, rowindex, forname, forrowindex, flagHaveAlert,props.vmodel,props.actionRouter);
         }
     }
 }

package/src/components/web/AIChat.vue

@@ -3,12 +3,10 @@
         <!-- 头部 -->
         <div class="header">
             <div class="header-item">
-                <el-icon class="ico-button" @click="hideAI()">
-                    <DArrowLeft />
-                </el-icon>
+                <img class="ico-button" :src="util.getAssetsImage('AIChat.png')" @click="hideAI()">
             </div>
             <div class="header-item" v-if="model.controlLabel">
-                <h3 style="line-height: 25px;">
+                <h3 style="line-height: 35px;">
                     {{ model.controlLabel }}</h3>
             </div>
         </div>
@@ -17,24 +15,36 @@
             <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" :style="{ color: message.type == 'error' ? 'red' : '' }"
-                        v-html="htmlContent(message)">
-                    </div>
-                </div>
-                <div v-else class="loading-container">
-                    <div class="loading-circle"></div>
+                    <template v-if="message.type == 'table'">
+                        <div :style="{ 'width': tablewidth - 70 + 'px' }">
+                            <div v-if="JSON.parse(message.content).title" style="margin-bottom: 10px;"
+                                v-html="JSON.parse(message.content).title"></div>
+                            <template v-for="(row, rowindex) in JSON.parse(message.content).rows" :key="rowindex">
+                                <ct-layout :vmodel="row" :cellLayout="JSON.parse(message.content).cellLayout"
+                                    :rowindex="rowindex" @rolRouterclick="rolRouterCellClickHandler"
+                                    :actionRouter="JSON.parse(message.content).actionRouters">
+                                </ct-layout>
+                            </template>
+                        </div>
+                    </template>
+                    <template v-else>
+                        <div class="chat-message" :style="{ color: message.type == 'error' ? 'red' : '' }"
+                            v-html="htmlContent(message)">
+                        </div>
+                    </template>
                 </div>
             </template>
+            <div v-if="afoot" class="loading-container">
+                <div class="loading-circle"></div>
+            </div>
         </div>
 
         <!-- 输入区域 -->
         <div class="chat-editor" v-if="showAI">
             <div class="chat-input-editor-container">
-                <textarea ref="textareaRef" class="chat-input" 
-                v-model="inputMessage" @keydown="handleKeydown"
+                <textarea ref="textareaRef" class="chat-input" v-model="inputMessage" @keydown="handleKeydown"
                     :placeholder="model.placeholder"></textarea>
 
-
             </div>
             <div class="chat-editor-action">
 
@@ -57,11 +67,14 @@
 
 
 <script setup lang="ts">
-import { ref, onActivated, nextTick, watch, computed } from 'vue'
+import { ref, onActivated, nextTick, watch, computed, onMounted } from 'vue'
 import AIChat from '../../loader/src/AIChat'
 import common from '../../utils/common'
 import { marked } from 'marked';
 import DOMPurify from 'dompurify'
+import Router from '../../loader/src/Router';
+import { RouterClickHandler } from '../../utils/mixins';
+import util from '../../utils/pub-use'
 
 
 const emit = defineEmits(['loaded', "getRefFieldPara", "hideAI"])
@@ -70,6 +83,11 @@ const props = defineProps({
     router: Object,
     actionRouters: Array,
     form: Object,
+    tablewidth: Number,
+    isVisible: {
+        Boolean,
+        default: false,
+    },
 })
 interface StreamEventData {
     event: string
@@ -141,13 +159,7 @@ function load(data) {
     action();
 }
 
-onActivated(() => {
-    nextTick(() => {
-        if (inputMessage.value) {
-            inputMessage.value.focus();
-        }
-    })
-})
+
 // Marked 配置
 marked.setOptions({
     breaks: true,
@@ -158,12 +170,20 @@ marked.setOptions({
 function htmlContent(message) {
     return DOMPurify.sanitize(marked(message.content) + '')
 };
-// 监听内容变化，调整 textarea 高度
-watch(inputMessage, () => {
+
+// 监听多个值并执行不同逻辑
+watch([() => inputMessage, () => props.isVisible], ([newVal1, newVal2], [oldVal1, oldVal2]) => {
     nextTick(() => {
-        adjustTextareaHeight();
+        if (newVal1 !== oldVal1) {
+            adjustTextareaHeight();
+        }
+        if (newVal2) {
+            if (textareaRef.value) {
+                textareaRef.value.focus();
+            }
+        }
     });
-});
+}, { flush: 'sync' }); // 控制监听的时机
 
 // 调整 textarea 高度
 const adjustTextareaHeight = () => {
@@ -219,8 +239,10 @@ const addMessage = (message) => {
 }
 // 添加消息通用方法
 const appendMessage = (message) => {
-    model.value.messages[model.value.messages.length - 1].content = model.value.messages[model.value.messages.length - 1].content + message;
-    scheduleScroll()
+    if (!isStopped) {
+        model.value.messages[model.value.messages.length - 1].content = model.value.messages[model.value.messages.length - 1].content + message;
+        scheduleScroll()
+    }
 }
 
 const UpdateMessageType = (type) => {
@@ -233,11 +255,10 @@ const UpdateMessageType = (type) => {
 const scheduleScroll = (flagScroll) => {
     if (!scrollPending) {
         if (messagesContainer.value) {
-            const container = messagesContainer.value;
-
-            const distanceToBottom = container.scrollHeight - (container.scrollTop + container.clientHeight);
+            const distanceToBottom = getDistanceToBottom();
+            console.log(flagScroll, distanceToBottom)
             if (flagScroll || distanceToBottom <= 20) {
-                scrollPending = true
+                scrollPending = true;
                 nextTick(() => {
                     if (messagesContainer.value) {
                         messagesContainer.value.scrollTop = messagesContainer.value.scrollHeight
@@ -249,6 +270,18 @@ const scheduleScroll = (flagScroll) => {
     }
 }
 
+const getDistanceToBottom = () => {
+    let rtn = 0;
+
+    if (messagesContainer.value) {
+        const container = messagesContainer.value;
+
+        rtn = container.scrollHeight - (container.scrollTop + container.clientHeight);
+    }
+
+    return rtn;
+
+}
 //获取关联列返回对象
 function getRefFieldJson() {
     let rtn = {};
@@ -314,7 +347,8 @@ const fetchAIResponse = async (params) => {
         })
     }).then(response => {
         if (!response.ok) {
-            throw new Error('Network response was not ok');
+            common.message('网络响应不正常', 'error');
+            return;
         }
 
         // 获取响应的 ReadableStream
@@ -329,8 +363,6 @@ const fetchAIResponse = async (params) => {
                 if (isStopped) {
                     // 如果停止标志为 true，直接返回
                     outtext.value += "\n\n用户停止"
-                    startTypingEffect(outtext.value);
-                    outtext.value = '';
                     resolve();
                     return;
                 }
@@ -366,12 +398,32 @@ const fetchAIResponse = async (params) => {
         });
     }).then(() => {
         // 在所有行处理完毕后执行 startTypingEffect
-        if (outtext.value == '') {
-            outtext.value = '  ';
+
+        let TemplateType = getTemplateType(outtext.value);
+        UpdateMessageType(TemplateType);
+
+        let type = model.value.messages[model.value.messages.length - 1].type;
+        if (type == "table" || type == "form") {
+            var data = JSON.parse(outtext.value).content;
+            if (type == "table") {
+                var actionRouters = [];
+                data.actionRouters.forEach((v) => {
+                    var router = Router(v);
+                    router.is = "ct-button";
+                    actionRouters.push(router);
+                });
+                data.actionRouters = actionRouters
+            }
+            const flagScroll = (getDistanceToBottom() <= 20) ? true : false;
+            appendMessage(JSON.stringify(data));
+
+
+            setTimeout(() => scheduleScroll(flagScroll), 500);
+
+        } else {
+            startTypingEffect(outtext.value);
         }
-        UpdateMessageType('message');
-        startTypingEffect(outtext.value);
-        outtext.value = '';
+        afoot.value = false;
     }).catch(error => {
         UpdateMessageType('error');
         if (error.name === 'AbortError') {
@@ -395,7 +447,7 @@ function stopRequest() {
     }).then(response => response.json()) // 将响应转换为 JSON
         .then(data => {
             if (data.result == 'success') {
-                afoot.value = true;
+                afoot.value = false;
             }
 
             // 如果服务器返回 { result: "success" }，这里会输出这个对象
@@ -459,44 +511,84 @@ const handleStreamEvent = (eventData: StreamEventData) => {
 }
 
 const getTemplateType = (fullText) => {
+    var rtn = "message";
+    try {
+        const eventData = JSON.parse(fullText)
+        if (eventData) {
+            if (eventData.content?.rows) {
+                rtn = 'table';
+            }
+            else if (eventData.content?.fields) {
+                rtn = 'form';
+            }
+        }
 
+    } catch (error) {
 
+    }
+
+    return rtn;
 
 }
 
 
 function startTypingEffect(fullText) {
     let index = 0;
-    let timer = setInterval(() => {
-        // 检查索引是否超出字符串长度
-        if (index >= fullText.length) {
-            clearInterval(timer); // 清除定时器
-            return;
-        }
+    outtext.value = ''; // 清空内容
 
+    function typeNext() {
         // 随机生成3到10之间的字符数
-        const randomChars = Math.floor(Math.random() * 8) + 3; // 3到10（包括3和10）
+        const randomChars = Math.floor(Math.random() * 5) + 8;
         const charsToLoad = Math.min(randomChars, fullText.length - index);
 
-        // 获取当前要加载的字符
+        // 获取并显示当前字符
         const currentChars = fullText.substring(index, index + charsToLoad);
-        // 显示字符
         appendMessage(currentChars);
-        // 更新索引
         index += charsToLoad;
 
-        // 检查是否已经加载完成
-        if (index >= fullText.length) {
-            clearInterval(timer); // 清除定时器
+        // 递归条件判断
+        if (index < fullText.length && !isStopped) {
+            setTimeout(typeNext, 100); // 继续下一次迭代
+        } else {
+            // 全部完成后执行
+            outtext.value = '';
         }
-    }, 100); // 每100毫秒加载10个字符
-    afoot.value = false;
+    }
+
+    // 启动首次调用
+    setTimeout(typeNext, 100);
 }
 
+
 function hideAI() {
     emit("hideAI", false);
 
 }
+//layout组件 路由操作
+function rolRouterCellClickHandler(routerKey, rowindex, forname, forrowindex, flagHaveAlert, rowData, actionRouter) {
+    var submitData = {};
+    let field = actionRouter.find((b) => {
+        return b.key === routerKey;
+    });
+    field = Router(field);
+    if (typeof forname !== "undefined") {
+        field.submitListField.forEach((k) => {
+            submitData[k] = rowData[forname][forrowindex][k];
+        });
+    } else {
+        field.submitListField.forEach((k) => {
+            submitData[k] = rowData[k];
+        });
+    }
+    if (field.isCallTel) {
+        submitData.flagHaveAlert = flagHaveAlert || false;
+    }
+    let action = field.action;
+    if (field.actionField) {
+        action = rowData[field.actionField];
+    }
+    RouterClickHandler(field, submitData, action, model.value, 'table')
+}
 </script>
 
 <style scoped>
@@ -520,7 +612,7 @@ function hideAI() {
 
     /* 子元素之间的间距为5像素 */
     .header-item {
-        padding: 10px 0px 10px 10px;
+        padding: 3px 0px 0px 8px;
     }
 }
 
@@ -532,6 +624,7 @@ function hideAI() {
     display: flex;
     flex-direction: column;
     gap: 1rem;
+
 }
 
 /* 隐藏滚动条 */
@@ -554,6 +647,10 @@ function hideAI() {
     max-height: none;
     /* 不限制子级高度 */
     border-radius: 10px;
+    word-wrap: break-word;
+    /* 确保内容自动换行 */
+    word-break: break-word;
+    /* 长单词或连续字符也能换行 */
 
 }
 
@@ -567,6 +664,10 @@ function hideAI() {
     align-self: flex-start;
     background-color: white;
     border: 1px solid #e0e0e0;
+    max-width: 100%;
+    /* 确保不超出父级宽度 */
+    width: auto;
+    /* 去掉固定宽度 */
 }
 
 .chat-message {
@@ -657,9 +758,10 @@ function hideAI() {
 }
 
 .chat-input::placeholder {
-  color: #a8abb2;
-  opacity: 1;
+    color: #a8abb2;
+    opacity: 1;
 }
+
 .chat-editor-action {
     display: flex;
     justify-content: space-between;
@@ -705,9 +807,8 @@ function hideAI() {
 
 .ico-button {
     cursor: pointer;
-    width: 25px;
-    height: 25px;
-    background-color: #DBEAFE;
+    width: 35px;
+    height: 35px;
 }
 
 

package/src/components/web/ComboBox.vue

@@ -48,6 +48,7 @@ import Axios from 'axios';
 import { ref, nextTick } from 'vue'
 import { Search } from '@element-plus/icons-vue'
 import { initData, changeHandler } from '../../utils/mixins';
+import common from '../../utils/common'
 import ComboBox from '../../loader/src/ComboBox';
 const emit = defineEmits(['click', 'input', 'change', 'popupSearchList', 'search'])
 const props = defineProps({
@@ -125,7 +126,7 @@ function getOptions(key) {
             }
 
             if(data.length==0){
-              nodatatext.value = '无数据';
+              nodatatext.value = common.LocalizedString('无数据', '無數據');
             }
 
             nextTick(function () {
@@ -133,7 +134,7 @@ function getOptions(key) {
             });
           }
           else{
-            nodatatext.value = '无数据';
+            nodatatext.value = common.LocalizedString('无数据', '無數據');
           }
         })
     }

package/src/components/web/Form.vue

@@ -157,14 +157,14 @@
 
             </div>
             <template v-if="model?.aiAttr?.showAI">
-                <div :style="{ flex: ' 0 0 ' + model.aiAttr.width + 'px',  position: 'sticky', top: '0' ,'margin-left': '10px'}"
+                <div :style="{ flex: ' 0 0 ' + model.aiAttr.width + 'px',  position: 'sticky', top: '0' ,'box-shadow': '-10px 0 5px -9px rgba(0, 0, 0, 0.3)' }"
                     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' }"
                             :field="model.aiChat" :router="model.aiRouter" :actionRouter="model.actionRouters" :form="model"
-                            @hideAI="AIToggle">
+                            @hideAI="AIToggle" :isVisible="showAI" :tablewidth="model.aiAttr.width">
 
                         </AIChat>
                     </div>

package/src/components/web/dialog.vue

@@ -19,7 +19,7 @@ onActivated(() => {
 })
 function close() {
     emit('close', props);
-    if (props.vmodel.content[0].attrs && typeof props.vmodel.content[0].attrs["onCloseDialog"] === "function") {
+    if (props.vmodel.content[0].component != 'ct-iframe' && props.vmodel.content[0].attrs && typeof props.vmodel.content[0].attrs["onCloseDialog"] === "function") {
         props.vmodel.content[0].attrs["onCloseDialog"]();
     }
 }
@@ -145,11 +145,11 @@ const render = () => {
                                                     //AI弹框宽度自适应
                                                     if (!item.attrs.onAIToggle) {
                                                         item.attrs.onAIToggle = (newWidth) => {
-                                                          
+
                                                             item.width = parseFloat(item.width) + newWidth + 'px';
                                                         }
                                                     }
-           
+
                                                     //加载失败关闭弹框
                                                     if (!item.attrs.onFailLoad) {
                                                         item.attrs.onFailLoad = () => {
@@ -195,8 +195,8 @@ const render = () => {
                                                             item.documentWidth = (props.vmodel.pane.clientWidth - 20) + 'px';
                                                         }
                                                     }
-                                                    item.attrs.dialoWidth = parseInt((item.width||0).replace('px', ''));
-                                                    item.attrs.dialogHeight = parseInt((item.height||0).replace('px', ''));
+                                                    item.attrs.dialoWidth = parseInt((item.width || 0).replace('px', ''));
+                                                    item.attrs.dialogHeight = parseInt((item.height || 0).replace('px', ''));
                                                     return h('div', {
                                                         style: {
                                                             width: item.width,

package/src/loader/src/Router.js

@@ -13,6 +13,9 @@ const Router = function (source) {
     get controlLabel() {
       return source.text;
     },
+    set controlLabel(v) {
+      return source.text=v;
+    },
     //动作对应的 控制器  
     get action() {
       return source.action;

package/src/main.js

@@ -22,16 +22,18 @@ for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
 
 app.use(centaline, {
     baseUrl:"http://10.88.22.66/IBS.Mvc/api/",
+    //baseUrl: "https://kq-api.centaline.com.cn/onecard-api/",
+    //baseUrl: "http://10.88.22.13:6060/onecard-api/",
     //baseUrl: "http://10.88.22.66:6060/xian/",
     //baseUrl: "http://10.1.245.50:38735/max-uplink-api/",
     //baseUrl: "http://10.1.245.111:38028/",
-    
+
     flagRouterSelf: true,
-    flagApp: false,//是否app端
+    flagApp: true,//是否app端
     zindex: 999,
     showRequestSuccessMessage: true,
     showRequestErrorMessage: true,
-    language:'HK',
+    language: 'HK',
     handler: {
         // 打开tab页
         openTab: function (action) {
@@ -64,10 +66,13 @@ app.use(centaline, {
             return {
                 //authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVay1xvvOl3sJA2HiPIxElSIJBIIcXdAQEfPFK-YZt4Nlm2EChqtDafOYWqpRG6kxLoTxZhUTSRxHLUPH_DHfOmt5SDWt1gHScieHapNiol94q5pXYoNFJAvJ6isGHWmNMYVcBjWtyCr_iW2JZ93-fqPc8f18MwGIqFRCIO1GXmWGYd9npCZJ6N5JjYZ7g8AAAD__w.HgtNKtHWooj8c9Hy_vB8CfKq-qOeHMp0irnW0DfXtHo"}',
                 //oldToken: 'd92d4a3b-2274-42e8-96f0-100ffb579b6e',
-                //authObject: '{token:"1-a7289bb2-9f1e-4a04-9016-1e555bf39188"}',
-                authObject: '{EmpID:"Token_43406e81-3337-4d1f-8917-edc5bfec9c9f",MachineCode:"e1f39b75-7069-4c4f-b5d5-c590da2d9aa2",SSO_Token:"SSOToken_43406e81-3337-4d1f-8917-edc5bfec9c9f",Platform:"web"}',
+                //authObject: '{token:"1647-1907352839429165056",platform:"WEB"}',
+                authObject: '{EmpID:"Token_2fa5c93f-ae55-4e77-98a4-ef9c8b3bec34",MachineCode:"7c4b2ffd-920a-462c-a586-37bbfb45c4fe",SSO_Token:"SSOToken_2fa5c93f-ae55-4e77-98a4-ef9c8b3bec34",Platform:"IOS"}',
             };
         },
+        getToken() {
+            return "1647-1907319603235786752"
+        },
         // 请求完成事件，可判断是否登录过期执行响应操作
         requestComplete: function (response) {
             // console.log(response);

package/src/views/SearchList.vue

@@ -6,6 +6,10 @@
 
        <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyTenderList/getLayoutOfSearch'"
       :searchDataApi="'/propertyTenderList/getListOfSearchModel'"></ct-searchlist>
+
+      
+      <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/EmployeeAttendanceBillList/getLayoutOfSearchForMy'"
+      :searchDataApi="'/EmployeeAttendanceBillList/getListOfSearchModelForMy'"></ct-searchlist> -->
     <ct-dialoglist ref="dialogList"></ct-dialoglist>
 
   </div>