centaline-data-driven-v3 0.0.88 → 0.0.89

package/package.json

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

package/src/components/web/AIChat.vue

@@ -523,23 +523,30 @@ const getTemplateType = (fullText) => {
             if (eventData.rtnCode != '200') {
                 rtn = "error";
                 outtext.value = (eventData.rtnMsg || fullText);
-                if (eventData.rtnCode == '401') {
-                    common.message(eventData.rtnMsg, 'error');
+                if (eventData.rtnCode == Enum.ReturnCode.Unauthorized) {
+                    if (common.getDataDrivenOpts().handler?.login) { 
+                        common.getDataDrivenOpts().handler.login();
+                    };
                 }
             }
             else if (eventData.clientActionType == Enum.ClientActionType.ExcuteScript) {
                 rtn = 'js';
-                if (eventData.content&&props.form) {
+                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';
+            else if (eventData.content) {
+                if (!isJSONObject(eventData.content)) {
+                    outtext.value = eventData.content;
+                }
+                else if (eventData.content?.rows) {
+                    rtn = 'table';
+                }
+                else if (eventData.content?.fields) {
+                    rtn = 'form';
+                }
             }
 
         }
@@ -551,14 +558,25 @@ const getTemplateType = (fullText) => {
     return rtn;
 
 }
+function isJSONObject(value) {
+    if (typeof value !== 'object' || value === null) {
+        return false; // 如果不是对象，直接返回 false
+    }
 
+    try {
+        JSON.stringify(value);
+        return true; // 如果可以序列化为 JSON，说明是 JSON 对象
+    } catch (e) {
+        return false; // 如果序列化失败，说明不是 JSON 对象
+    }
+}
 
 function startTypingEffect(fullText) {
     fullText = fullText.replace(/\\n/gi, '\n\n');
     let index = 0;
     outtext.value = ''; // 清空内容
     function typeNext() {
-        // 随机生成3到10之间的字符数
+        // 随机生成4到12之间的字符数
         const randomChars = Math.floor(Math.random() * 5) + 8;
         const charsToLoad = Math.min(randomChars, fullText.length - index);
 

package/src/components/web/ContainerControl.vue

@@ -12,7 +12,7 @@
                     <div style="display: flex; flex: 0 0 100%;" v-if="col.show !== false && col.lineFeed"></div>
                     <div v-if="col.show !== false"
                         :class="index > 0 && (col.controlLabel == '' || col.is == 'ct-button') ? 'complex-left-10' : ''"
-                        :style="{ 'width': (col.width != '0' ? col.width + 'px' : '100%'), 'flex': (col.width != '0' ? '0 0 ' + col.width + 'px' : '100%') }">
+                        :style="{ 'width': (col.width && col.width>0 ? col.width + 'px' : '100%'), 'flex': (col.width && col.width>0? '0 0 ' + col.width + 'px' : '100%') }">
                         <component ref="Fields" :is="col.is" :vmodel="col" :parameterAction="parameterAction"
                             v-bind="col.bindPara" @fieldClick="fieldClickHandler(col)" @change="change(col)"
                             @popupSearchList="popupSearchListHandler"></component>
@@ -28,7 +28,7 @@
                         <div style="display: flex; flex: 0 0 100%;" v-if="col.show !== false && col.lineFeed"></div>
                         <el-col v-if="col.show !== false"
                             :class="[index > 0 && (col.controlLabel == '' || col.is == 'ct-btn') ? 'complex-left-10' : '', 'containerCol']"
-                            :style="{ 'width': (col.width != '0' ? col.width + 'px' : '100%'), 'flex': (col.width != '0' ? '0 0 ' + col.width + 'px' : '100%') }">
+                            :style="{ 'width': (col.width && col.width>0 ? col.width + 'px' : '100%'), 'flex': (col.width && col.width>0 ? '0 0 ' + col.width + 'px' : '100%') }">
                             <component ref="Fields" :is="col.is" :vmodel="col" :parameterAction="parameterAction"
                                 v-bind="col.bindPara" @fieldClick="fieldClickHandler(col)" @change="change(col)"
                                 @popupSearchList="popupSearchListHandler">

package/src/loader/src/Form.js

@@ -3,7 +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 request from '../../utils/request';
 
 function loadFormApi(api, callBack, apiParam, failCallBack, isFormList) {
   if (api) {
@@ -47,7 +47,7 @@ function loadFromModel(source, isFormList) {
           return rtn1.code1;
         }
       },
-     
+
       //获取code2
       getCode2ByField1(id) {
         var rtn1 = this.fieldsDic[id];
@@ -69,7 +69,7 @@ function loadFromModel(source, isFormList) {
         });
         if (router) {
           router[attrKey] = attrValue;
-          if(common.flagApp()&&this.form.$vue.loaded){
+          if (common.flagApp() && this.form.$vue.loaded) {
             this.form.$vue.loaded(this.form)
           }
         }
@@ -307,6 +307,9 @@ function loadFromModel(source, isFormList) {
             if (flagTemplate) {
               data.field[attrName] = value;
             }
+            if (data.listData.flagTemplate && data.listData.$vue) {
+              data.listData.$vue.itemKey = Math.random()
+            }
           }
 
           //如果有汇总列，触发重新计算汇总
@@ -751,13 +754,13 @@ function loadFromModel(source, isFormList) {
             return v1.key === field.fieldName1;
           });
         }
-        rtn._aiRouter= router;
+        rtn._aiRouter = router;
         return rtn._aiRouter;
       }
-    },  
+    },
     get aiChat() {
       return source.aiChat;
-    }, 
+    },
     //获取表单数据
     getFormObj() {
       var rtnFormObj = {};
@@ -800,9 +803,9 @@ function loadFromModel(source, isFormList) {
     getRefFieldPara(refFieldNameArr) {
       let submitData = {};
       var tempFormData = rtn.getFormObj();
-      
+
       refFieldNameArr.forEach((v) => {
-        submitData[v] =  common.getDataOfUpperLower(tempFormData,v);
+        submitData[v] = common.getDataOfUpperLower(tempFormData, v);
       });
       return submitData;
     },

package/src/main.js

@@ -21,8 +21,8 @@ for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
 }
 
 app.use(centaline, {
-    baseUrl:"https://uplink.centaline.com.cn/xian/",
-    //baseUrl:"http://10.88.22.66/IBS.Mvc/api/",
+    //baseUrl:"https://uplink.centaline.com.cn/xian/",
+    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/",
@@ -67,8 +67,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:"1-bce18a8d-21f0-4022-a6ca-450de105cafc"}',
-                //authObject: '{EmpID:"Token_156a7f3f-b1e9-4592-aaef-49a572768c06",MachineCode:"7c4b2ffd-920a-462c-a586-37bbfb45c4fe",SSO_Token:"SSOToken_156a7f3f-b1e9-4592-aaef-49a572768c06",Platform:"IOS"}',
+                //authObject: '{token:"1-bce18a8d-21f0-4022-a6ca-450de105cafc"}',
+                authObject: '{EmpID:"Token_2053032d-9248-494b-9295-12c2ddf81d22",MachineCode:"7c4b2ffd-920a-462c-a586-37bbfb45c4fe",SSO_Token:"SSOToken_2053032d-9248-494b-9295-12c2ddf81d22",Platform:"WEB"}',
             };
         },
         getToken() {

package/src/views/SearchList.vue

@@ -1,11 +1,11 @@
 <template>
   <div id="app-search" style="width:100%;height:100%;position: fixed;">
-    <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyPublishList/getLayoutOfSearch'"
+    <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyPublishList/getLayoutOfSearch'"
       :searchDataApi="'/propertyPublishList/getListOfSearchModel'"
-       :searchStatsApi="'/propertyPublishList/getListStats'"></ct-searchlist>
-<!-- 
+       :searchStatsApi="'/propertyPublishList/getListStats'"></ct-searchlist> -->
+
        <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyTenderList/getLayoutOfSearch'"
-      :searchDataApi="'/propertyTenderList/getListOfSearchModel'"></ct-searchlist> -->
+      :searchDataApi="'/propertyTenderList/getListOfSearchModel'"></ct-searchlist>
 
       
       <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/EmployeeAttendanceBillList/getLayoutOfSearchForMy'"