centaline-data-driven-v3 0.0.87 → 0.0.89

package/package.json

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

package/src/components/app/Form.vue

@@ -178,7 +178,7 @@ function init() {
 function load(data) {
     model.value = data
     model.value.parentModelForm = props.parentModelForm
-    model.value.$vue = { fieldClickHandler, clickHandler, emit, getFormObj, getFileData, Form, validExcute, changeCallBackHandler, load, init, updateFields };
+    model.value.$vue = { fieldClickHandler, clickHandler, emit, getFormObj, getFileData, Form, validExcute, changeCallBackHandler, load, init, updateFields,loaded };
     if (model.value.scripts) {
         model.value.scripts.formData = model.value.formData;
         model.value.scripts.formData.form = model.value;
@@ -213,6 +213,9 @@ function load(data) {
     //通知父组件加载完成
     emit('loaded', model.value);
 }
+function loaded(model) {
+    emit('loaded', model);
+}
 function failLoad() {
     emit('failLoad', model.value);
 }

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">
@@ -56,7 +56,25 @@ const Fields = ref()
 const itemKey = ref(0)
 model.value.selfValidExcute = () => {
     let rtnBool = true;
-    if (typeof Fields.value !== 'undefined') {
+    if (model.value.layoutTemplate) {
+        var i = 0;
+        if (model.value.fields.length > 0) {
+            model.value.fields.forEach((f) => {
+                if (f.validExcute) {
+                    if (!f.validExcute()) {
+                        if (i === 0) {
+                            if (f.displayValidMessage) {
+                                model.value.displayValidMessage = f.displayValidMessage;
+                            }
+                        }
+                        i++;
+                        rtnBool = false;
+                    }
+                }
+            });
+        }
+    }
+    else if (typeof Fields.value !== 'undefined') {
         Fields.value.forEach((f) => {
             if (f.model && typeof f.model.validExcute !== 'undefined') {
                 if (!f.model.validExcute(f.model)) {

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,6 +69,9 @@ function loadFromModel(source, isFormList) {
         });
         if (router) {
           router[attrKey] = attrValue;
+          if (common.flagApp() && this.form.$vue.loaded) {
+            this.form.$vue.loaded(this.form)
+          }
         }
       },
       //获取Field的属性attrKey的值
@@ -304,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()
+            }
           }
 
           //如果有汇总列，触发重新计算汇总
@@ -748,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 = {};
@@ -797,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,9 +21,10 @@ for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
 }
 
 app.use(centaline, {
-    //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.66:6060/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/",
@@ -66,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:"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"}',
+                //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/utils/common.js

@@ -294,7 +294,7 @@ const common = {
         center = true;
       }
       if (typeof duration === 'undefined') {
-        duration = 1500;
+        duration = 3000;
       }
       if (typeof showClose === 'undefined') {
         showClose = false;

package/src/views/Form.vue

@@ -1,7 +1,7 @@
 <template>
   <div  class="data-driven" id="app-form" >
    
-    <ct-form :api="'/PropertyPublish/getLayoutOfAudit'" :apiParam="apiParam" :flagNavbar="true"></ct-form>
+    <ct-form :api="'/admin/SchoolTeachingPlanExam/readDetail'" :apiParam="apiParam" :flagNavbar="true"></ct-form>
    <!-- <ct-form :api="'/api/third-dept-tran/tran-comm-adjust/task'" :apiParam="apiParam"></ct-form> -->
    <!-- <ct-form :api="'/PropertyTranToActive/getLayoutOfNew'" :apiParam="apiParam"></ct-form> -->
     <!-- <ct-textbox :source="source"></ct-textbox> -->
@@ -10,5 +10,5 @@
 </template>
 <script lang="ts" setup>
  //const apiParam={"originalTraId":"1739561435204980737","actionType":1,"pageStyle":2,"pageTitle":"成交报告","pageOnly":true}
- const apiParam={"workListID":"1902920155446489088","actionType":3}
+ const apiParam={"actionType":2,"teachingPlanId":"1"}
 </script>

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="'/ReportWorkQuantifyList/getLayoutOfSearch'"
-      :searchDataApi="'/ReportWorkQuantifyList/getListOfSearchModel'"></ct-searchlist>
+      <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/EmployeeAttendanceBillList/getLayoutOfSearchForMy'"
+      :searchDataApi="'/EmployeeAttendanceBillList/getListOfSearchModelForMy'"></ct-searchlist> -->
     <ct-dialoglist ref="dialogList"></ct-dialoglist>
 
   </div>