centaline-data-driven 1.6.59 → 1.6.61

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.6.59",
+  "version": "1.6.61",
   "description": "ccai",
   "author": "hjc <3226136347@qq.com>",
   "private": false,

package/release-log.md

@@ -1,9 +1,33 @@
+# v1.6.61
+2026-02-09
+
+优化
+
+点击行显示侧边栏时，需要根据行路由配置附带左侧的查询条件
+
+树界面左侧树的查询条件支持可以传query参数
+
+# v1.6.60
+2025-12-29
+
+优化
+
+查询列表点击重置按钮清空值后，根据重置按钮上的【是否自动查询】来决定是否查询列表数据
+
+消息提示框添加Dialog对话框
+
+BUG
+
+表单toptip显示位置错误处理
+
 # v1.6.59
 2025-12-09
 
 优化
 
-分片上传添加请求头传到API,添加action传到前端
+分片上传添加请求头传到API
+
+分片上调用前端传获取请求头把当前上传地址传给前端，前端用于判断区分
 
 树界面右侧表单按钮样式调整
 

package/src/Form.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/salemanage/ContractByPoint/readDetail'" :apiParam="apiParam" :topHeight="topHeight" :documentHeight="'600px'"></ct-form>
+    <ct-form :api="'/api/third-dept-tran/transaction/edit'" :apiParam="apiParam" :topHeight="topHeight" :documentHeight="'600px'"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,7 +12,7 @@
     data() {
       return {
         apiParam:{
-          "commissionMode":1,"contractId":"251120105528E09634DE592A4DF8A326","propertyId":"250522090514A8BF158FF92A43479EA6","searchFields":{"fields":[{"fieldName1":"CompanyPath","groupName":"CompanyPath","operation":1,"searchDataType":1,"searchValue1":"001"},{"fieldName1":"EmpID","groupName":"EmpID","operation":1,"searchDataType":1,"searchValue1":"20201030134831BAA0AC5CDC9344B21E"},{"fieldName1":"DeptPath","groupName":"DeptPath","operation":1,"searchDataType":1,"searchValue1":"001.200.063.001"},{"fieldName1":"type","groupName":"type","operation":1,"searchDataType":1,"searchValue1":"left"},{"fieldName1":"EstateID","groupName":"EstateID","operation":2,"searchDataType":3,"searchValue1":"2411211358417B58943C6E954B35BB56"}]},"pageAttribute":{"pageIndex":1},"columnName":"contractDate","actionType":3
+          "originalTraId":"2010955673514090498","actionType":3,"pageStyle":2,"pageTitle":"修改成交单","pageOnly":true
         },
         topHeight:10,
       }

package/src/SearchList.vue

@@ -130,6 +130,13 @@
     <!-- ibs -->
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/EmployeeWorkLogList/ind/getLayoutOfSearch'" :searchDataApi="'/EmployeeWorkLogList/ind/getListOfSearchModel'"></ct-searchlist> -->
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/ApiAccessLogList/getLayoutOfSearch'" :searchDataApi="'/ApiAccessLogList/getListOfSearchModel'"></ct-searchlist> -->
+
+    <!-- XXL -->
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'comprehensive/ApplicationList/getLayoutOfSearch'" :searchDataApi="'comprehensive/ApplicationList/getList'"></ct-searchlist> -->
+    <!-- CDDD -->
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/formlist/getLayoutOfSearch'" :searchDataApi="'/formlist/getTableList'" :searchStatsApi="'/formlist/getListStats'"></ct-searchlist> -->
+    
+    
     <ct-dialog-list></ct-dialog-list>
   </div>
 </template>

package/src/SearchTree.vue

@@ -1,8 +1,8 @@
 <template>
   <div id="app-Tree" style="height:100%;position: fixed;width:100%;background: #c8c8c8;padding: 10px;">
     <ct-treelist :flagsearch="true" :apiParam="apiParam" :leftWidth="'280'"
-                 :searchConditionApi="'/system/menulist/getTreeLayoutOfSearch'"
-                 :searchDataApi="'/system/menulist/getTreeList'" @loaded="loaded"></ct-treelist>
+                 :searchConditionApi="'/ComprehensiveConfig/SysMenuConfigureTreeList/getLayoutOfSearch'"
+                 :searchDataApi="'/ComprehensiveConfig/SysMenuConfigureTreeList/getListOfSearchModel'" @loaded="loaded"></ct-treelist>
     <ct-dialog-list></ct-dialog-list>
   </div>
 </template>
@@ -14,7 +14,9 @@
     data() {
       return {
         isShowSearchlist: false,
-        apiParam: {}
+        apiParam: {
+          code: "MoFirstPage"
+        }
       }
     },
     methods: {

package/src/centaline/api/index.js

@@ -132,7 +132,7 @@ const api = {
       params = params.para;
     }
     else if (common.flagRouterSelf()) {
-      url = url + (url=='' || url.substr(-1)=='/'?'':'/') + params.action;
+      url = url + (url=='' || url.substr(-1)=='/'?'':'/') + (params.action && params.action[0]=='/'?params.action.slice(1):params.action);
       params = params.para;
     }
     return Axios.get(url, params, {
@@ -151,7 +151,7 @@ const api = {
       params = params.para;
     }
     else if (common.flagRouterSelf()) {
-      url = url + (url=='' || url.substr(-1)=='/'?'':'/') + params.action;
+      url = url + (url=='' || url.substr(-1)=='/'?'':'/') + (params.action && params.action[0]=='/'?params.action.slice(1):params.action);
       params = params.para;
     }
     return Axios.post(url, params, {
@@ -185,8 +185,14 @@ const api = {
 
     if (data.rtnCode === Enum.ReturnCode.Successful) {
       if (data.rtnMsg && common.getDataDrivenOpts().showRequestSuccessMessage) {
-        if (data.MsgAlertStyle && data.MsgAlertStyle == Enum.MessageAlertStyle.Dialog) {
-          common.confirm(data.rtnMsg, '信息', { confirmButtonText: '确定', flagShowcCancelButton: '0' });
+        if (data.messageAlertStyle && data.messageAlertStyle == Enum.MessageAlertStyle.Dialog) {
+          // common.confirm(data.rtnMsg, '信息', { confirmButtonText: '确定', flagShowcCancelButton: '0' });
+          Vue.prototype.$message({
+            message: response.data.rtnMsg,
+            type: 'success',
+            showClose:true,
+            duration: 0,
+          });
         }
         else {
           Vue.prototype.$message({
@@ -232,8 +238,14 @@ const api = {
     }
     else {
       if (response.data.rtnMsg && common.getDataDrivenOpts().showRequestErrorMessage) {
-        if (data.MsgAlertStyle && data.MsgAlertStyle == Enum.MessageAlertStyle.Dialog) {
-          common.confirm(data.rtnMsg, '信息', { confirmButtonText: '确定', flagShowcCancelButton: '0' });
+        if (data.messageAlertStyle && data.messageAlertStyle == Enum.MessageAlertStyle.Dialog) {
+          // common.confirm(data.rtnMsg, '信息', { confirmButtonText: '确定', flagShowcCancelButton: '0' });
+          Vue.prototype.$message({
+            message: response.data.rtnMsg,
+            type: 'error',
+            showClose:true,
+            duration: 0,
+          });
         }
         else {
           Vue.prototype.$message({
@@ -254,7 +266,7 @@ const api = {
       params = params.para;
     }
     else if (common.flagRouterSelf()) {
-      url = url + (url=='' || url.substr(-1)=='/'?'':'/') + params.action;
+      url = url + (url=='' || url.substr(-1)=='/'?'':'/') + (params.action && params.action[0]=='/'?params.action.slice(1):params.action);
       params = params.para;
     }
     let responseType=params.responseType || 'json';
@@ -287,7 +299,7 @@ const api = {
       params = params.para;
     }
     else if (common.flagRouterSelf()) {
-      url = url + (url=='' || url.substr(-1)=='/'?'':'/') + params.action;
+      url = url + (url=='' || url.substr(-1)=='/'?'':'/') + (params.action && params.action[0]=='/'?params.action.slice(1):params.action);
       params = params.para;
     }
     return Axios.post(url, params, {

package/src/centaline/dynamicForm/src/dynamicForm.vue

@@ -4,11 +4,10 @@
       <div ref="topTipRef" v-if="model.tip" class="tip-absolute">
         <span v-html="model.tip"></span>
       </div>
+      <div v-if="(!this.model.isHorizontalLayout || this.flagScroll) && model.tip" :style="{'height': (model.tip ? 30:0) + 'px'}"></div>
 
       <!--可根据场景判断显示el-card还是el-main-->
       <component :is="model.showTitle?'el-main':'el-card'">        
-        <div v-if="(!this.model.isHorizontalLayout || this.flagScroll) && model.tip" :style="{'height': (model.tip ? 24:0) + 'px'}"></div>
-        
         <div slot="header" class="clearfix" v-if="typeof model.title !== 'undefined' && model.flagShowTitle">
           <span style="font-weight:bold">{{model.title}}</span>
         </div>
@@ -1683,7 +1682,8 @@
   .tip-absolute {
     width:'100%';
     z-index: 100;
-    top: 0;
+    margin-top: -10px;
+    /* top : 44px; */
     left: 0;
     right: 0;
     position: absolute;

package/src/centaline/dynamicSearchList/src/dynamicSearchList.vue

@@ -457,6 +457,11 @@
               self.sideBarApiParam.columnGroupId=this.columnGroupId;
             }
 
+            if (self.$refs.table.model.rowSelectRouter.flagAttachSearchCondition) {
+              self.sideBarApiParam["searchFields"] = self.$refs.table.model.getSearchData();
+              self.sideBarApiParam["pageAttribute"] = self.$refs.table.model.pageData;
+            }
+
             self.sideBarApiParam.actionType = self.$refs.table.model.rowSelectRouter.actionType;
             self.detailKey = self.detailKey + 1;
           }

package/src/centaline/dynamicSearchList/src/dynamicSearchScreen.vue

@@ -128,7 +128,7 @@ import dynamicElement from '../../mixins/dynamicElement';
             break;
           case 'reset':
             this.model.reset();
-            if(this.validExcute()){
+            if(this.validExcute() && model.autoSearch){
               this.$emit('resetSearch', this.model);
             }
             break;

package/src/centaline/dynamicTree/src/dynamicSearchTree.vue

@@ -8,9 +8,10 @@
       @clickHandler="rolRouterClickHandler" 
       @loaded="screenload" style="padding-left: 11px;"
     ></ct-searchtreescreen>
-    <ct-tree
+    <ct-tree v-if="screenLoaded"
       ref="tree"
       :api="searchDataApi"
+      :searchModel="searchModel"
       @loaded="loaded"
       :style="{ height: treeHeight + 'px' }"
     ></ct-tree>
@@ -45,6 +46,8 @@ export default {
   data() {
     return {
       treeHeight: 0,
+      screenLoaded: false,
+      searchModel: null,
     };
   },
   methods: {
@@ -68,7 +71,9 @@ export default {
       } catch (e) {}
     }, 
     screenload(data) {
-     this.setTreeHeight();
+      this.setTreeHeight();
+      this.searchModel = this.$refs.treescreen.model;
+      this.screenLoaded = true;
     },
     rolRouterClickHandler(field) {
       this.routerClickHandler(field, {}, "");

package/src/centaline/dynamicTree/src/dynamicTree.vue

@@ -23,7 +23,8 @@ export default {
   mixins: [dynamicElement],
   props: {
     vmodel: Object,
-    api: String
+    api: String,
+    searchModel: Object,
   },
   data() {
     return {
@@ -52,7 +53,6 @@ export default {
     };
   },
   mounted() {
-
   },
   methods: {
     search(m) {
@@ -64,7 +64,6 @@ export default {
         self.searchStatus.push(1);
         self.treeNode.childNodes = [];
         self.searchComplate(m, undefined, self.treeResolve, true);
-
       }
       else {
         timer = setTimeout(() => {
@@ -86,8 +85,7 @@ export default {
       }
       return flag;
     },
-    loadNode(node, resolve) {        // 加载 树数据
-
+    loadNode(node, resolve) {        // 加载 树数据  
       let self = this;
       if (node.level === 0) {
         self.treeNode = node;
@@ -137,6 +135,9 @@ export default {
       var self = this;
       this.$nextTick(function () {
         if (typeof self.api !== 'undefined') {
+          if (!m && self.searchModel) {
+            m = self.searchModel;
+          }
           self.loaderObj.Tree(self.api, self.load, m, defaultSearch, resolve, firstLoad);
         }
       });
@@ -164,8 +165,7 @@ export default {
           self.$emit('loaded', newdata);
         });
       }
-    }
-    ,
+    },
     rightClick(event, object, Node) { // event、object该节点所对应的对象、节点对应的 Node、节点组件本身
 
       this.currentData = object  // 定义变量接收该节点所对应的对象
@@ -182,14 +182,20 @@ export default {
 
       }
       let actionIndex = 0;
-      if (this.model.actionRouter) {
-        this.model.actionRouter.forEach(v => {
-          if (this.currentData[v.rightField] == '1') {
-            this.menuVisible = true //显示增删改的div
-            actionIndex += 1;
-          }
-        })
-      }
+      // 1. 先过滤：只保留“有权”的路由
+      this.allowedRoutes = (this.model.actionRouter || []).filter(
+        v =>!v.rightField 
+        || this.currentData[v.rightField]==undefined 
+        || this.currentData[v.rightField]==null 
+        || this.currentData[v.rightField]=='1'
+      )
+
+      // 2. 再统一处理：有权的路由才显示菜单、累加计数
+      this.allowedRoutes.forEach(() => {
+        this.menuVisible = true   // 只要有一条有权就显示增删改 div
+        actionIndex += 1           // 统计有多少条有权路由
+      })
+
       document.addEventListener('click', this.foo)  // 监听事件鼠标点击事件，若点击则隐藏菜单
       //  获取树状图的高度
       let treeHeight = document.getElementById("mytree").offsetHeight;
@@ -510,5 +516,6 @@ export default {
 
 .box-menu .opertion:hover {
   color: var(--btnHoverRed);
+  background-color: var(--el-fill-color-light);
 }
 </style>

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

@@ -3,7 +3,7 @@
     <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">
-        <ct-searchtree :flagsearch="true" :searchConditionApi="searchConditionApi" :searchDataApi="searchDataApi"
+        <ct-searchtree :flagsearch="true" :searchConditionApi="searchConditionApi" :searchDataApi="searchDataApi" :screenPara="apiParam"
           :searchtreeHeight="searchtreeHeight" @loaded="loaded"></ct-searchtree>
        
       </el-aside>
@@ -13,13 +13,13 @@
           <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>
+            <ct-form :api="formApi" :api-param="rightApiParam" :width="width" :height="height"></ct-form>
           </div>
         </template>
         <template v-else>
           <div style="height: calc(100vh - 100px);">
             <ct-searchlist :searchConditionApi="searchTableConditionApi" :searchDataApi="searchTableDataApi"
-              :api-param="apiParam"></ct-searchlist>
+              :api-param="rightApiParam"></ct-searchlist>
           </div>
         </template>
 
@@ -42,6 +42,10 @@ export default {
     searchConditionApi: String,
     searchDataApi: String,
     leftWidth: String,
+    apiParam: {
+      type: Object,
+      default: () => {},
+    },
   },
   data() {
     return {
@@ -53,7 +57,7 @@ export default {
       heightPage: '',
       isShowMain: false,
       pageType: 'list',
-      apiParam: {},
+      rightApiParam: {},
       searchtreeHeight: 0,
       dataRowRouter: "",
       asideWidth: 200,
@@ -102,7 +106,7 @@ export default {
         delete defaultPara.width;
         delete defaultPara.height;
 
-        self.apiParam = defaultPara;
+        self.rightApiParam = defaultPara;
         self.$nextTick(() => {
           if (self.searchTableConditionApi || self.searchTableDataApi || self.formApi) {
             self.isShowMain = true;

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

@@ -15,7 +15,8 @@ const tree = function (source, callBack, searchModel, defaultSearchData, resolve
       },
       set source(v) {
         source = v;
-      }, get modeltree() {
+      }, 
+      get modeltree() {
         var treedata = [];
         source.content.rows.forEach(v => {
           v.getLayoutOfSearch = rtn.rowRouterKey("getLayoutOfSearch");

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

@@ -314,12 +314,17 @@ const Enum = {
     /**
      * json 数据查看控件
      */
-     JsonViewer:63,
+    JsonViewer:63,
 
-     /**
+    /**
       * Markdown 数据查看控件
       */
-     MarkdownViewer:64,
+    MarkdownViewer:64,
+    
+    /**
+     *  cron 表达式生成/选择
+     */
+    Cron:65,
 
   },
 

package/src/main.js

@@ -18,9 +18,11 @@ Vue.use(centaline, {
   // 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:20808/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.46: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/",
@@ -69,17 +71,18 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function (action) {
       return {
-        // oldToken: '30bf66c7-b93e-47b4-9d6f-3a7e85c19ac0',
+        oldToken: '1094eb9c-0ec7-4fcf-952f-7fc4258ca3b0',
         // 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"}',
+        // appinfo:'{"appId":"7e4d0521-4e26-4beb-8627-e76977ad8aa5","appName":"CCAI-PLUS"}',
+        // authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjkzNDU5NjFkLWM2NmItNDU0ZS1hMTE4LTUzMWRkMjliZTdmYyJ9.ehMpxkFnyTFlJQ_43SbCTGZZTMFht3isTj3gUKmNoJBWCV5X8ez5Z2AgT7vMBwmmG1FdEHWZTnJhIj0ox86bCA',
 
-        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',
+        AuthObject: '{"currentEstate":{},"platform":1,"osVersion":"","machineCode":"eeb8e2fc88b5bcbc2e4f297777142537","token":"","random":"Lveni9","time":"2026-02-09 15:13:36","timestamp":1770621216486,"sign":"","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 eyJhbGciOiJIUzI1NiJ9.eyJsb2dpbl91c2VyX2tleSI6IjRkNDhjNGZmLTlmYjEtNDVmYS04NGZiLTBlNDFiNjU5MjgzZiJ9.PmDLFXS9wPLh00OR_cz3X1m2aT_45mkp5qKcaxQv7Hc',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作