centaline-data-driven 1.2.68 → 1.2.71

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/package.json +1 -1
  2. package/src/centaline/dynamicDetail/src/dynamicDetail.vue +9 -2
  3. package/src/centaline/dynamicDetail/src/dynamicPropertyDetailRET.vue +17 -17
  4. package/src/centaline/dynamicDetail/src/dynamicPropertySimpleDetailRET.vue +1 -1
  5. package/src/centaline/dynamicForm/src/dynamicFormListTable.vue +8 -3
  6. package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue +11 -7
  7. package/src/centaline/loader/src/ctl/Detail.js +3 -0
  8. package/wwwroot/static/centaline/centaline-data-driven.js +3 -3
  9. package/wwwroot/static/centaline/centaline-data-driven.js.map +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "centaline-data-driven",
3
- "version": "1.2.68",
3
+ "version": "1.2.71",
4
4
  "description": "ccai",
5
5
  "author": "hjc <3226136347@qq.com>",
6
6
  "private": false,
package/src/centaline/dynamicDetail/src/dynamicDetail.vue CHANGED
@@ -1,8 +1,11 @@
1
1
  <template>
2
2
  <div>
3
- <ct-PropertyDetailOFI :api="api" :apiParam="apiParam" :parentModel="parentModel" class="ct-PropertyDetailOFI" v-if="pageType=='PropertyDetailOFI'"></ct-PropertyDetailOFI>
4
- <ct-PropertyDetailRET :api="api" :apiParam="apiParam" :parentModel="parentModel" class="ct-PropertyDetailRET" v-if="pageType=='PropertyDetailRET'"></ct-PropertyDetailRET>
3
+ <ct-PropertyDetailOFI :api="api" :apiParam="apiParam" :parentModel="parentModel" class="ct-PropertyDetailOFI" v-if="pageType=='PropertyDetailOFI'"
4
+ @loaded="loaded"></ct-PropertyDetailOFI>
5
+ <ct-PropertyDetailRET :api="api" :apiParam="apiParam" :parentModel="parentModel" class="ct-PropertyDetailRET" v-if="pageType=='PropertyDetailRET'"
6
+ @loaded="loaded"></ct-PropertyDetailRET>
5
7
  <ct-PropertySimpleDetailRET :api="api" :apiParam="apiParam" :selectIndex="selectIndex" :rowCount="rowCount" class="ct-PropertySimpleDetailRET"
8
+ @loaded="loaded"
6
9
  @clickNextHandler="clickNextHandler" @clickPrevHandler="clickPrevHandler" @simpleRouterclickHandler="simpleRouterclickHandler"
7
10
  v-if="pageType=='PropertySimpleDetailRET'" @closeSideHandler="closeSideHandler"></ct-PropertySimpleDetailRET>
8
11
  </div>
@@ -49,6 +52,10 @@
49
52
  simpleRouterclickHandler(field,data) {
50
53
  this.$emit('simpleRouterclickHandler',field,data);
51
54
  },
55
+ loaded(model) {
56
+ //通知父组件加载完成
57
+ this.$emit('loaded',model);
58
+ },
52
59
  }
53
60
  }
54
61
  </script>
package/src/centaline/dynamicDetail/src/dynamicPropertyDetailRET.vue CHANGED
@@ -27,28 +27,29 @@
27
27
  </div>
28
28
  <div class="head-but">
29
29
  <div>
30
- <component v-if="model.otherTradeActionRouter!==null" v-bind="model.otherTradeActionRouter" class="max-default"
30
+ <component v-if="model.otherTradeActionRouter!==null" v-bind="model.otherTradeActionRouter" class="max-default w93"
31
31
  :is="model.otherTradeActionRouter.is" :vmodel="model.otherTradeActionRouter" :api="model.optionApi" @click="fieldClickHandler(model.otherTradeActionRouter,$event)"></component>
32
- <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">
33
- <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">
32
+ <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">
33
+ <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;
34
+ margin-right: 13px;cursor: pointer">
34
35
  </div>
35
36
  <div class="mt5">
36
37
  <component class="max-report w93" v-if="model.actionRouters!==null && model.actionRouters[0]!==null"
37
38
  :is="model.actionRouters[0].is" :vmodel="model.actionRouters[0]" :api="model.optionApi" @click="fieldClickHandler(model.actionRouters[0],$event)"></component>
