centaline-data-driven 1.2.70 → 1.2.71

package/package.json

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

package/src/centaline/dynamicDetail/src/dynamicDetail.vue

@@ -1,8 +1,11 @@
 <template>
     <div>
-      <ct-PropertyDetailOFI :api="api" :apiParam="apiParam" :parentModel="parentModel" class="ct-PropertyDetailOFI" v-if="pageType=='PropertyDetailOFI'"></ct-PropertyDetailOFI>
-      <ct-PropertyDetailRET :api="api" :apiParam="apiParam" :parentModel="parentModel" class="ct-PropertyDetailRET" v-if="pageType=='PropertyDetailRET'"></ct-PropertyDetailRET>
+      <ct-PropertyDetailOFI :api="api" :apiParam="apiParam" :parentModel="parentModel" class="ct-PropertyDetailOFI" v-if="pageType=='PropertyDetailOFI'" 
+      @loaded="loaded"></ct-PropertyDetailOFI>
+      <ct-PropertyDetailRET :api="api" :apiParam="apiParam" :parentModel="parentModel" class="ct-PropertyDetailRET" v-if="pageType=='PropertyDetailRET'" 
+      @loaded="loaded"></ct-PropertyDetailRET>
       <ct-PropertySimpleDetailRET :api="api" :apiParam="apiParam" :selectIndex="selectIndex" :rowCount="rowCount" class="ct-PropertySimpleDetailRET"  
+      @loaded="loaded"
       @clickNextHandler="clickNextHandler" @clickPrevHandler="clickPrevHandler" @simpleRouterclickHandler="simpleRouterclickHandler"
       v-if="pageType=='PropertySimpleDetailRET'" @closeSideHandler="closeSideHandler"></ct-PropertySimpleDetailRET>
     </div>
@@ -49,6 +52,10 @@
       simpleRouterclickHandler(field,data) {
         this.$emit('simpleRouterclickHandler',field,data);
       },
+      loaded(model) {        
+        //通知父组件加载完成
+        this.$emit('loaded',model);
+      },
     }
   }
 </script>

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailRET.vue

@@ -27,28 +27,29 @@
             </div>           
             <div class="head-but">
               <div>
-                <component v-if="model.otherTradeActionRouter!==null" v-bind="model.otherTradeActionRouter" class="max-default"
+                <component v-if="model.otherTradeActionRouter!==null" v-bind="model.otherTradeActionRouter" class="max-default w93"
                 :is="model.otherTradeActionRouter.is" :vmodel="model.otherTradeActionRouter" :api="model.optionApi" @click="fieldClickHandler(model.otherTradeActionRouter,$event)"></component>
-                <img :class="{'domDisabled':parentModel && parentModel.selectIndex<=0}" @click="clickPrevHandler" src="../../../assets/T.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left:11px;cursor: pointer">
-                <img :class="{'domDisabled':parentModel && parentModel.listData && parentModel.selectIndex===parentModel.listData.length-1}" @click="clickNextHandler" src="../../../assets/B.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left:8px;cursor: pointer">
+                <img :class="{'domDisabled':parentModel && parentModel.selectIndex<=0}" @click="clickPrevHandler" src="../../../assets/T.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left: 20px;cursor: pointer">
+                <img :class="{'domDisabled':parentModel && parentModel.listData && parentModel.selectIndex===parentModel.listData.length-1}" @click="clickNextHandler" src="../../../assets/B.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;    margin-left: 15px;
+    margin-right: 13px;cursor: pointer">
               </div>
               <div class="mt5">
                 <component class="max-report w93" v-if="model.actionRouters!==null && model.actionRouters[0]!==null"
                 :is="model.actionRouters[0].is" :vmodel="model.actionRouters[0]" :api="model.optionApi" @click="fieldClickHandler(model.actionRouters[0],$event)"></component>
-                <component class="max-report" v-if="model.actionRouters!==null && model.actionRouters[1]!==null"
+                <component class="max-report w93" v-if="model.actionRouters!==null && model.actionRouters[1]!==null"
                 :is="model.actionRouters[1].is" :vmodel="model.actionRouters[1]" :api="model.optionApi" @click="fieldClickHandler(model.actionRouters[1],$event)"></component>                
               </div>
               <div class="mt5">
-                <button type="button" class="el-button el-button--info el-button--mini max-report rel w64"
+                <button type="button" class="el-button el-button--info el-button--mini max-report rel w93"
                 v-if="model.actionRoutersMoreList !== null && model.actionRoutersMoreList.length>0">
                   <img src="../../../assets/dian.png" alt="" class="report">
                   <ul class="report-cont">
                       <li v-for="(col, index) in model.actionRoutersMoreList" :key="index"  v-if="col.show !== false">
-                        <component class="max-report" :is="col.is" :vmodel="col" :api="model.optionApi" @click="fieldClickHandler(col,$event)"></component>
+                        <component class="max-report w93" :is="col.is" :vmodel="col" :api="model.optionApi" @click="fieldClickHandler(col,$event)"></component>
                       </li>
                   </ul>
                 </button>
-                <component v-else-if="model.actionRouters!==null && model.actionRouters.length===3" class="max-report"
+                <component v-else-if="model.actionRouters!==null && model.actionRouters.length===3" class="max-report w93"
                 :is="model.actionRouters[2].is" :vmodel="model.actionRouters[2]" :api="model.optionApi" @click="fieldClickHandler(model.actionRouters[2],$event)">
                 </component>
               </div>
