centaline-data-driven 1.6.52 → 1.6.53

package/package.json

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

package/release-log.md

@@ -1,3 +1,10 @@
+# v1.6.53
+2025-09-19
+
+优化
+
+列表添加调用客户端函数openSide可以打开右侧
+
 # v1.6.52
 2025-09-01
 

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="'/property/readPropertyUpdateDetail'" :apiParam="apiParam" :topHeight="topHeight" :documentHeight="'600px'"></ct-form>
+    <ct-form :api="'/paperandbank/ContractImport/getContractImportForm'" :apiParam="apiParam" :topHeight="topHeight" :documentHeight="'600px'"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,7 +12,7 @@
     data() {
       return {
         apiParam:{
-          "estateId":"241112160400DF3DC1EB63A14A1DBBF4","propertyId":"2411121629063ADD517E35104A4E98FD","actionType":3
+          "estateId":"241112160400DF3DC1EB63A14A1DBBF4","propertyId":"2411121629063ADD517E35104A4E98FD","actionType":2
         },
         topHeight:10,
       }

package/src/SearchList.vue

@@ -21,7 +21,7 @@
 
     <!-- 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> -->
@@ -38,6 +38,7 @@
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/estatemanage/estatlist/getLayoutOfSearch'"  :searchDataApi="'/estatemanage/estatlist/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/system/AreaList/getLayoutOfSearch'"  :searchDataApi="'/system/AreaList/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/roomtypelist/getLayoutOfSearch'"  :searchDataApi="'/roomtypelist/getList'"></ct-searchlist> -->
+    <ct-searchlist :apiParam="para" :searchConditionApi="'/salemattersmanage/priceuploadlist/getLayoutOfSearch'"  :searchDataApi="'//salemattersmanage/priceuploadlist/getList'"></ct-searchlist>
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/app/workbenchdetails/getContractLayoutOfSearch'"  :searchDataApi="'/app/workbenchdetails/getContractList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/selectionactivitymanage/EvaluationActWorksList/getLayoutOfSearch'"  :searchDataApi="'/selectionactivitymanage/EvaluationActWorksList/getListOfSearchModel'"></ct-searchlist> -->
     <!-- CCES -->

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

@@ -264,7 +264,7 @@
         clearTimeout(this.timeoutHandle)
       }
       if(this.$el.parentNode)this.$el.parentNode.removeChild(this.$el);
-      if (typeof this.model.scripts !== 'undefined') {
+      if(this.model && typeof this.model.scripts !== 'undefined') {
         this.model.scripts.formData.form = null;
         this.model.scripts.formData.excuteData = null;
         this.model.scripts.formData.fieldsDic = null;
@@ -275,8 +275,10 @@
       this.collapseFieldsRow=[];
       this.independentItem=[];
       this.isHorizontalLayout=false;
-      this.model.links = null;
-      this.model.buttons = null;
+      if(this.model){
+        this.model.links = null;
+        this.model.buttons = null;
+      }
       this.model = null;
       this.$el = null;
     },

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

@@ -17,7 +17,7 @@
       @toolbarClick="toolbarClickHandler" @refreshParent="refreshParentHandler"  :key="reloadKeyTable" @searchComplate="searchComplate" @closeSideBar="closeSideBar" 
       @rowClickHandle="rowClickHandle" @scrollHandle="scrollHandle" @refreshRowHandle="refreshRowHandle" @doClosePopoverHandle="doClosePopoverHandle" 
       @showTitle="showTitleHandler" @popupClickHandler="popupClickHandler" @simpleRouterRefreshHandler="simpleRouterRefreshHandler" @loadedError="tableLoadedError"
-      @drop="drop"   :dragStartItem="dragStartItem" :dragStartName="dragStartName" @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged"
+      @drop="drop" @openSideHandler="openSideHandler"  :dragStartItem="dragStartItem" :dragStartName="dragStartName" @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged"
       ></ct-searchtable>      
     </div>
     <div ref="sidebar" v-if="flagSideBar && flagSideBarOfData" 
@@ -445,6 +445,11 @@
           this.$refs.table.setTableHeight();
         }
       },