38
- <component class="max-report" v-if="model.actionRouters!==null && model.actionRouters[1]!==null"
39
+ <component class="max-report w93" v-if="model.actionRouters!==null && model.actionRouters[1]!==null"
39
40
  :is="model.actionRouters[1].is" :vmodel="model.actionRouters[1]" :api="model.optionApi" @click="fieldClickHandler(model.actionRouters[1],$event)"></component>
40
41
  </div>
41
42
  <div class="mt5">
42
- <button type="button" class="el-button el-button--info el-button--mini max-report rel w64"
43
+ <button type="button" class="el-button el-button--info el-button--mini max-report rel w93"
43
44
  v-if="model.actionRoutersMoreList !== null && model.actionRoutersMoreList.length>0">
44
45
  <img src="../../../assets/dian.png" alt="" class="report">
45
46
  <ul class="report-cont">
46
47
  <li v-for="(col, index) in model.actionRoutersMoreList" :key="index" v-if="col.show !== false">
47
- <component class="max-report" :is="col.is" :vmodel="col" :api="model.optionApi" @click="fieldClickHandler(col,$event)"></component>
48
+ <component class="max-report w93" :is="col.is" :vmodel="col" :api="model.optionApi" @click="fieldClickHandler(col,$event)"></component>
48
49
  </li>
49
50
  </ul>
50
51
  </button>
51
- <component v-else-if="model.actionRouters!==null && model.actionRouters.length===3" class="max-report"
52
+ <component v-else-if="model.actionRouters!==null && model.actionRouters.length===3" class="max-report w93"
52
53
  :is="model.actionRouters[2].is" :vmodel="model.actionRouters[2]" :api="model.optionApi" @click="fieldClickHandler(model.actionRouters[2],$event)">
53
54
  </component>
54
55
  </div>
@@ -358,6 +359,8 @@
358
359
  self.setDetailHeight();
359
360
  });
360
361
  });
362
+ //通知父组件加载完成
363
+ this.$emit('loaded', this.model);
361
364
  },
362
365
  loadFields() {
363
366
  var self = this;
@@ -552,7 +555,7 @@
552
555
  }
553
556
  else if (field.isFormPageInTab || field.isSearchPageInTab) {// 外部框架tab页打开
554
557
  submitData = field.getActionPara(submitData).para;
555
- self.$common.getDataDrivenOpts().handler.openTab(field.action, submitData, field.pageTitle);
558
+ self.$common.getDataDrivenOpts().handler.openTab(field.action, submitData, field.pageTitle, self.model,field.dialogWidth);
556
559
  }
557
560
  else if (field.isBrowserNewTab) {// 浏览器打开
558
561
  submitData = field.getActionPara(submitData).para;
@@ -598,31 +601,28 @@
598
601
  }
599
602
  },
