centaline-data-driven 1.6.46 → 1.6.48

package/package.json

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

package/release-log.md

@@ -1,3 +1,17 @@
+# v1.6.48
+2024-07-11
+
+BUG
+
+可搜索下拉单选框在表单表格行内编辑name不显示bug处理
+
+# v1.6.47
+2024-06-19
+
+优化
+
+多行表头的列表支持单行的表头固定
+
 # v1.6.46
 2024-06-13
 

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="'/estatemanage/estate/getEstateInfo'" :apiParam="apiParam" :topHeight="topHeight" :documentHeight="'600px'"></ct-form>
+    <ct-form :api="'/employee/readDetail'" :apiParam="apiParam" :topHeight="topHeight" :documentHeight="'600px'"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,7 +12,7 @@
     data() {
       return {
         apiParam:{
-          
+          "empId":"20221125090727B9ADEDF567D9130923","columnName":"empNameNo","actionType":3
         },
         topHeight:10,
       }

package/src/SearchList.vue

@@ -17,9 +17,11 @@
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/distribution/standing-book/layout'"  :searchDataApi="'/api/distribution/standing-book/list'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/commission-role-period/commissionRoleLayout'"  :searchDataApi="'/api/commission-role-period/commissionRoleList'"></ct-searchlist> -->
 
+    <ct-searchlist :apiParam="para" :searchConditionApi="'/compareList/getLayoutOfSearch'"  :searchDataApi="'/compareList/getTableList'"></ct-searchlist>
+
     <!-- CCES -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/salemattersmanage/agentuserlist/getLayoutOfSearch'"  :searchDataApi="'/salemattersmanage/agentuserlist/getList'"></ct-searchlist> -->
-    <ct-searchlist :apiParam="para" :searchConditionApi="'/contractmanage/ContractList/getLayoutOfSearch'"  :searchDataApi="'/contractmanage/ContractList/getList'"></ct-searchlist>
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/contractmanage/ContractList/getLayoutOfSearch'"  :searchDataApi="'/contractmanage/ContractList/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/sunexpensemanage/sunexpenserecordlist/getLayoutOfSearch'"  :searchDataApi="'/sunexpensemanage/sunexpenserecordlist/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/workwxmanage/WorkWXApplicationList/getLayoutOfSearch'"  :searchDataApi="'/workwxmanage/WorkWXApplicationList/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/salemattersmanage/UrgentResponsiblePersonList/getLayoutOfSearch'"  :searchDataApi="'/salemattersmanage/UrgentResponsiblePersonList/getList'"></ct-searchlist> -->

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

@@ -298,6 +298,7 @@
                   row[k].value = data[k].value;
                   row[k].value1 = data[k].value1;
                   row[k].text = data[k].text;
+                  row[k].name1 = data[k].name1;
                   if(data[k].type===27){
                     row[k].code1 = data[k].code1;
                   }

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

@@ -187,7 +187,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
               };
               if (col.show) {
                 //合并表头时暂不支持固定列
-                if (col.lock && !self.isMergeTitle) {
+                if (col.lock  && col.trOrder == 1 && col.colspan == 1) {
                   if (lockLeft) {
                     col.fixed = 'left';
                   } else {

package/src/main.js

@@ -19,6 +19,7 @@ Vue.use(centaline, {
   // baseUrl: "http://10.88.22.46:6060/onecard-api/",
   baseUrl: "http://10.88.22.46: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://szamaxbusiness-api-test2.centaline.com.cn/max-uplink-api/",
@@ -74,9 +75,10 @@ Vue.use(centaline, {
         // 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"}',
 
         authObject: '{"currentEstate":{"estateId":"241112160400DF3DC1EB63A14A1DBBF4","estateName":"%E6%B5%8B%E8%AF%95%E6%8C%89%E7%82%B9%E4%BD%8Dhq","estDeptPath":"001.200.063.001"},"platform":1,"osVersion":"","machineCode":"eeb8e2fc88b5bcbc2e4f297777142537","token":"","random":"6TnEgk","time":1749115399017,"sign":"3a50eb5f08b7bd75b2e7c99f32fa220e","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.eyJsb2dpbl91c2VyX2tleSI6ImU0Y2MyMmVjLTA2OGEtNDE1Yi1hNzY3LTE0ZDBkODBkNTMxMCJ9.Rqk2TL4Q8rPqFh8LvDP5nAMDzRCzVia_DnrSXi5qnV8NoIkcl-nrRS4DRS-yRapMS5h8biWjI1tcFsneDJNvFQ',
+        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjhhM2I4MmExLWE3NmUtNGRhYS1hMWRmLWFiMjllNjk5MTM1ZiJ9.VTSVB631fsh8-V_2p_a9WuM4yVU6VMxUhEq_2e5LCBMOEs-08OEiQQRYbReGl4RHOaIhnoBVqp5Sbk7otwrUnw',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作

package/wwwroot/static/centaline/centaline-data-driven.js

@@ -31044,6 +31044,7 @@ var ctSpan = { //临时的span组件对象，用于vue双向绑定，强制更
                 row[k].value = data[k].value;
                 row[k].value1 = data[k].value1;
                 row[k].text = data[k].text;
+                row[k].name1 = data[k].name1;
                 if (data[k].type === 27) {
                   row[k].code1 = data[k].code1;
                 }
@@ -59754,7 +59755,7 @@ var SearchTable = function SearchTable(data, callBack, searchModel, flagSearch,
               };
               if (col.show) {
                 //合并表头时暂不支持固定列
-                if (col.lock && !self.isMergeTitle) {
+                if (col.lock && col.trOrder == 1 && col.colspan == 1) {
                   if (lockLeft) {
                     col.fixed = 'left';
                   } else {
@@ -80150,7 +80151,7 @@ exports.push([module.i, ".el-collapse{border-top:none}.ct-collapse-item-title .e
 "use strict";
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_dynamicFormListTable_vue__ = __webpack_require__(189);
 /* unused harmony namespace reexport */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_2b48d737_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicFormListTable_vue__ = __webpack_require__(621);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_78c5e0b6_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicFormListTable_vue__ = __webpack_require__(621);
 function injectStyle (ssrContext) {
   __webpack_require__(619)
 }
@@ -80170,7 +80171,7 @@ var __vue_scopeId__ = null
 var __vue_module_identifier__ = null
 var Component = normalizeComponent(
   __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_dynamicFormListTable_vue__["a" /* default */],
-  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_2b48d737_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicFormListTable_vue__["a" /* default */],
+  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_78c5e0b6_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicFormListTable_vue__["a" /* default */],
   __vue_template_functional__,
   __vue_styles__,
   __vue_scopeId__,
@@ -80191,7 +80192,7 @@ var content = __webpack_require__(620);
 if(typeof content === 'string') content = [[module.i, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
-var update = __webpack_require__(3)("b0747d12", content, true, {});
+var update = __webpack_require__(3)("00f24f5e", content, true, {});
 
 /***/ }),
 /* 620 */