centaline-data-driven-v3 0.1.46 → 0.1.48

package/package.json

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

package/src/assets/commonWeb.css

@@ -1099,4 +1099,17 @@ body {
   align-items: center !important;
 }
 
+.el-message {
+  /* 核心属性：设置最大宽度（可根据需求调整，如 500px、80% 等） */
+  max-width: 50%;
+}
+
+.el-message .el-message__content{
+  /* 可选优化：保证超长文本自动换行，不溢出 */
+ max-width: 95%;
+  word-wrap: break-word;
+  white-space: pre-wrap;
+  /* 可选优化：让消息提示居中显示（搭配 max-width 更美观） */
+}
+
 /*elementPlus样式重置结束*/

package/src/components/app/Button.vue

@@ -5,6 +5,11 @@
             v-html="model.controlLabel">
 
         </span>
+        <div style="display: flex;justify-items: center;height: 100%;" v-else-if="model.isCheckbox">
+            <van-checkbox v-model="model.code1" shape="square" @change="clickHandle">
+                {{ model.controlLabel }}
+            </van-checkbox>
+        </div>
         <van-button v-else type="primary" v-bind="model.attrs" @click="clickHandle"
             :style="{ color: model.textColor ? model.textColor : '#ffffff', backgroundColor: model.bgColor ? model.bgColor : '#fa5252', borderColor: model.borderColor ? model.borderColor : '#fa5252' }"
             :disabled="model.disabled || model.locked" :size="size">

package/src/components/web/ComboBox.vue

@@ -21,7 +21,6 @@
                 <template #tag>
                     <template v-for="(v, i) in model.labelValue" :key="i">
                         <el-tag class="ml-2" type="info" disable-transitions :closable="!v.locked && !model.locked"
-                            :style="{ marginRight: i + 1 == model.labelValue.length ? '20px' : '' }"
                             @close="closeTag(v.code)">
                             {{ v.name }}</el-tag>
                     </template>

package/src/components/web/Form.vue

