centaline-data-driven 1.6.57 → 1.6.59

package/src/centaline/dynamicTreeList/src/dynamicTreeList.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="app-Tree" style="height:100%;">
+  <div ref="treeAppRef" id="app-Tree" style="height:100%;">
     <el-container style="height:  calc(100vh - 98px);" ref="tree_left">
       <el-aside :width="asideWidth ? asideWidth + 'px' : '15%'"
         style="background-color:white;border-radius: 6px;overflow-y:hidden">
@@ -10,11 +10,10 @@
       <el-main v-if="isShowMain" style="position: relative;">
         <div class="resizer" @mousedown="startResizing"></div>
         <template v-if="pageType == 'form'">
-          <div style="height: calc(100vh - 120px);">
-            <div class="ct-form"
-              :style="{ 'width': (width ? width + 'px' : 'auto'), 'height': (height ? height + 'px' : 'auto') }">
-              <ct-form :api="formApi" :api-param="apiParam" :width="width" :height="height"></ct-form>
-            </div>
+          <div class="ct-tree-form"
+            :style="{'width': (width ? width + 'px' : 'auto'), 'height': (height ? height + 'px' : (heightPage?heightPage:'auto'))
+            ,'position': 'relative','background-color': '#FFFFFF','border-radius': '6px'}">
+            <ct-form :api="formApi" :api-param="apiParam" :width="width" :height="height"></ct-form>
           </div>
         </template>
         <template v-else>
