centaline-data-driven-v3 0.1.36 → 0.1.37

package/package.json

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

package/src/components/web/Form.vue

@@ -49,8 +49,11 @@
                         <!--tabs-->
                         <el-tabs v-if="model.isHorizontalLayout" v-model="activeName">
                             <template v-for="(item, index) in model.collapse" :key="index">
-                                <el-tab-pane :label="item.controlLabel" :name="index.toString()" :lazy="item.lazyLoad"
+                                <el-tab-pane :name="index.toString()" :lazy="item.lazyLoad"
                                     v-if="item.show !== false" :key="index">
+                                     <template #label>
+                                        <span v-html="item.controlLabel"></span>
+                                    </template>
                                     <el-row>
                                         <template v-for="(col, i) in model.collapseFields[index + 1]" :key="i">
                                             <div style="display: flex; flex: 0 0 100%;"

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

@@ -858,7 +858,7 @@ function setTableHeight() {
                 h8 = refPopupButton.value.offsetHeight + 21 | 0;
             }
 
-            let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - h7 - h8 - 16;
+            let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - h7 - h8 - 10;
             model.value.tableHeight = tableHeight < 40 ? 350 : tableHeight;
             nextTick(() => {
                 getScrollAttr();

package/src/loader/src/SearchTable.js

@@ -64,7 +64,7 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
         toolbarKey: 0,
         downloadUrl: '',
         _scripts: null,
-        OriginalColumns:source.content.columns?JSON.parse(JSON.stringify(source.content.columns)):[],
+        OriginalColumns: source.content.columns ? JSON.parse(JSON.stringify(source.content.columns)) : [],
         get scripts() {
             if (rtn._scripts !== null) {
                 return rtn._scripts;
@@ -107,6 +107,7 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
         get $rowCount() {
             return source.page.rowCount;
         },
+        $totalExecutionTime: '',
         // 表头描述文本（富文本）
         get listHeader() {
             return source.content.topText || '';
@@ -169,9 +170,9 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
         get mainBarWidth() {
             return source.content.mainBarWidth;
         },
-        set mainBarWidth(v) { 
+        set mainBarWidth(v) {
             source.content.mainBarWidth = v;
-        },  
+        },
         //用于移动端列表单元格的布局
         get cellLayout() {
             return source.content.cellLayout;
@@ -228,28 +229,34 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
         get footer() {
             if (typeof source.content.foot !== 'undefined') {
                 var data = source.content.foot;
-                var objs = data.match(/({{[^}]+}})/g);
-                if (objs) {
-                    objs.forEach((v1) => {
-                        data = data.replace(v1, this[v1.replace('{{', '').replace('}}', '')]);
-                    });
-                }
+                var searchTotalText = "";
                 if (this.$vue && this.$vue.searchStrat && this.$vue.searchEnd) {
                     let searchTotal = this.$vue.searchEnd - this.$vue.searchStrat;
                     if (searchTotal > 0) {
-                        if (data.indexOf('总耗时') > -1 || data.indexOf('總耗時') > -1) {
-                            data = data + " " + searchTotal + " 毫秒";
+                        if (data.indexOf("totalExecutionTime") > -1) {
+                            rtn.$totalExecutionTime = searchTotal;
                         }
                         else {
-                            data = data + " 总耗时 " + searchTotal + " 毫秒";
+                            if (data.indexOf('总耗时') > -1 || data.indexOf('總耗時') > -1) {
+                                searchTotalText = " " + searchTotal + " 毫秒";
+                            }
+                            else {
+                                searchTotalText = " 总耗时 " + searchTotal + " 毫秒";
+                            }
                         }
-
                     }
                 }
                 else {
                     data = data.replace("总耗时", "").replace("總耗時", "");
                 }
-                return data;
+                var objs = data.match(/({{[^}]+}})/g);
+                if (objs) {
+                    objs.forEach((v1) => {
+                        data = data.replace(v1, this[v1.replace('{{', '').replace('}}', '')]);
+                    });
+                }
+
+                return data + searchTotalText;
             }
             else {
                 return '';
@@ -805,7 +812,7 @@ function apiData(model, callback) {
                     model.flagMoreData = response.page.flagMoreData;
                 }
                 if (response.content.updateTableColumns && response.page.pageIndex <= 1
-                    &&JSON.stringify(model.OriginalColumns) !== JSON.stringify(response.content.columns)) {
+                    && JSON.stringify(model.OriginalColumns) !== JSON.stringify(response.content.columns)) {
                     model.columns = response.content.columns;
                     if (model.template) {
                         // var tempLoader = template.loader(model.template).default;
@@ -1043,7 +1050,7 @@ function getCurrentRowApiData(model, callback, rtnData, router) {
                     model.listFooter = response.content.bottomText;
                 }
                 if (response.content.updateTableColumns && response.page.pageIndex <= 1
-                    &&JSON.stringify(model.OriginalColumns) !== JSON.stringify(response.content.columns)
+                    && JSON.stringify(model.OriginalColumns) !== JSON.stringify(response.content.columns)
                 ) {
                     model.columns = response.content.columns;
                     if (model.template) {

package/src/main.js

@@ -65,7 +65,7 @@ app.use(centaline, {
         //获取请求头
         getRequestHeaders: function () {
             return {
-              authobject: '{EmpID:"Token_2db5b0a6-7156-462c-bf29-53731a255b32",MachineCode:"ae184643-f8e2-453c-a752-ba82612b592f",SSO_Token:"SSOToken_2db5b0a6-7156-462c-bf29-53731a255b32",Platform:"WEB"}',
+              authobject: '{EmpID:"Token_3d65f2f0-d6a3-432e-9af6-5c378b501b76",MachineCode:"ae184643-f8e2-453c-a752-ba82612b592f",SSO_Token:"SSOToken_3d65f2f0-d6a3-432e-9af6-5c378b501b76",Platform:"WEB"}',
                 //oldToken: 'd92d4a3b-2274-42e8-96f0-100ffb579b6e',
                 //authObject: '{token:"jiangzf-1958445358178844672",platform:"WEB"}',
                 //authObject: '{EmpID:"Token_4e09499b-4b76-46df-9ce5-5498d48ed062",MachineCode:"ae184643-f8e2-453c-a752-ba82612b592f",SSO_Token:"SSOToken_4e09499b-4b76-46df-9ce5-5498d48ed062",Platform:"WEB"}',

package/src/views/Form.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
-   <ct-form :api="'/Employee/readDetail'" :apiParam="apiParam"></ct-form>
+   <ct-form :api="'/propertyTender/readDetail'" :apiParam="apiParam"></ct-form>
     <!-- <ct-textbox :source="source"></ct-textbox> -->
 <ct-dialoglist ref="dialogList"></ct-dialoglist>
  </div>  

package/src/views/SearchList.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="app-search" style="width:100%;height:100%;position: fixed;">
-    <ct-searchlist :apiParam="apiParam" :searchConditionApi="'AdvancedSearch/GetLayoutOfSearchForPropertyPublish'"
-      :searchDataApi="'AdvancedSearch/GetListOfSearchModelForPropertyPublish'"></ct-searchlist>
+    <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/UIResourceList/getLayoutOfSearch'"
+      :searchDataApi="'/UIResourceList/getListOfSearchModel'"></ct-searchlist>
 
        <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/EmployeeMaternityList/getLayoutOfSearch'"
       :searchDataApi="'/EmployeeMaternityList/getListOfSearchModel'"></ct-searchlist> -->

package/src/views/Tree.vue

@@ -1,7 +1,7 @@
 <template>
    <div id="app-Tree" style="height:100%;position: fixed;width:100%;padding: 10px;">
       <ct-treelist :flagsearch="true" :apiParam="apiParam" :leftWidth="'280'"
-         :searchConditionApi="'/SystemUser/getSystemBusinessCategory'" :searchDataApi="'/SystemUser/getSystemBusinessCategory'"
+         :searchConditionApi="'/SystemParameterCatalogList/getLayoutOfSearch'" :searchDataApi="'/SystemParameterCatalogList/getListOfSearchModel'"
          @loaded="loaded"></ct-treelist>
       <!-- <ct-textbox :source="source"></ct-textbox> -->
       <ct-dialoglist></ct-dialoglist>