@@ -443,6 +443,9 @@ function changeHandler(field) {
 //组件点击操作
 function fieldClickHandler(field) {
     let data = Form.getRouterAndSubmitData(field, model.value);
+    if (field.isOpenFileDialog) {
+        data.router.fileList = field.fileList || [];
+    }
     clickHandler(data.router, data.submitData);
 }
 function clickHandler(field, submitData, formList) {
@@ -719,21 +722,21 @@ function updateFields(data) {
     Form.updateFields(data, model.value)
 }
 function setCss() {
-    if (props.topHeight > -1) {
-        minHeight.value = (document.documentElement.clientHeight - props.topHeight - 20) + 'px';
-    }
-    else if (props.dialogHeight) {
-        minHeight.value = (props.dialogHeight) + 'px';
-    }
-    else if (props.openType == 'tree') {
+    if (props.openType == 'tree') {
         if (refForm.value) {
             let parentDom = refForm.value.parentElement;
             minHeight.value = parentDom.clientHeight + 'px';
             refForm.value.style.height = minHeight.value
             refForm.value.style.overflowY = 'auto'
-            refForm.value.style.paddingBottom = '45px'
+            refForm.value.style.paddingBottom = '35px'
         }
     }
+    else if (props.topHeight > -1) {
+        minHeight.value = (document.documentElement.clientHeight - props.topHeight - 20) + 'px';
+    }
+    else if (props.dialogHeight) {
+        minHeight.value = (props.dialogHeight) + 'px';
+    }
     else if (props.openType == 'detail') {
         if (refForm.value) {
             let parentDom = refForm.value.parentElement;

package/src/components/web/SearchList/SearchTable.vue

@@ -15,7 +15,7 @@
         <div v-loading="operationLoading"></div>
 
         <div class="ct-tableParent" ref="refTableParent" v-bind="model.attrs" v-if="!isLoading && model"
-            :style="{ height:model.tableHeight + 'px', 'border-bottom': model.isLayout ? 'none' : '', 'border-top': model.isLayout ? 'none' : '', }"
+            :style="{ height: model.tableHeight + 'px', 'border-bottom': model.isLayout ? 'none' : '', 'border-top': model.isLayout ? 'none' : '', }"
             @scroll="scrollHandle($event)" @keydown.up="rowKeyDownHandle($event, 0)"
             @keydown.down="rowKeyDownHandle($event, 1)" tabindex="-1">
             <div class="ct-table-content" v-if="!model.isLayout">
@@ -404,7 +404,7 @@ function searchComplate(m, defaultSearch) {
 //初始化数据
 function load(data) {
     model.value = data;
-    model.value.$vue = { searchStrat, searchEnd, downloadUrl, loadStats, setTableHeight, updateCurrentRow, doAction, itemKey, refreshTableColumns, calculatingRowHeight, emit, operationLoading, getPage, toolbarClickHandler };
+    model.value.$vue = { searchStrat, searchEnd, downloadUrl, loadStats, setTableHeight, updateCurrentRow, doAction, itemKey, refreshTableColumns, calculatingRowHeight, emit, operationLoading, getPage, toolbarClickHandler,closeTabThen };
     model.value.isIframe = props.isIframe
     model.value.isPageInSideBar = false
     model.value.columnName = null
@@ -1642,6 +1642,12 @@ function getValueCaseInsensitive(obj, key) {
     const foundKey = Object.keys(obj).find(k => k.toLowerCase() === searchKey);
     return foundKey ? obj[foundKey] : undefined;
 }
+function closeTabThen(ev) {
+    if (SearchTable.checkCloseTabThen(ev.notification)) {
+        doAction(ev);
+    }
+}
+
 
 defineExpose({
     model,

package/src/components/web/SearchList.vue

@@ -399,6 +399,9 @@ function rowClickHandle() {
             }
             if (refTable.value.model.columnGroupId) {
                 sideBarApiParam.value.columnGroupId = refTable.value.model.columnGroupId;
+            }
+             if (refTable.value.model.rowSelectRouter.flagAttachSearchCondition) {
+              sideBarApiParam.value["searchFields"] = refTable.value.model.getSearchData();
             }
             sideBarApiParam.value.actionType = refTable.value.model.rowSelectRouter.actionType;
             detailKey.value = detailKey.value + 1;

package/src/loader/src/Field.js

@@ -924,12 +924,24 @@ const Base = function (source, moreActionRouter, formLabelPlacement) {
         //搜索组件宽度
         get listBind() {
             let bind = {};
-            bind = {
-                style: {
-                    'width': source.width + 'px',
-                    display: 'inline-table'
+            if (this.controlType === Enum.ControlType.MultiSelectNoSearch
+                || this.controlType === Enum.ControlType.MultiSelectWithSearch) {
+                bind = {
+                    style: {
+                        'min-width': source.width + 'px',
+                        display: 'inline-table'
+                    }
+                }
+            }
+            else {
+                bind = {
+                    style: {
+                        'width': source.width + 'px',
+                        display: 'inline-table'
+                    }
                 }
             }
+
             return bind;
         },
         //获取控件fieldName1对应的code1

package/src/loader/src/Form.js

@@ -835,10 +835,11 @@ function loadFromModel(source, isFormList) {
             if (f.table) {
               let rtnFormArr = [];
               var tempListData = f.table.model.getSelectRowData({ isMulti: f.table.model.isMulti });
-              for (let i = 0; i < tempListData.length; i++) {
-                rtnFormArr.push(tempListData[i]);
+              if (tempListData) {
+                for (let i = 0; i < tempListData.length; i++) {
+                  rtnFormArr.push(tempListData[i]);
+                }
               }
-
               let rtnObj = {};
               Object.defineProperty(rtnObj, f.fieldName1, {
                 get: function () {

package/src/loader/src/Label.js

@@ -23,34 +23,28 @@ const Label = function (source) {
     let rtn = {
         flagJson: false,
         get value() {
-            if (source.name1) {
-                 return source.name1;
-            }
-            else {
-                if (source.code1) {
-                    try {
-                        let _value = []
-                        var obj = JSON.parse(source.code1)
-                        if (typeof obj == 'object' && obj) {
-                            obj.forEach((v) => {
-                                if (!v.flagDeleted) {
-                                    _value.push(v.name);
-                                }
-                            });
-                            rtn.flagJson = true;
-                            return _value;
-                        }
+            if (source.code1) {
+                try {
+                    let _value = []
+                    var obj = JSON.parse(source.code1)
+                    if (typeof obj == 'object' && obj) {
+                        obj.forEach((v) => {
+                            if (!v.flagDeleted) {
+                                _value.push(v.name);
+                            }
+                        });
+                        rtn.flagJson = true;
+                        return _value;
+                    }
 
-                    } catch (e) {
+                } catch (e) {
 
-                    }
                 }
-                let _value = [];
-                var joinChar = source.joinChar == undefined ? '' : source.joinChar;
-                _value = getFileNameVal(source);
-                return _value.join(joinChar);
             }
-
+            let _value = [];
+            var joinChar = source.joinChar == undefined ? '' : source.joinChar;
+            _value = getFileNameVal(source);
+            return _value.join(joinChar);
         }
     };
     rtn = base.copy(source, rtn);

package/src/loader/src/SearchTable.js

@@ -1231,6 +1231,15 @@ function getAction(api, submitData, callback) {
             }
         });
 }
+function checkCloseTabThen(notification) {
+    var rtn = false;
+    if (notification == Enum.ActionType.CloseTabThenDelete
+        || notification == Enum.ActionType.CloseTabThenNew
+        || notification == Enum.ActionType.CloseTabThenUpdate) {
+        rtn = true;
+    }
+    return rtn;
+}
 const SearchTable = {
     loadSearchTableApi,
     loadSearchTableModel,
@@ -1244,6 +1253,7 @@ const SearchTable = {
     clearSort,
     getCurrentRowApiData,
     doAction,
-    getAction
+    getAction,
+    checkCloseTabThen
 };
 export default SearchTable;

package/src/main.js

@@ -22,7 +22,7 @@ for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
 
 app.use(centaline, {
     //baseUrl: "http://10.88.22.13:7080/ibs-api/",
-    baseUrl:"http://10.88.22.13:7070/onecard-api/",
+    baseUrl:"http://10.88.22.42:20403/service-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/IBS.Mvc/api/",
@@ -66,8 +66,8 @@ app.use(centaline, {
         getRequestHeaders: function () {
             return {
                 
-             //AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyaWQiOiIyNTEyMTUxNzQyMTg5QzI4MTgwRDkxRTk0MDhEOTA0QSIsImxvZ2luX3VzZXJfa2V5IjoiN2MzYzNjNjAtNWVjMy00MzdkLWExMDYtOWYxZTMwYjU0Mjg2In0.daG9mS98Gg8KmHSUjYHktMcO2Jk7SVtCcqm2sRB0I8Y2N0TuonIrVUDcHdNdDiuD3v6qO_f010tQWlBsAQ1dqg',
-              authobject: '{token:"wufw-2008030035520409600",platform:"WEB"}',
+             AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjRkNjY4MGIwLWZkODYtNGUzZi04ZGIzLThiNGM1M2FhZjdjZCJ9.s_xUROsWS_ALjTvn094XqDgBE6jgcQTx6LyjWgSBHODsKWs3PPPoCZ1NT4A74-9nhcJwehekRaJiggmwp4Q9bA',
+              authobject: '{"currentEstate":{},"platform":1,"osVersion":"","clientVersion":"","machineCode":"d54f7a41920fa955f1d111f63daa33de","token":"","random":"VJmPc","time":1769742645004,"sign":""}',
               //authobject: '{EmpID:"Token_946d56e1-7972-4382-9d10-4a72496aab39",MachineCode:"ae184643-f8e2-453c-a752-ba82612b592f",SSO_Token:"SSOToken_946d56e1-7972-4382-9d10-4a72496aab39",Platform:"WEB"}',
                 //oldToken: 'd92d4a3b-2274-42e8-96f0-100ffb579b6e',
                 //authObject: '{token:"jiangzf-1958445358178844672",platform:"WEB"}',

package/src/utils/request.js

@@ -65,12 +65,9 @@ const request = {
     }
 
     //关闭tab页
-    if (data.notification === Enum.ActionType.CloseTab
-      || data.notification === Enum.ActionType.CloseTabThenDelete
-      || data.notification === Enum.ActionType.CloseTabThenNew
-      || data.notification === Enum.ActionType.CloseTabThenUpdate) {
+    if (data.notification === Enum.ActionType.CloseTab) {
       if (typeof common.getDataDrivenOpts().handler.closeTab === 'function') {
-        //common.getDataDrivenOpts().handler.closeTab();
+        common.getDataDrivenOpts().handler.closeTab();
       }
     }
 

package/src/views/Form.vue

@@ -1,10 +1,11 @@
 <template>
-  <div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
-   <ct-form :api="'/employee/getLayoutOfPwd'" :apiParam="apiParam"></ct-form>
+  <div
+      :style="{ 'width': '800px' , 'height': '300px', margin: 'auto', 'position': 'relative'}">
+   <ct-form :api="'/Order/readDetail'" :apiParam="apiParam" :openType="'tree'"></ct-form>
     <!-- <ct-textbox :source="source"></ct-textbox> -->
 <ct-dialoglist ref="dialogList"></ct-dialoglist>
  </div>  
 </template>
 <script lang="ts" setup>
- const apiParam={actionType: 3,empId: "260104160031E4FF8D4434FD4400BAC9"}
+ const apiParam={"orderId":"2016080708371660800","actionType":3,"pageStyle":2,"pageOnly":true,"pageWidth":800,"pageFromFullPath":"/ord/orderList"}
 </script>

package/src/views/SearchList.vue

@@ -1,8 +1,8 @@
 <template>
   <div id="app-search" style="width:100%;height:100%;position: fixed;">
-    <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyTenderList/getLayoutOfSearch'"
+    <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/ccesmanage/AppUseSummaryList/getLayoutOfSearch'"
       
-    :searchDataApi="'/propertyTenderList/getListOfSearchModel'"></ct-searchlist>
+    :searchDataApi="'/ccesmanage/AppUseSummaryList/getList'"></ct-searchlist>
 
       <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyTenderList/getLayoutOfSearch'"