+      openSideHandler() {
+        if(this.sideBarStatus == 'close'){
+          this.$refs.sideMenu.clickHandler();
+        }
+      },
       closeSideHandler() {
         this.$refs.sideMenu.clickHandler();
       },

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

@@ -98,7 +98,7 @@ import dynamicElement from '../../mixins/dynamicElement';
     destroyed (){
       this.$off(); 
       if(this.$el.parentNode)this.$el.parentNode.removeChild(this.$el);
-      if(this.model.scripts){
+      if(this.model && this.model.scripts){
         this.model.scripts.formData.form = null;
         this.model.scripts.formData.excuteData = null;
         this.model.scripts.formData.fieldsDic = null;

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

@@ -338,7 +338,7 @@ export default {
   destroyed (){
     this.$off(); 
     if(this.$el.parentNode)this.$el.parentNode.removeChild(this.$el);
-    if (typeof this.model.scripts !== 'undefined' && this.model.scripts.formData) {
+    if(this.model && typeof this.model.scripts !== 'undefined' && this.model.scripts.formData) {
       this.model.scripts.formData.formTable = null;
       this.model.scripts.formData = null;
     }
@@ -1740,10 +1740,11 @@ export default {
         }
         //执行客户端脚本
         else {
-          // let parm={submitData:submitData,field:field}
-          // self.$common.excuteFunStr.call(self.model.scripts, field.action,parm);
-          // var fun = self.model.scripts.formData[action];
-          // fun(submitData,field);
+          if(field.action=='openSide'){
+            self.$emit('openSideHandler');
+            return;
+          }
+
           let title = field.pageTitle == undefined ? field.label : field.pageTitle;
           submitData = field.getActionPara(submitData).para;
           var fun = self.$common.getDataDrivenOpts().handler[action];

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

@@ -451,7 +451,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       nextPage: function (callback) {
         if (this.flagMoreData && this.flagMoreData !== false) {
           this.pageIndex++;
-          this.apiData(callback);
+          this.apiData(callback,true);
         } 
         else {
           if (typeof callback !== 'undefined') {
@@ -507,12 +507,12 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
         source.content.bottomText = v1;
       },
       isdisabledSearchScreen: false,
-      apiData(callback) {
+      apiData(callback,flagNext) {
         var self = this;
         if(self.$vue && self.$vue.searchStrat && self.$vue.searchEnd){
           self.$vue.searchStrat=Date.now();
         }
-        this.isLoading = true;
+        if(!flagNext)this.isLoading = true;
         if (self.isdisabledSearchScreen) {
           self.searchModel.setBtnLoading(true);
         }
@@ -531,7 +531,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
             if(self.$vue && self.$vue.searchStrat && self.$vue.searchEnd){
               self.$vue.searchEnd=Date.now();
             }
-            self.isLoading = false;
+            if(!flagNext)self.isLoading = false;
             if (response.rtnCode === Enum.ReturnCode.Successful) {              
               if (response.content.rows && response.content.rows.length > 0) {
                 // rtn.setRow(response.content.rows);

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

@@ -15,7 +15,7 @@ const SosNew = function (source, moreActionRouter) {
       return false;
     },
     get prefix() {
-      if (source.isList && source.placeholder1 && source.displayLabelAfterSelected && rtn.value) {
+      if (source.isList && source.placeholder1 && source.displayLabelAfterSelected) {
         return source.placeholder1 + ":";
       }
       return '';

package/src/main.js

@@ -77,8 +77,8 @@ Vue.use(centaline, {
         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":"CcTkw4","time":1756699289470,"sign":"805964fbed32f7be5e46e9903c4ec631","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.eyJsb2dpbl91c2VyX2tleSI6IjA1YTUzMWIxLTBiOTYtNDI5OS1hODU3LTI5NTRhOTE0OTE1NCJ9.MYBWLR7_cxK9P-zQoZyO2OLcQE_ucbatLk5iwQ_IJAGdTBsgiKEw8k_2YpK3kvi78FrvypYs49tEWDNOtAElmw',
+        authObject: '{"currentEstate":{"estateId":"2411211358417B58943C6E954B35BB56","estateName":"%E6%8C%89%E9%83%A8%E5%B0%B1%E7%8F%AD%EF%BC%88zhangtm%E6%B5%8B%E8%AF%95%E6%A5%BC%E7%9B%98%E6%88%90%E4%BA%A4%E6%95%A3%E5%8D%95%EF%BC%89","estDeptPath":"001.200.063.001"},"platform":1,"osVersion":"","machineCode":"eeb8e2fc88b5bcbc2e4f297777142537","token":"","random":"gSg0Kp","time":1758158269574,"sign":"d36e86247988f1069dc5361f73552fea","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.eyJsb2dpbl91c2VyX2tleSI6ImU0OGQwYjYwLTYzMTMtNDgzNy1hZTVhLWQxYmIxODQxYzBiOSJ9.Wp51nERfelBCIe9nq1QgA5GEKgOvcBP75_is6cpi6vZZx09eabFvpyjKLwS7a39Wiz7Wab0_nODdZ2UG3G8rkQ',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作

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

@@ -11275,7 +11275,7 @@ exports.default = _assign2.default || function (target) {
 "use strict";
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_dynamicSearchList_vue__ = __webpack_require__(155);
 /* unused harmony namespace reexport */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_715ec4d8_hasScoped_true_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchList_vue__ = __webpack_require__(641);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_39cca794_hasScoped_true_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchList_vue__ = __webpack_require__(641);
 function injectStyle (ssrContext) {
   __webpack_require__(522)
 }
@@ -11290,12 +11290,12 @@ var __vue_template_functional__ = false
 /* styles */
 var __vue_styles__ = injectStyle
 /* scopeId */
-var __vue_scopeId__ = "data-v-715ec4d8"
+var __vue_scopeId__ = "data-v-39cca794"
 /* moduleIdentifier (server only) */
 var __vue_module_identifier__ = null
 var Component = normalizeComponent(
   __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_dynamicSearchList_vue__["a" /* default */],
-  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_715ec4d8_hasScoped_true_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchList_vue__["a" /* default */],
+  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_39cca794_hasScoped_true_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchList_vue__["a" /* default */],
   __vue_template_functional__,
   __vue_styles__,
   __vue_scopeId__,
@@ -11342,7 +11342,7 @@ module.exports = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABX
 "use strict";
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_dynamicForm_vue__ = __webpack_require__(188);
 /* unused harmony namespace reexport */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_2489258b_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicForm_vue__ = __webpack_require__(622);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_1f060056_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicForm_vue__ = __webpack_require__(622);
 function injectStyle (ssrContext) {
   __webpack_require__(616)
 }
@@ -11362,7 +11362,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_dynamicForm_vue__["a" /* default */],
-  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_2489258b_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicForm_vue__["a" /* default */],
+  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_1f060056_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicForm_vue__["a" /* default */],
   __vue_template_functional__,
   __vue_styles__,
   __vue_scopeId__,
@@ -11444,7 +11444,7 @@ module.exports = {};
 "use strict";
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_dynamicSearchScreen_vue__ = __webpack_require__(158);
 /* unused harmony namespace reexport */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_6533649b_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchScreen_vue__ = __webpack_require__(538);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_071be134_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchScreen_vue__ = __webpack_require__(538);
 function injectStyle (ssrContext) {
   __webpack_require__(536)
 }
@@ -11464,7 +11464,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_dynamicSearchScreen_vue__["a" /* default */],
-  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_6533649b_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchScreen_vue__["a" /* default */],
+  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_071be134_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchScreen_vue__["a" /* default */],
   __vue_template_functional__,
   __vue_styles__,
   __vue_scopeId__,
@@ -13898,7 +13898,7 @@ var SosNew = function SosNew(source, moreActionRouter) {
       return false;
     },
     get prefix() {
-      if (source.isList && source.placeholder1 && source.displayLabelAfterSelected && rtn.value) {
+      if (source.isList && source.placeholder1 && source.displayLabelAfterSelected) {
         return source.placeholder1 + ":";
       }
       return '';
@@ -19626,6 +19626,11 @@ exports.f = __webpack_require__(29) ? gOPD : function getOwnPropertyDescriptor(O
         this.$refs.table.setTableHeight();
       }
     },
+    openSideHandler: function openSideHandler() {
+      if (this.sideBarStatus == 'close') {
+        this.$refs.sideMenu.clickHandler();
+      }
+    },
     closeSideHandler: function closeSideHandler() {
       this.$refs.sideMenu.clickHandler();
     },
@@ -20037,7 +20042,7 @@ exports.f = __webpack_require__(29) ? gOPD : function getOwnPropertyDescriptor(O
   destroyed: function destroyed() {
     this.$off();
     if (this.$el.parentNode) this.$el.parentNode.removeChild(this.$el);
-    if (this.model.scripts) {
+    if (this.model && this.model.scripts) {
       this.model.scripts.formData.form = null;
       this.model.scripts.formData.excuteData = null;
       this.model.scripts.formData.fieldsDic = null;
@@ -20775,7 +20780,7 @@ exports.f = __webpack_require__(29) ? gOPD : function getOwnPropertyDescriptor(O
 "use strict";
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_dynamicSearchTable_vue__ = __webpack_require__(160);
 /* unused harmony namespace reexport */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_30a27ceb_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchTable_vue__ = __webpack_require__(577);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_84ce4936_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchTable_vue__ = __webpack_require__(577);
 function injectStyle (ssrContext) {
   __webpack_require__(539)
 }
@@ -20795,7 +20800,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_dynamicSearchTable_vue__["a" /* default */],
-  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_30a27ceb_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchTable_vue__["a" /* default */],
+  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_84ce4936_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchTable_vue__["a" /* default */],
   __vue_template_functional__,
   __vue_styles__,
   __vue_scopeId__,
@@ -21165,7 +21170,7 @@ var Component = normalizeComponent(
   destroyed: function destroyed() {
     this.$off();
     if (this.$el.parentNode) this.$el.parentNode.removeChild(this.$el);
-    if (typeof this.model.scripts !== 'undefined' && this.model.scripts.formData) {
+    if (this.model && typeof this.model.scripts !== 'undefined' && this.model.scripts.formData) {
       this.model.scripts.formData.formTable = null;
       this.model.scripts.formData = null;
     }
@@ -22456,10 +22461,11 @@ var Component = normalizeComponent(
         }
         //执行客户端脚本
         else {
-            // let parm={submitData:submitData,field:field}
-            // self.$common.excuteFunStr.call(self.model.scripts, field.action,parm);
-            // var fun = self.model.scripts.formData[action];
-            // fun(submitData,field);
+            if (field.action == 'openSide') {
+              self.$emit('openSideHandler');
+              return;
+            }
+
             var title = field.pageTitle == undefined ? field.label : field.pageTitle;
             submitData = field.getActionPara(submitData).para;
             var fun = self.$common.getDataDrivenOpts().handler[action];
@@ -29506,7 +29512,7 @@ exports.clearImmediate = (typeof self !== "undefined" && self.clearImmediate) ||
       clearTimeout(this.timeoutHandle);
     }
     if (this.$el.parentNode) this.$el.parentNode.removeChild(this.$el);
-    if (typeof this.model.scripts !== 'undefined') {
+    if (this.model && typeof this.model.scripts !== 'undefined') {
       this.model.scripts.formData.form = null;
       this.model.scripts.formData.excuteData = null;
       this.model.scripts.formData.fieldsDic = null;
@@ -29517,8 +29523,10 @@ exports.clearImmediate = (typeof self !== "undefined" && self.clearImmediate) ||
     this.collapseFieldsRow = [];
     this.independentItem = [];
     this.isHorizontalLayout = false;
-    this.model.links = null;
-    this.model.buttons = null;
+    if (this.model) {
+      this.model.links = null;
+      this.model.buttons = null;
+    }
     this.model = null;
     this.$el = null;
   },
@@ -60091,7 +60099,7 @@ var SearchTable = function SearchTable(data, callBack, searchModel, flagSearch,
       nextPage: function nextPage(callback) {
         if (this.flagMoreData && this.flagMoreData !== false) {
           this.pageIndex++;
-          this.apiData(callback);
+          this.apiData(callback, true);
         } else {
           if (typeof callback !== 'undefined') {
             callback(false);
@@ -60145,12 +60153,12 @@ var SearchTable = function SearchTable(data, callBack, searchModel, flagSearch,
         source.content.bottomText = v1;
       },
       isdisabledSearchScreen: false,
-      apiData: function apiData(callback) {
+      apiData: function apiData(callback, flagNext) {
         var self = this;
         if (self.$vue && self.$vue.searchStrat && self.$vue.searchEnd) {
           self.$vue.searchStrat = Date.now();
         }
-        this.isLoading = true;
+        if (!flagNext) this.isLoading = true;
         if (self.isdisabledSearchScreen) {
           self.searchModel.setBtnLoading(true);
         }
@@ -60168,7 +60176,7 @@ var SearchTable = function SearchTable(data, callBack, searchModel, flagSearch,
           if (self.$vue && self.$vue.searchStrat && self.$vue.searchEnd) {
             self.$vue.searchEnd = Date.now();
           }
-          self.isLoading = false;
+          if (!flagNext) self.isLoading = false;
           if (response.rtnCode === __WEBPACK_IMPORTED_MODULE_6__lib_Enum__["default"].ReturnCode.Successful) {
             if (response.content.rows && response.content.rows.length > 0) {
               // rtn.setRow(response.content.rows);
@@ -77844,7 +77852,7 @@ var content = __webpack_require__(523);
 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)("f49956de", content, true, {});
+var update = __webpack_require__(3)("46b2e00e", content, true, {});
 
 /***/ }),
 /* 523 */
@@ -77855,7 +77863,7 @@ exports = module.exports = __webpack_require__(2)(false);
 
 
 // module
-exports.push([module.i, ".sidebar[data-v-715ec4d8]{z-index:1000;top:-1px;bottom:-1px;padding:0;width:auto;background-color:#fff;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);-webkit-box-shadow:0 6px 12px rgba(0,0,0,.18);box-shadow:0 6px 12px rgba(0,0,0,.18)}", ""]);
+exports.push([module.i, ".sidebar[data-v-39cca794]{z-index:1000;top:-1px;bottom:-1px;padding:0;width:auto;background-color:#fff;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);-webkit-box-shadow:0 6px 12px rgba(0,0,0,.18);box-shadow:0 6px 12px rgba(0,0,0,.18)}", ""]);
 
 // exports
 
@@ -78815,7 +78823,7 @@ var content = __webpack_require__(537);
 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)("0eabf016", content, true, {});
+var update = __webpack_require__(3)("6bc20055", content, true, {});
 
 /***/ }),
 /* 537 */
@@ -78852,7 +78860,7 @@ var content = __webpack_require__(540);
 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)("8084f83e", content, true, {});
+var update = __webpack_require__(3)("948f6ba0", content, true, {});
 
 /***/ }),
 /* 540 */
@@ -80272,7 +80280,7 @@ var content = __webpack_require__(617);
 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)("4b10dcde", content, true, {});
+var update = __webpack_require__(3)("fec1bdac", content, true, {});
 
 /***/ }),
 /* 617 */
@@ -80678,7 +80686,7 @@ var esExports = { render: render, staticRenderFns: staticRenderFns }
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.flagShow)?_c('div',{ref:"main",class:{'domDisabled':_vm.pageDisabled},staticStyle:{"width":"100%","height":"100%","display":"flex"}},[_c('div',{staticClass:"ct-search-list",style:({'height': _vm.pageHeightReal? _vm.pageHeightReal:'100%','width':_vm.searchWidth?_vm.searchWidth+'px':'100%'})},[(typeof _vm.title !== 'undefined' && _vm.showTitle)?_c('div',{staticClass:"clearfix",attrs:{"slot":"header"},slot:"header"},[_c('span',{staticStyle:{"font-weight":"bold"}},[_vm._v(_vm._s(_vm.title))])]):_vm._e(),_vm._v(" "),(_vm.searchCategoryApi)?_c('ct-searchcategory',{ref:"category",attrs:{"api":_vm.searchCategoryApi},on:{"loadedCategory":_vm.categoryLoaded,"loadedCategoryError":_vm.categoryLoadedError,"changeCategory":_vm.categorychange}}):_vm._e(),_vm._v(" "),_c('ct-searchscreen',{key:_vm.reloadKeyScreen,ref:"screen",attrs:{"api":_vm.searchConditionApi,"screenPara":_vm.screenPara,"categoryLoaded":_vm.loaded.categoryLoaded},on:{"loaded":_vm.screenLoaded,"resetSearch":function($event){_vm.resetSearch()},"search":function($event){_vm.search()},"saveShortcut":_vm.saveShortcut,"showTitle":_vm.showTitleScreenHandler}}),_vm._v(" "),_c('ct-searchtable',{key:_vm.reloadKeyTable,ref:"table",attrs:{"api":_vm.searchDataApi,"searchStatsApi":_vm.searchStatsApi,"from":_vm.from,"isIframe":_vm.isIframe,"documentHeight":_vm.documentHeight,"documentWidth":_vm.documentWidth,"flagPopupSearchlist":_vm.flagPopupSearchlist,"screenTop":_vm.screenTop,"flagAppMode":_vm.flagAppMode,"dragStartItem":_vm.dragStartItem,"dragStartName":_vm.dragStartName},on:{"loaded":_vm.tableLoaded,"toolbarClick":_vm.toolbarClickHandler,"refreshParent":_vm.refreshParentHandler,"searchComplate":_vm.searchComplate,"closeSideBar":_vm.closeSideBar,"rowClickHandle":_vm.rowClickHandle,"scrollHandle":_vm.scrollHandle,"refreshRowHandle":_vm.refreshRowHandle,"doClosePopoverHandle":_vm.doClosePopoverHandle,"showTitle":_vm.showTitleHandler,"popupClickHandler":_vm.popupClickHandler,"simpleRouterRefreshHandler":_vm.simpleRouterRefreshHandler,"loadedError":_vm.tableLoadedError,"drop":_vm.drop,"flagNotificationParentAfterContentChanged":_vm.flagNotificationParentAfterContentChanged}})],1),_vm._v(" "),(_vm.flagSideBar && _vm.flagSideBarOfData)?_c('div',{ref:"sidebar",staticClass:"sidebar",style:({'height': _vm.pageHeight? _vm.pageHeight:'100%','width':_vm.sideBarWidth+'px',right:_vm.sideBarRight+'px'})},[_c('ct-Detail',{key:_vm.detailKey,ref:"detail",attrs:{"api":_vm.sideBarApi,"apiParam":_vm.sideBarApiParam,"pageType":_vm.sideBarPageType,"searchConditionApi":_vm.sideBarSearchConditionApi,"searchStatsApi":_vm.sideBarSearchStatsApi,"searchDataApi":_vm.sideBarSearchDataApi,"listHeight":_vm.listHeight,"selectIndex":_vm.selectIndex,"rowCount":_vm.rowCount,"drowerClose":_vm.drowerClose},on:{"clickNextHandler":_vm.clickNextHandler,"clickPrevHandler":_vm.clickPrevHandler,"simpleRouterclickHandler":_vm.simpleRouterclickHandler,"closeSideHandler":_vm.closeSideHandler,"submit":_vm.submitHandler}}),_vm._v(" "),_c('ct-SearchSideMenu',{ref:"sideMenu",attrs:{"sideBarMenuRight":_vm.sideBarMenuRight,"sideBarStatus":_vm.sideBarStatus},on:{"sideMenuClickHandler":_vm.sideMenuClickHandler}})],1):_vm._e()]):_vm._e()}
+var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.flagShow)?_c('div',{ref:"main",class:{'domDisabled':_vm.pageDisabled},staticStyle:{"width":"100%","height":"100%","display":"flex"}},[_c('div',{staticClass:"ct-search-list",style:({'height': _vm.pageHeightReal? _vm.pageHeightReal:'100%','width':_vm.searchWidth?_vm.searchWidth+'px':'100%'})},[(typeof _vm.title !== 'undefined' && _vm.showTitle)?_c('div',{staticClass:"clearfix",attrs:{"slot":"header"},slot:"header"},[_c('span',{staticStyle:{"font-weight":"bold"}},[_vm._v(_vm._s(_vm.title))])]):_vm._e(),_vm._v(" "),(_vm.searchCategoryApi)?_c('ct-searchcategory',{ref:"category",attrs:{"api":_vm.searchCategoryApi},on:{"loadedCategory":_vm.categoryLoaded,"loadedCategoryError":_vm.categoryLoadedError,"changeCategory":_vm.categorychange}}):_vm._e(),_vm._v(" "),_c('ct-searchscreen',{key:_vm.reloadKeyScreen,ref:"screen",attrs:{"api":_vm.searchConditionApi,"screenPara":_vm.screenPara,"categoryLoaded":_vm.loaded.categoryLoaded},on:{"loaded":_vm.screenLoaded,"resetSearch":function($event){_vm.resetSearch()},"search":function($event){_vm.search()},"saveShortcut":_vm.saveShortcut,"showTitle":_vm.showTitleScreenHandler}}),_vm._v(" "),_c('ct-searchtable',{key:_vm.reloadKeyTable,ref:"table",attrs:{"api":_vm.searchDataApi,"searchStatsApi":_vm.searchStatsApi,"from":_vm.from,"isIframe":_vm.isIframe,"documentHeight":_vm.documentHeight,"documentWidth":_vm.documentWidth,"flagPopupSearchlist":_vm.flagPopupSearchlist,"screenTop":_vm.screenTop,"flagAppMode":_vm.flagAppMode,"dragStartItem":_vm.dragStartItem,"dragStartName":_vm.dragStartName},on:{"loaded":_vm.tableLoaded,"toolbarClick":_vm.toolbarClickHandler,"refreshParent":_vm.refreshParentHandler,"searchComplate":_vm.searchComplate,"closeSideBar":_vm.closeSideBar,"rowClickHandle":_vm.rowClickHandle,"scrollHandle":_vm.scrollHandle,"refreshRowHandle":_vm.refreshRowHandle,"doClosePopoverHandle":_vm.doClosePopoverHandle,"showTitle":_vm.showTitleHandler,"popupClickHandler":_vm.popupClickHandler,"simpleRouterRefreshHandler":_vm.simpleRouterRefreshHandler,"loadedError":_vm.tableLoadedError,"drop":_vm.drop,"openSideHandler":_vm.openSideHandler,"flagNotificationParentAfterContentChanged":_vm.flagNotificationParentAfterContentChanged}})],1),_vm._v(" "),(_vm.flagSideBar && _vm.flagSideBarOfData)?_c('div',{ref:"sidebar",staticClass:"sidebar",style:({'height': _vm.pageHeight? _vm.pageHeight:'100%','width':_vm.sideBarWidth+'px',right:_vm.sideBarRight+'px'})},[_c('ct-Detail',{key:_vm.detailKey,ref:"detail",attrs:{"api":_vm.sideBarApi,"apiParam":_vm.sideBarApiParam,"pageType":_vm.sideBarPageType,"searchConditionApi":_vm.sideBarSearchConditionApi,"searchStatsApi":_vm.sideBarSearchStatsApi,"searchDataApi":_vm.sideBarSearchDataApi,"listHeight":_vm.listHeight,"selectIndex":_vm.selectIndex,"rowCount":_vm.rowCount,"drowerClose":_vm.drowerClose},on:{"clickNextHandler":_vm.clickNextHandler,"clickPrevHandler":_vm.clickPrevHandler,"simpleRouterclickHandler":_vm.simpleRouterclickHandler,"closeSideHandler":_vm.closeSideHandler,"submit":_vm.submitHandler}}),_vm._v(" "),_c('ct-SearchSideMenu',{ref:"sideMenu",attrs:{"sideBarMenuRight":_vm.sideBarMenuRight,"sideBarStatus":_vm.sideBarStatus},on:{"sideMenuClickHandler":_vm.sideMenuClickHandler}})],1):_vm._e()]):_vm._e()}
 var staticRenderFns = []
 var esExports = { render: render, staticRenderFns: staticRenderFns }
 /* harmony default export */ __webpack_exports__["a"] = (esExports);