@@ -51,6 +50,7 @@ export default {
       formApi: "",
       width: 0,
       height: 0,
+      heightPage: '',
       isShowMain: false,
       pageType: 'list',
       apiParam: {},
@@ -80,6 +80,18 @@ export default {
         self.pageType = data.rowRouter.pageType != undefined ? data.rowRouter.pageType : "list";
         self.width = parseFloat(data.rowRouter.width != undefined ? data.rowRouter.width : "0");
         self.height = parseFloat(data.rowRouter.height != undefined ? data.rowRouter.height : "0");
+        if(self.pageType == 'form'){
+          self.heightPage = 'calc(100vh - 100px)';
+          let w1 = (this.$refs.treeAppRef)?this.$refs.treeAppRef.parentElement.offsetWidth : 0;
+          if(w1 > 0 && (self.width+self.asideWidth)>w1){
+            self.width = w1 - self.asideWidth - 30;
+          }
+          let h1 = (this.$refs.treeAppRef)?this.$refs.treeAppRef.parentElement.offsetHeight : 0;
+          if(h1 > 0 && self.height > 0 && self.height>h1){
+            self.height=0;
+          }
+        }
+
         self.searchTableConditionApi = data.rowRouter.getLayoutOfSearch;
         self.searchTableDataApi = data.rowRouter.getList;
         var defaultPara = self.$common.deepClone(data);
@@ -113,7 +125,6 @@ export default {
       document.addEventListener('mousemove', this.resizeAside);
       document.addEventListener('mouseup', this.stopResizing);
     },
-
     resizeAside(event) {
       if ( this.isResizing) {
         const newWidth = this.startWidth + (event.clientX - this.startX);
@@ -121,7 +132,6 @@ export default {
         window.localStorage.setItem(this.dataRowRouter, this.asideWidth);
       }
     },
-
     stopResizing() {
       this.isResizing = false;
       document.removeEventListener('mousemove', this.resizeAside);
@@ -167,12 +177,13 @@ export default {
   padding: 0;
 }
 
-#app-Tree .el-main ct-form {
+#app-Tree .el-main ct-tree-form {
   border: 1px solid #cfcece;
   -webkit-box-shadow: #cfcece 0px 7px 9px 0px !important;
   border-radius: 6px !important;
   margin-top: 14px;
 } 
+
 .resizer {
     position: absolute;
     top: 0;

package/src/centaline/loader/src/ctl/Form.js

@@ -28,6 +28,18 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
       get tip() {
         return source.tip;
       },
+      set tip(v) {
+        source.tip = v;
+      },
+      get bottomTip() {
+        return source.bottomTip;
+      },
+      set bottomTip(v) {
+        source.bottomTip = v;
+      },
+      get flagFixedTabOnHorizontalLayout() {
+        return source.flagFixedTabOnHorizontalLayout;
+      },
       get flagShowTitle() {
         let v=false;
         if(source.flagShowTitle)v=source.flagShowTitle;

package/src/centaline/loader/src/ctl/JsonViewer.js

@@ -0,0 +1,25 @@
+import base from '../../index';
+import Base from './Base';
+
+const JsonViewer = function (source) {
+  var init = function (data) {
+    var rtn = {
+      get jsonData() {
+        if (data.code1 && typeof data.code1 === 'string') {
+          return JSON.parse(data.code1);
+        } 
+        else {
+          return data.code1;
+        }
+      },
+      get height() {
+        return data.rows ? data.rows * 20 + 'px' : 'auto';
+      }
+    };
+    rtn = base.copy(Base(data), rtn);
+    return rtn;
+  }
+
+  return init(source);
+}
+export default JsonViewer;

package/src/centaline/loader/src/ctl/SensitiveEye.js

@@ -50,8 +50,9 @@ const SensitiveEye = function (source) {
           extraData: extraData
         }
       };
-      Vue.prototype.$api.postHandler(common.globalUri(), params).then((response) => {
-        if (response.rtnCode === Enum.ReturnCode.Successful) {
+      if(rtn.getFormRefFieldPara())params.para = Object.assign(params.para,JSON.parse(rtn.getFormRefFieldPara()));
+      Vue.prototype.$api.postHandler(common.globalUri(), params,rtn.form.scripts).then((response) => {
+        if (response.rtnCode === Enum.ReturnCode.Successful && response.clientActionType !== Enum.ClientActionType.ExcuteScript) {
           self.labelValue1 = response.content;
         }
       });

package/src/centaline/loader/src/ctl/SliceUpload.js

@@ -1,7 +1,15 @@
-
+import common from '../../../common';
 async function postFile(api, data, callback) {
   var xhr = window.XMLHttpRequest ? new XMLHttpRequest : new ActiveXObject("Microsoft.XMLHTTP");
   xhr.open('POST', api, !0)
+
+  let headers=common.getDataDrivenOpts().handler.getRequestHeaders(api);
+  if(headers){
+    for (const [key, value] of Object.entries(headers)) {
+      xhr.setRequestHeader(key,value)
+    }
+  }
+
   xhr.onreadystatechange = function () {
     if (xhr.readyState != 4 || xhr.status < 200) {
       return false;

package/src/centaline/loader/src/ctl/lib/Enum.js

@@ -311,6 +311,16 @@ const Enum = {
      */
     AIChat:62,
 
+    /**
+     * json 数据查看控件
+     */
+     JsonViewer:63,
+
+     /**
+      * Markdown 数据查看控件
+      */
+     MarkdownViewer:64,
+
   },
 
   //返回状态码

package/src/centaline/loader/src/ctl/lib/LibFunction.js

@@ -43,6 +43,7 @@ import LH from '../LH';
 import Image from '../Image';
 import Steps from '../Steps';
 import Location from '../Location';
+import JsonViewer from '../JsonViewer';
 
 const LibFunction = {
   install(Vue) {},
@@ -415,6 +416,10 @@ const LibFunction = {
         item = Location(field,moreActionRouter);
         item.is = 'ct-Location';
         break;
+      case Enum.ControlType.JsonViewer: //json 数据查看控件
+        item = JsonViewer(field);
+        item.is = 'ct-JsonViewer';
+        break;
       default:
         item = L(field);
         item.is = 'ct-labelText';
@@ -456,6 +461,7 @@ const LibFunction = {
             || field.controlType === Enum.ControlType.List || field.controlType === Enum.ControlType.File 
             || field.controlType === Enum.ControlType.SliceUpload || field.controlType === Enum.ControlType.PhoneDial 
             || field.controlType === Enum.ControlType.Steps || field.controlType === Enum.ControlType.Location 
+            || field.controlType === Enum.ControlType.JsonViewer || field.controlType === Enum.ControlType.MarkdownViewer 
             || field.controlType === Enum.ControlType.SearchPage;
         },
         showLabel: showLabel

package/src/centaline/loader/src/ctl.js

@@ -51,6 +51,7 @@ const loader = {
   Location: require("./ctl/Location.js").default,
   SosNew: require("./ctl/SosNew.js").default,
   TagsNew: require("./ctl/TagsNew.js").default,
+  JsonViewer: require("./ctl/JsonViewer.js").default,
 };
 
 export default loader;

package/src/main.js

@@ -17,11 +17,13 @@ Vue.use(centaline, {
   // baseUrl: "http://10.88.22.46:17070/max-uplink-api/",
   // baseUrl: "http://10.88.22.46:9004/max-uplink-api/", 
   // baseUrl: "http://10.88.22.46:6060/onecard-api/",
-  baseUrl: "http://10.88.22.46:9999/service-api/", 
+  baseUrl: "http://10.88.22.46:9999/service-api/",
+  // baseUrl: "http://10.88.22.42:9999/service-api/",
   // baseUrl: "http://10.88.22.46:22324/service-api/v1/form/router",
   // baseUrl: "http://10.25.10.67:8999/service-api/v1/form/router",
   // baseUrl: "http://10.88.22.13:17070/max-uplink-api/",
   // baseUrl: "http://10.88.22.13:9004/max-uplink-api/",
+  // baseUrl: "http://10.88.22.13:7080/ibs-api/",
   // baseUrl:"http://szamaxbusiness-api-test2.centaline.com.cn/max-uplink-api/",
   // baseUrl: "http://10.88.22.13:7070/onecard-api/",
   // baseUrl: "http://10.6.1.163:9000/max-uplink-api/v1/form/router",
@@ -31,7 +33,6 @@ Vue.use(centaline, {
   // baseUrl: "http://10.25.10.69:8080/",
   // baseUrl: "https://ccesutest.centaline.com.cn/service-api/v1/form/router", 
   // baseUrl: "http://10.88.22.69:8080/", 
-  // baseUrl: "http://10.88.22.42:9999/service-api/",
   // baseUrl: "http://10.1.245.111:38908/service-api/",
   // baseUrl: "http://10.1.245.111:31574/service-api/",
   // baseUrl: "https://tjcptest.centaline.com.cn/", 
@@ -66,19 +67,19 @@ Vue.use(centaline, {
       alert("openAnnexVerify")
     },
     // 获取请求头
-    getRequestHeaders: function () {
+    getRequestHeaders: function (action) {
       return {
-        oldToken: '30bf66c7-b93e-47b4-9d6f-3a7e85c19ac0',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjksOwjAMBe-SdS05tuPE7PpJNhwCBWglWCHaSiDE3SniEGznjfTm5eb16HYuIUWltoc-sYKkYGDcF_ApGWYzjrE_CHOHKANQxAJSYgYTCYBoahaC0qAHJc6lbRW8bLuUbpNIBDS3QTJhZiHXuPFxczsfmXxCJG3cpS4_gMb6Bes83vfj8x9x1-Wy3eJ48seQJuCaziATTWDRIlSazCNrlerd-wMAAP__.93H7c7k4TLTqbKpozp0aTSU4U_WrQu3eS990iS-TCpw',
-        // authObject: '{token:"jiangzf-1955865005534617600",platform:"WEB"}',
+        // oldToken: '30bf66c7-b93e-47b4-9d6f-3a7e85c19ac0',
+        // token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjksOwjAMBe-SdS05tuPE7PpJNhwCBWglWCHaSiDE3SniEGznjfTm5eb16HYuIUWltoc-sYKkYGDcF_ApGWYzjrE_CHOHKANQxAJSYgYTCYBoahaC0qAHJc6lbRW8bLuUbpNIBDS3QTJhZiHXuPFxczsfmXxCJG3cpS4_gMb6Bes83vfj8x9x1-Wy3eJ48seQJuCaziATTWDRIlSazCNrlerd-wMAAP__.93H7c7k4TLTqbKpozp0aTSU4U_WrQu3eS990iS-TCpw',
+        // authObject: '{token:"T5067-1995406631567089664",platform:"WEB"}',
 
         // originalRequestURL: 'http://10.88.22.67:8080',
-        EstateInfo: '{"estateId":"1c581b7c-d629-4670-8a7c-6d622860bc58","estateName":"0%E9%87%91%E9%9A%85%E4%BA%91%E7%AD%91%E5%A4%A9%E6%B4%A5","estDeptPath":"009.014.001.001"}',
-        estateId: '',
-        appinfo:'{"appId":"8F184E91-2C73-45E3-B518-889491E07CDA","appName":"%E6%95%B0%E6%8D%AE%E9%A9%B1%E5%8A%A8%E7%AE%A1%E7%90%86%E5%90%8E%E5%8F%B0"}',
+        // EstateInfo: '{"estateId":"1c581b7c-d629-4670-8a7c-6d622860bc58","estateName":"0%E9%87%91%E9%9A%85%E4%BA%91%E7%AD%91%E5%A4%A9%E6%B4%A5","estDeptPath":"009.014.001.001"}',
+        // estateId: '',
+        // appinfo:'{"appId":"8F184E91-2C73-45E3-B518-889491E07CDA","appName":"%E6%95%B0%E6%8D%AE%E9%A9%B1%E5%8A%A8%E7%AE%A1%E7%90%86%E5%90%8E%E5%8F%B0"}',
 
-        authObject: '{"currentEstate":{"estateId":"241113105409757BFF2887A7472E99D2","estateName":"U%E7%89%88%E6%A5%BC%E7%9B%98%E6%8C%89%E7%82%B9%E4%BD%8D","estDeptPath":"001.200.063.001"},"platform":1,"osVersion":"","machineCode":"eeb8e2fc88b5bcbc2e4f297777142537","token":"","random":"aRYECc","time":1762502469262,"sign":"3619227d847afa9c7dad6788b4b069d0","systemSource":"CCESU","empNo":"hqxtgl","empId":"2411121446336B97FBEB7FD54905A903","clientVersion":"12.5","empName":"hq%E7%B3%BB%E7%BB%9F%E7%AE%A1%E7%90%86","roleName":"%E7%B3%BB%E7%BB%9F%E7%AE%A1%E7%90%86%E5%91%98","deptFullName":"%E6%9C%AA%E5%8C%B9%E9%85%8DCCHR%E4%B8%ADHROC%E9%83%A8%E9%97%A8%2F%E9%9B%86%E5%9B%A2IT%2FCCES%E7%BB%84"}',
-        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjdjMTVhNjcyLTI1OTAtNDJjOS05ZGY4LTlhMWZjOGU3NTc3NyJ9.l5OQ1vse_HTJrmceicNHas9HLyaLcyMHtoYqO8fQOqb8bmjMHoKlutaIjSIk_etQnWi85iF4JJh-ll2fwdkp-A',
+        authObject: '{"currentEstate":{"estateId":"2411131056106A1F68DFE6454976B1A9","estateName":"U%E7%89%88%E6%A5%BC%E7%9B%98%E6%8C%89%E6%A5%BC%E4%BB%B7","estDeptPath":"001.200.063.001"},"platform":1,"osVersion":"","machineCode":"eeb8e2fc88b5bcbc2e4f297777142537","token":"","random":"Kx2b5s","time":"2025-12-04 15:45:19","timestamp":1764834319180,"sign":"b61d76794e3732fe7d9628ca5a405877","systemSource":"CCESU","empNo":"hqxtgl","empId":"2411121446336B97FBEB7FD54905A903","clientVersion":"12.5","empName":"hq%E7%B3%BB%E7%BB%9F%E7%AE%A1%E7%90%86","roleName":"%E7%B3%BB%E7%BB%9F%E7%AE%A1%E7%90%86%E5%91%98","deptFullName":"%E6%9C%AA%E5%8C%B9%E9%85%8DCCHR%E4%B8%ADHROC%E9%83%A8%E9%97%A8%2F%E9%9B%86%E5%9B%A2IT%2FCCES%E7%BB%84"}',
+        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImFiMzUyNDA3LTE5MjktNDc0Zi1hMjE3LTE0ZDk1ZmI1ODQwNyJ9.h8C8KL7X4c8BTRwe15st_j06nH9s8A4ZphIyH7KXIp2a_VsdYpl1T4kuhSZ5xasftGc69LeWmn2N9CwKiyWUVg',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作