centaline-data-driven 1.5.13 → 1.5.15

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/release-log.md +17 -0
  3. package/src/Form.vue +2 -2
  4. package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue +2 -24
  5. package/src/centaline/dynamicTree/src/dynamicTree.vue +31 -2
  6. package/src/centaline/mixins/dynamicElement.js +3 -2
  7. package/src/main.js +9 -6
  8. package/wwwroot/static/centaline/centaline-data-driven.js +2 -2
  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.5.13",
3
+ "version": "1.5.15",
4
4
  "description": "ccai",
5
5
  "author": "hjc <3226136347@qq.com>",
6
6
  "private": false,
package/release-log.md ADDED
@@ -0,0 +1,17 @@
1
+ ## v1.5.15
2
+ 2023-05-15
3
+
4
+ Bug Fixes
5
+
6
+ 必填验证不显示错误信息bug处理
7
+
8
+ 先处理隐藏关系,再验证必填
9
+
10
+
11
+
12
+ ## v1.5.14
13
+ 2023-05-11
14
+
15
+ Bug Fixes
16
+
17
+ tree 树组件 当搜索返回无数据时，不执行搜索
package/src/Form.vue CHANGED
@@ -1,7 +1,7 @@
1
1
  <template>
2
2
  <div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
3
3
  <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
4
- <ct-form :api="'/salemattersmanage/agentcontractparameter/agentcontractparameterform'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
4
+ <ct-form :api="'/PropertyTranToActive/getLayoutOfNew'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
5
5
  <ct-dialog-list></ct-dialog-list>
6
6
  </div>
7
7
  </template>