@@ -358,6 +359,8 @@
             self.setDetailHeight();
           });
         });
+        //通知父组件加载完成
+        this.$emit('loaded', this.model);
       },
       loadFields() {
         var self = this;
@@ -552,7 +555,7 @@
             }
             else if (field.isFormPageInTab || field.isSearchPageInTab) {// 外部框架tab页打开
               submitData = field.getActionPara(submitData).para;
-              self.$common.getDataDrivenOpts().handler.openTab(field.action, submitData, field.pageTitle);
+              self.$common.getDataDrivenOpts().handler.openTab(field.action, submitData, field.pageTitle, self.model,field.dialogWidth);
             }
             else if (field.isBrowserNewTab) {// 浏览器打开
               submitData = field.getActionPara(submitData).para;
@@ -598,31 +601,28 @@
         }
       },
       clickNextHandler() {
-        if(this.parentModel){
-          console.log(this.parentModel)
+        console.log(this.parentModel)
+        if(this.parentModel && this.parentModel.listData){
           let oldValue=this.parentModel.listData[this.parentModel.selectIndex][this.parentModel.primaryKey];
           this.parentModel.$vue.rowKeyDownHandle(null,1);
           let newValue=this.parentModel.listData[this.parentModel.selectIndex][this.parentModel.primaryKey];
           if(oldValue!==newValue){
             let parm=this.apiParam;
             parm[this.parentModel.primaryKey]=newValue;
-            // this.loaderObj.Detail(this.api,parm, this.load);
-            var fun =self.$common.getDataDrivenOpts().handler['refreshPropertyDetailRET'];
-            fun(parm,parm.pageTitle,self.parentModel);            
+            this.loaderObj.Detail(this.api,parm, this.load);    
           }
         }
       },
       clickPrevHandler() {
-        if(this.parentModel){
+        console.log(this.parentModel)
+        if(this.parentModel && this.parentModel.listData){
           let oldValue=this.parentModel.listData[this.parentModel.selectIndex][this.parentModel.primaryKey];
           this.parentModel.$vue.rowKeyDownHandle(null,-1);
           let newValue=this.parentModel.listData[this.parentModel.selectIndex][this.parentModel.primaryKey];
           if(oldValue!==newValue){
             let parm=this.apiParam;
             parm[this.parentModel.primaryKey]=newValue;
-            // this.loaderObj.Detail(this.api,parm, this.load);
-            var fun =self.$common.getDataDrivenOpts().handler['refreshPropertyDetailRET'];
-            fun(parm,parm.pageTitle,self.parentModel);            
+            this.loaderObj.Detail(this.api,parm, this.load);   
           }
         }
       },

package/src/centaline/dynamicDetail/src/dynamicPropertySimpleDetailRET.vue

@@ -345,7 +345,7 @@
             }
             else if (field.isFormPageInTab || field.isSearchPageInTab) {// 外部框架tab页打开
               submitData = field.getActionPara(submitData).para;
-              self.$common.getDataDrivenOpts().handler.openTab(field.action, submitData, field.pageTitle);
+              self.$common.getDataDrivenOpts().handler.openTab(field.action, submitData, field.pageTitle, self.model,field.dialogWidth);
             }
             else if (field.isBrowserNewTab) {// 浏览器打开
               submitData = field.getActionPara(submitData).para;

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

@@ -14,9 +14,9 @@
         <el-col :span="24">
           <el-table size="mini" class="max-table--border" :data="model.tableData" :key="itemKey" border style="width: 100%" highlight-current-row :show-summary="model.showSummary" :summary-method="getSummaries">
             <!--数据列-->
-            <el-table-column v-for="(v,i) in model.rows[0].field" :key="i" :prop="v.id" :label="v.label" v-if="v.show !== false" header-align="center">
+            <el-table-column v-for="(v,i) in model.rows[0].field" :key="i" :prop="v.id" :label="v.label" v-if="v.show !== false">
               <template slot="header" slot-scope="scope">
-                <div class="cell" :class="{'ct-table-required':v.required&&model.rows[0].edit&& model.rows[0].delete&&!model.tableDisabled}">
+                <div  :class="[{'ct-table-required':v.required&&model.rows[0].edit&& model.rows[0].delete&&!model.tableDisabled},getHeadClass(v)]">
                   {{v.label}}
                 </div>
               </template>
@@ -34,7 +34,7 @@
             </el-table-column>
 
             <!--操作列-->
-            <el-table-column label="操作" v-if="model.rows[0].edit || model.rows[0].delete || model.buttons.length > 0" header-align="center">
+            <el-table-column label="操作" v-if="model.rows[0].edit || model.rows[0].delete || model.buttons.length > 0">
               <template slot-scope="scope">
                 <span v-if="scope.row.edit || scope.row.isSet" class="el-tag el-tag--info el-tag--mini" style="cursor: pointer;" @click="saveRow(scope.row,scope.$index,true)">
                   {{scope.row.isSet?'保存':"修改"}}
@@ -105,6 +105,11 @@
       });
     },
     methods: {
+      getHeadClass(v) {
+        if (v.is === "ct-inputNumber") {
+          return 'ct-table-inputnumber';
+        }
+      },
       //添加账号
       addRow() {
         var app = this;

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

@@ -30,6 +30,9 @@ const Detail = function (source,para ,callBack) {
         _operationList:null,
         _operationRouters:[],
         _commissionList:null,
+        get title() {
+          return data.title;
+      },
         get fields1() {
             return data.fields1;
         },