centaline-data-driven-v3 0.0.86 → 0.0.87

package/package.json

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

package/src/components/web/AIChat.vue

@@ -75,6 +75,7 @@ import DOMPurify from 'dompurify'
 import Router from '../../loader/src/Router';
 import { RouterClickHandler } from '../../utils/mixins';
 import util from '../../utils/pub-use'
+import Enum from '../../utils/Enum';
 
 
 const emit = defineEmits(['loaded', "getRefFieldPara", "hideAI"])
@@ -433,7 +434,7 @@ const fetchAIResponse = async (params) => {
         if (error.name === 'AbortError') {
             console.log('Request aborted');
         } else {
-            common.message('请求失败', 'error');
+            common.message(error, 'error');
         }
     });
 }
@@ -459,7 +460,7 @@ function stopRequest() {
             if (error.name === 'AbortError') {
                 console.log('Request aborted');
             } else {
-                common.message('请求失败', 'error');
+                common.message(error, 'error');
             }
         });
 
@@ -519,12 +520,28 @@ const getTemplateType = (fullText) => {
     try {
         const eventData = JSON.parse(fullText)
         if (eventData) {
-            if (eventData.content?.rows) {
+            if (eventData.rtnCode != '200') {
+                rtn = "error";
+                outtext.value = (eventData.rtnMsg || fullText);
+                if (eventData.rtnCode == '401') {
+                    common.message(eventData.rtnMsg, 'error');
+                }
+            }
+            else if (eventData.clientActionType == Enum.ClientActionType.ExcuteScript) {
+                rtn = 'js';
+                if (eventData.content&&props.form) {
+                    common.excute.call(props.form?.scripts, eventData.content);
+                }
+                outtext.value = (eventData.rtnMsg || "脚本执行成功！");
+
+            }
+            else if (eventData.content?.rows) {
                 rtn = 'table';
             }
             else if (eventData.content?.fields) {
                 rtn = 'form';
             }
+
         }
 
     } catch (error) {
@@ -537,9 +554,9 @@ const getTemplateType = (fullText) => {
 
 
 function startTypingEffect(fullText) {
+    fullText = fullText.replace(/\\n/gi, '\n\n');
     let index = 0;
     outtext.value = ''; // 清空内容
-
     function typeNext() {
         // 随机生成3到10之间的字符数
         const randomChars = Math.floor(Math.random() * 5) + 8;

package/src/loader/src/SearchTable.js

@@ -38,7 +38,7 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
                 var router = this.formTable.buttons.find((v) => {
                     return v.key === routerKey;
                 });
-                if(router){
+                if (router) {
                     this.formTable.$vue.toolbarClickHandler(router);
                 }
             },
@@ -527,8 +527,8 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
                             },
                         };
                         if (col.show) {
-                            //合并表头时暂不支持固定列
-                            if (col.lock && !self.isMergeTitle) {
+                            //合并表头列暂不支持固定列
+                            if (col.lock && col.trOrder == 1 && col.colspan == 1) {
                                 if (lockLeft) {
                                     col.fixed = 'left';
                                 } else {
@@ -599,7 +599,7 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
             return rtn._dataDictionary;
         },
         get rowColorColumn() { //行字体颜色列
-          return source.content.rowColorColumn;
+            return source.content.rowColorColumn;
         },
         //设置行样式
         setRow(rows) {
@@ -613,10 +613,10 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
                     row.rowStyle = "";
                 }
                 if (rtn.rowColorColumn && row[rtn.rowColorColumn]) {
-                  row.rowStyle = row.rowStyle + ";color:" + row[rtn.rowColorColumn] + ";";
+                    row.rowStyle = row.rowStyle + ";color:" + row[rtn.rowColorColumn] + ";";
                 }
                 if (row.flagDrag && row.flagDrag == '1') {
-                  row.rowStyle = row.rowStyle + "cursor:move;";
+                    row.rowStyle = row.rowStyle + "cursor:move;";
                 }
             });
         },
@@ -753,7 +753,7 @@ function apiData(model, callback) {
     })
         .then(function (response) {
             if (model.$vue && model.$vue.searchStrat && model.$vue.searchEnd) {
-              model.$vue.searchEnd = Date.now();
+                model.$vue.searchEnd = Date.now();
             }
             model.isLoading = false;
             if (response.rtnCode === Enum.ReturnCode.Successful) {

package/src/main.js

@@ -21,15 +21,15 @@ for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
 }
 
 app.use(centaline, {
-    baseUrl:"http://10.88.22.66/IBS.Mvc/api/",
+    //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/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: true,//是否app端
+    flagApp: false,//是否app端
     zindex: 999,
     showRequestSuccessMessage: true,
     showRequestErrorMessage: true,
@@ -66,8 +66,8 @@ 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:"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"}',
+                authObject: '{token:"1647-1909419453867757568",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() {

package/src/views/SearchList.vue

@@ -4,12 +4,12 @@
       :searchDataApi="'/propertyPublishList/getListOfSearchModel'"
        :searchStatsApi="'/propertyPublishList/getListStats'"></ct-searchlist> -->
 
-       <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyTenderList/getLayoutOfSearch'"
-      :searchDataApi="'/propertyTenderList/getListOfSearchModel'"></ct-searchlist>
+       <!-- <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-searchlist :apiParam="apiParam" :searchConditionApi="'/ReportWorkQuantifyList/getLayoutOfSearch'"
+      :searchDataApi="'/ReportWorkQuantifyList/getListOfSearchModel'"></ct-searchlist>
     <ct-dialoglist ref="dialogList"></ct-dialoglist>
 
   </div>