@@ -12,7 +12,7 @@
12
12
  data() {
13
13
  return {
14
14
  apiParam:{
15
- "transactionId":"1643860874929975297","actionType":1,"pageOnly":true
15
+ "chanceID":"10155931","actionType":2
16
16
  },
17
17
  topHeight:10,
18
18
  }
package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue CHANGED
@@ -659,36 +659,14 @@ export default {
659
659
  this.pageRowMax = this.firstRow + this.displayRowNumber;
660
660
  this.pageRowMin = this.firstRow - this.displayRowNumber;
661
661
  this.pageRowMin = this.pageRowMin > 0 ? this.pageRowMin : 0;
662
- if ( this.pageRowMin > 0 && this.model.listData[this.pageRowMin].$rowspan === 0) {
662
+ if (this.pageRowMin > 0 && this.model.listData[this.pageRowMin].$rowspan === 0) {
663
663
  for (let i = this.pageRowMin; i >= 0; i--) {
664
664
  if (this.model.listData[i].$rowspan > 0) {
665
665
  this.pageRowMin = i;
666
666
  break;
667
667
  }
668
668
  }
669
- }
670
-
671
- //let index = this.model.listData.length - 1;
672
- //let isSet = false;
673
- //for (; index >= 0; index--) {
674
- // if (Math.abs(index - this.firstRow) < this.displayRowNumber || typeof (this.model.listData[index].$heigth) === 'undefined') {
675
- // //this.$set(this.model.listData[index], "$trLazyLoadingShow", true);
676
- // }
677
- // else {
678
- // if (index < this.firstRow && !isSet) {
679
- // if (this.model.listData[index].$rowspan === 0) {
680
- // this.$set(this.model.listData[index], "$trLazyLoadingShow", true);
681
- // continue;
682
- // }
683
- // else {
684
- // isSet = true;
685
- // this.$set(this.model.listData[index], "$trLazyLoadingShow", true);
686
- // continue;
687
- // }
688
- // }
689
- // this.$set(this.model.listData[index], "$trLazyLoadingShow", false);
690
- // }
691
- //}
669
+ }
692
670
  },
693
671
  setTableHeight() {
694
672
  var self = this;
package/src/centaline/dynamicTree/src/dynamicTree.vue CHANGED
@@ -2,7 +2,31 @@
2
2
  <div class='mytree' style="overflow:auto" :style="{height:treeHeight}">
3
3
  <el-tree class="tree-line" :props="defaultProps" :load="loadNode" :indent="0"
4
4
  :expand-on-click-node="false" @node-click="handleNodeClick" lazy ref="Tree">
5
+
6
+  <span class="slot-t-node" slot-scope="{ node, data }" @dblclick="editNode(data)">
7
+                                 <span v-show="!data.isEdit">
8
+                                     <span :class="[data.id>= 99 ? 'slot-t-node--label' : '']">{{node.label}}</span>
9
+                                     </span>
10
+                             <span v-show="data.isEdit">
11
+                                     <el-input class="slot-t-input" size="mini" autofocus   v-model="data.label"   :ref="'slotTreeInput'+data.id"   @blur.stop="NodeBlur(node,data)"   @keydown.native.enter="NodeBlur(node,data)"></el-input>
12
+                                 </span>
13
+                         </span>
5
14
  </el-tree>
15
+
16
+    <el-card class="box-card" ref="card" v-show="menuVisible">
17
+                     <div @click="addSameLevelNode()" v-show="firstLevel">
18
+                             <i class="el-icon-circle-plus-outline"></i>&nbsp;&nbsp;同级增加
19
+                         </div>
20
+                     <div class="add" @click="addChildNode()">
21
+                             <i class="el-icon-circle-plus-outline"></i>&nbsp;&nbsp;子级增加
22
+                         </div>
23
+                     <div class="delete" @click="deleteNode()">
24
+                             <i class="el-icon-remove-outline"></i>&nbsp;&nbsp;删除节点
25
+                         </div>
26
+                     <div class="edit" @click="editNode()">
27
+                             <i class="el-icon-edit"></i>&nbsp;&nbsp;修改节点
28
+                         </div>
29
+                 </el-card>
6
30
  </div>
7
31
  </template>
8
32
 
@@ -46,7 +70,7 @@ export default {
46
70
  search(m) {
47
71
  var self=this;
48
72
  var timer=null;
49
- if(self.loadComplate()&&self.searchStatus.length==0)
73
+ if(self.searchStatus.length==0)
50
74
  {
51
75
  clearTimeout(timer);
52
76
  self.searchStatus.push(1);
@@ -61,12 +85,17 @@ export default {
61
85
  },
62
86
  loadComplate(){
63
87
  var flag=false;
88
+ if(this.treeNode.childNodes.length>0)
89
+ {
64
90
  this.treeNode.childNodes.forEach((item, index) => {
65
91
  if(item.data.code==this.model.modeltree[index].code){
66
92
  flag=true;
67
93
  return;
68
94
  }
69
- });
95
+ });}else{
96
+ flag=true;
97
+ }
98
+
70
99
  return flag;
71
100
  },
72
101
  loadNode(node, resolve) { // 加载 树数据
package/src/centaline/mixins/dynamicElement.js CHANGED
@@ -102,9 +102,9 @@ export default {
102
102
  var self = this;
103
103
  setTimeout(() => {
104
104
  //通用校验
105
- self.validMessage="";
106
105
  var time = (new Date()).getTime();
107
106
  if (time > (self.inputTime + 500) || self.valid) {
107
+ self.validMessage="";
108
108
  if (this.model.validating) {
109
109
  let validtemp = this.model.validating('change', self.inputOld, self.inputOld1);
110
110
  self.valid = validtemp.valid;
@@ -124,6 +124,8 @@ export default {
124
124
  }
125
125
  }
126
126
 
127
+ self.$emit('change', e);
128
+
127
129
  if(!self.valid){
128
130
  return false;
129
131
  }
@@ -135,7 +137,6 @@ export default {
135
137
  self.changeOld1 = self.model.value1;
136
138
  }
137
139
 
138
- self.$emit('change', e);
139
140
  }, 1);
140
141
  },
141
142
 
package/src/main.js CHANGED
@@ -15,14 +15,16 @@ Vue.use(ElementUI, { size: 'mini'});
15
15
  Vue.config.productionTip = false;
16
16
  Vue.use(centaline, {
17
17
  // baseUrl: "http://10.88.22.46:7070/max-uplink-api/v1/form/router",
18
+ baseUrl: "http://10.88.22.13:17070/max-uplink-api/",
18
19
  // baseUrl: "http://10.6.1.163:9000/max-uplink-api/v1/form/router",
19
20
  // baseUrl: "http://10.25.10.67:9999/service-api/v1/form/router",
20
21
  // baseUrl: "http://10.25.10.67:8080/",
21
- baseUrl: "http://10.88.22.42:9999/service-api/v1/form/router",
22
+ // baseUrl: "http://10.88.22.42:9999/service-api/v1/form/router",
22
23
  // baseUrl: "http://10.88.22.69:8080/api/",
23
24
  // baseUrl: "http://10.88.22.40:8080/api/",
25
+ // baseUrl: "http://10.58.2.108:8080/",
24
26
  // baseUrl: "http://tjcptest.centaline.com.cn/",
25
- // flagRouterSelf: true,
27
+ flagRouterSelf: true,
26
28
  zindex: 999,
27
29
  showRequestSuccessMessage: true,
28
30
  showRequestErrorMessage: true,
@@ -50,14 +52,15 @@ Vue.use(centaline, {
50
52
  // 获取请求头
51
53
  getRequestHeaders: function () {
52
54
  return {
53
- oldToken: '632bca00-6b02-4627-8340-3d493b9b23d8',
54
- token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEOgjAURf_lzbwE2tfXPjag7eJHkAI1wckIJBrjv4tRN3fPcIez3HOHZRugBs1WmsAVdoYcElcGhWLErmQWHUutve_lA_6YLz3ZTpomWKSyZaRoAorqImoxrafQWB8YCsjXM9QVO81OKdYFzGl9CyPGvcS25Msh3_4Rd1rn_dZNo1TDkHDMlJCUGdCxOeKUbd6jnaSphMcTAAD__w.w-jPx1RbRqFVk6rTRjiBPh930YHPSoFvXl3XlLfTei0',
55
-
55
+ oldToken: 'af4e8a8b-4fa8-4c39-9464-ce571f45ca7d',
56
+ token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe_iOivZ8drrTef403CIKB8jhQqRRAIh7k4Q0NEzxSumeXMXyzaIRmhL7JNVEAw6QKsMMOYMQVrLOkutY-z4A_yYLx1SYO8TAcrWAmaTgOuQQbNpIyZPMVlRiXI9i0ZZh7WSinUl5n59C1VreoltKZdDuf0j7rTO-20pex2RAx76IyCrEfrREUwTT6yIRixSPJ4AAAD__w.wAUATW0EA3yAngNmuDunzbhZt8SG1DkJtTILBEkM8P8',
57
+ authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe_iOivZ8drrTef403CIKB8jhQqRRAIh7k4Q0NEzxSumeXMXyzaIRmhL7JNVEAw6QKsMMOYMQVrLOkutY-z4A_yYLx1SYO8TAcrWAmaTgOuQQbNpIyZPMVlRiXI9i0ZZh7WSinUl5n59C1VreoltKZdDuf0j7rTO-20pex2RAx76IyCrEfrREUwTT6yIRixSPJ4AAAD__w.wAUATW0EA3yAngNmuDunzbhZt8SG1DkJtTILBEkM8P8"}',
58
+
56
59
  originalRequestURL: 'http://10.88.22.67:8080',
57
60
  EstateInfo: '{"estateId":"20191114134322C29C9B83A84F192964","estateName":"C%E5%BE%A1%E6%9E%97%E5%B1%B1%E6%99%AF%E6%A5%BC"}',
58
61
  estateId: '20210729104021C49F04B55C50F6AF58',
59
62
 
60
- authObject: '{"currentEstate":{"estateId":"20191114134322C29C9B83A84F192964","estateName":"C%E5%BE%A1%E6%9E%97%E5%B1%B1%E6%99%AF%E6%A5%BC"},"platform":1,"osVersion":"","clientVersion":"","machineCode":"ce04f173da7df2e78a9da25595111387","token":"","random":"XNEYyu","time":1683686365201,"sign":"79be68006872c6a088eb49f7e3dab45a"}',
63
+ // authObject: '{"currentEstate":{"estateId":"20191114134322C29C9B83A84F192964","estateName":"C%E5%BE%A1%E6%9E%97%E5%B1%B1%E6%99%AF%E6%A5%BC"},"platform":1,"osVersion":"","clientVersion":"","machineCode":"ce04f173da7df2e78a9da25595111387","token":"","random":"XNEYyu","time":1683686365201,"sign":"79be68006872c6a088eb49f7e3dab45a"}',
61
64
  AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjYyOTk5ZDhjLTYwY2MtNGM0OS05MzM4LWY1MTBhNjI5OGVjYiJ9.A7lCMb4mBHjse6DlvFLVV5jEQSWzREtlbeZJ6StCW4kVyyRG4RlkhRl2FJvaBZEdtoEItI52IEgBsX4X_H1m4w',
62
65
  };
63
66
  },