600
603
  clickNextHandler() {
601
- if(this.parentModel){
602
- console.log(this.parentModel)
604
+ console.log(this.parentModel)
605
+ if(this.parentModel && this.parentModel.listData){
603
606
  let oldValue=this.parentModel.listData[this.parentModel.selectIndex][this.parentModel.primaryKey];
604
607
  this.parentModel.$vue.rowKeyDownHandle(null,1);
605
608
  let newValue=this.parentModel.listData[this.parentModel.selectIndex][this.parentModel.primaryKey];
606
609
  if(oldValue!==newValue){
607
610
  let parm=this.apiParam;
608
611
  parm[this.parentModel.primaryKey]=newValue;
609
- // this.loaderObj.Detail(this.api,parm, this.load);
610
- var fun =self.$common.getDataDrivenOpts().handler['refreshPropertyDetailRET'];
611
- fun(parm,parm.pageTitle,self.parentModel);
612
+ this.loaderObj.Detail(this.api,parm, this.load);
612
613
  }
613
614
  }
614
615
  },
615
616
  clickPrevHandler() {
616
- if(this.parentModel){
617
+ console.log(this.parentModel)
618
+ if(this.parentModel && this.parentModel.listData){
617
619
  let oldValue=this.parentModel.listData[this.parentModel.selectIndex][this.parentModel.primaryKey];
618
620
  this.parentModel.$vue.rowKeyDownHandle(null,-1);
619
621
  let newValue=this.parentModel.listData[this.parentModel.selectIndex][this.parentModel.primaryKey];
620
622
  if(oldValue!==newValue){
621
623
  let parm=this.apiParam;
622
624
  parm[this.parentModel.primaryKey]=newValue;
623
- // this.loaderObj.Detail(this.api,parm, this.load);
624
- var fun =self.$common.getDataDrivenOpts().handler['refreshPropertyDetailRET'];
625
- fun(parm,parm.pageTitle,self.parentModel);
625
+ this.loaderObj.Detail(this.api,parm, this.load);
626
626
  }
627
627
  }
628
628
  },
package/src/centaline/dynamicDetail/src/dynamicPropertySimpleDetailRET.vue CHANGED
@@ -345,7 +345,7 @@
345
345
  }
346
346
  else if (field.isFormPageInTab || field.isSearchPageInTab) {// 外部框架tab页打开
347
347
  submitData = field.getActionPara(submitData).para;
348
- self.$common.getDataDrivenOpts().handler.openTab(field.action, submitData, field.pageTitle);
348
+ self.$common.getDataDrivenOpts().handler.openTab(field.action, submitData, field.pageTitle, self.model,field.dialogWidth);
349
349
  }
350
350
  else if (field.isBrowserNewTab) {// 浏览器打开
351
351
  submitData = field.getActionPara(submitData).para;
package/src/centaline/dynamicForm/src/dynamicFormListTable.vue CHANGED
@@ -14,9 +14,9 @@
14
14
  <el-col :span="24">
15
15
  <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">
16
16
  <!--数据列-->
17
- <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">
17
+ <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">
18
18
  <template slot="header" slot-scope="scope">
19
- <div class="cell" :class="{'ct-table-required':v.required&&model.rows[0].edit&& model.rows[0].delete&&!model.tableDisabled}">
19
+ <div :class="[{'ct-table-required':v.required&&model.rows[0].edit&& model.rows[0].delete&&!model.tableDisabled},getHeadClass(v)]">
20
20
  {{v.label}}
21
21
  </div>
22
22
  </template>
@@ -34,7 +34,7 @@
34
34
  </el-table-column>
35
35
 
36
36
  <!--操作列-->
37
- <el-table-column label="操作" v-if="model.rows[0].edit || model.rows[0].delete || model.buttons.length > 0" header-align="center">
37
+ <el-table-column label="操作" v-if="model.rows[0].edit || model.rows[0].delete || model.buttons.length > 0">
38
38
  <template slot-scope="scope">
39
39
  <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)">
40
40
  {{scope.row.isSet?'保存':"修改"}}
@@ -105,6 +105,11 @@
105
105
  });
106
106
  },
107
107
  methods: {
108
+ getHeadClass(v) {
109
+ if (v.is === "ct-inputNumber") {
110
+ return 'ct-table-inputnumber';
111
+ }
112
+ },
108
113
  //添加账号
109
114
  addRow() {
110
115
  var app = this;
package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue CHANGED
@@ -927,9 +927,11 @@
927
927
  let self=this;
928
928
  let rowRouterShow=[];
929
929
  self.model.rowRouter.forEach((v) => {
930
- if (!v.rightField || row[v.rightField] == 1) {
931
- if(rowRouterShow.length<self.model.rowMenuDisplayCount){
932
- rowRouterShow.push(v);
930
+ if(v.show){
931
+ if (!v.rightField || row[v.rightField] == 1) {
932
+ if(rowRouterShow.length<self.model.rowMenuDisplayCount){
933
+ rowRouterShow.push(v);
934
+ }
933
935
  }
934
936
  }
935
937
  });
@@ -940,10 +942,12 @@
940
942
  let rowRouterDisplay=[];
941
943
  let i=0;
942
944
  self.model.rowRouter.forEach((v) => {
943
- if (!v.rightField || row[v.rightField] == 1) {
944
- i=i+1;
945
- if(i>self.model.rowMenuDisplayCount){
946
- rowRouterDisplay.push(v);
945
+ if(v.show){
946
+ if (!v.rightField || row[v.rightField] == 1) {
947
+ i=i+1;
948
+ if(i>self.model.rowMenuDisplayCount){
949
+ rowRouterDisplay.push(v);
950
+ }
947
951
  }
948
952
  }
949
953
  });
package/src/centaline/loader/src/ctl/Detail.js CHANGED
@@ -30,6 +30,9 @@ const Detail = function (source,para ,callBack) {
30
30
  _operationList:null,
31
31
  _operationRouters:[],
32
32
  _commissionList:null,
33
+ get title() {
34
+ return data.title;
35
+ },
33
36
  get fields1() {
34
37
  return data.fields1;
35
38
  },