centaline-data-driven 1.5.12 → 1.5.14

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 +6 -0
  3. package/src/Form.vue +1 -1
  4. package/src/centaline/dynamicTree/src/dynamicTree.vue +31 -2
  5. package/src/centaline/dynamicViewerFile/src/dynamicViewerFile.vue +1 -1
  6. package/src/centaline/loader/src/ctl/FormList.js +2 -2
  7. package/src/main.js +4 -4
  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.5.12",
3
+ "version": "1.5.14",
4
4
  "description": "ccai",
5
5
  "author": "hjc <3226136347@qq.com>",
6
6
  "private": false,
package/release-log.md ADDED
@@ -0,0 +1,6 @@
1
+ ## v1.5.14
2
+ 2023-05-11
3
+
4
+ Bug Fixes
5
+
6
+ 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="'/third-dept-tran/tran-comm-adjust/assign-changed'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
4
+ <ct-form :api="'/salemattersmanage/agentcontractparameter/agentcontractparameterform'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
5
5
  <ct-dialog-list></ct-dialog-list>
6
6
  </div>
7
7
  </template>
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/dynamicViewerFile/src/dynamicViewerFile.vue CHANGED
@@ -46,7 +46,7 @@
46
46
  <!--Photo-->
47
47
  <template v-else-if="itemFile.mediaTypeID == '2'">
48
48
  <ct-viewerImage ref="viewerImage"
49
- :imgUrl="resultObject+'/'+displayAreaWidth+'/'+displayAreaHeight"
49
+ :imgUrl="resultObject+'/'+displayAreaWidth+'/'+displayAreaHeight+'?FlagC=0'"
50
50
  :rotate="rotate"></ct-viewerImage>
51
51
  </template>
52
52
  <!--ThreeDimensional-->
package/src/centaline/loader/src/ctl/FormList.js CHANGED
@@ -519,8 +519,8 @@ const FormList = function (source, master) {
519
519
  source.rows.splice(1, source.rows.length-1);
520
520
  rtn._rows.splice(1, rtn._rows.length-1);
521
521
  if(newRows.length>0){
522
- source.rows.push(newRows);
523
- rtn._rows.push(newRows);
522
+ Array.prototype.push.apply(source.rows,newRows);
523
+ Array.prototype.push.apply(rtn._rows,newRows);
524
524
  }
525
525
  }
526
526
  },
package/src/main.js CHANGED
@@ -51,14 +51,14 @@ Vue.use(centaline, {
51
51
  getRequestHeaders: function () {
52
52
  return {
53
53
  oldToken: '632bca00-6b02-4627-8340-3d493b9b23d8',
54
- token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEOgjAURf_lzbwE2tfXPjag7eJHkAI1wckIJBrjv4tRN3fPcIez3HOHZRugBs1WmsAVdoYcElcGhWLErmQWHUutve_lA_6YLz3ZTpomWKSyZaRoAorqImoxrafQWB8YCsjXM9QVO81OKdYFzGl9CyPGvcS25Msh3_4Rd1rn_dZNo1TDkHDMlJCUGdCxOeKUbd6jnaSphMcTAAD__w.w-jPx1RbRqFVk6rTRjiBPh930YHPSoFvXl3XlLfTei0',
54
+ token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe_iOivZ8XqdTef403CIyMEuQoVIIoEQdydIoaNnildMM-8plm0SvdBk2UVS4A12gKQMMKYEXhKxTlLrEEY-gB_zZUTr2bloAeVAgMlE4NYn0GyGgNHZEEk0ot6volfUacskNTZizushJNNHbEu9nerjH-cu67xnmVSu6kxQZCl7llrIXAmkmtC2mgrmIl5vAAAA__8._1VA6XbTsnXJ4HsHfoNPWsO7dGvH1hwnKQlRskmWMDI',
55
55
 
56
56
  originalRequestURL: 'http://10.88.22.67:8080',
57
- EstateInfo: '{"estateId":"2209201708108B8F50AB530A49EAA858","estateName":"U%E7%89%88%E6%B5%8B%E8%AF%95%E6%A5%BC%E7%9B%98%E7%82%B9%E4%BD%8D"}',
57
+ EstateInfo: '{"estateId":"20191114134322C29C9B83A84F192964","estateName":"C%E5%BE%A1%E6%9E%97%E5%B1%B1%E6%99%AF%E6%A5%BC"}',
58
58
  estateId: '20210729104021C49F04B55C50F6AF58',
59
59
 
60
- authObject: '{"currentEstate":{"estateId":"2209201708108B8F50AB530A49EAA858","estateName":"U%E7%89%88%E6%B5%8B%E8%AF%95%E6%A5%BC%E7%9B%98%E7%82%B9%E4%BD%8D"},"platform":1,"osVersion":"","clientVersion":"","machineCode":"ce04f173da7df2e78a9da25595111387","token":"","random":"xISAbR","time":1683364729084,"sign":"ceb09a67fc50aa89aafcb2d435e4b41c"}',
61
- AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjExZDZkYWM3LWUxZjgtNDExZS1hNzFmLTFiNjIwNTk0OTFlNyJ9.dJKIU1UNLLjf9FHtfntmSHR4VacBkPLnsbfSKMUvAjzpEgrggU8j0YY6yFZTP8VHIPAZN4b_yfB7r3S5BnRKEA',
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"}',
61
+ AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjYyOTk5ZDhjLTYwY2MtNGM0OS05MzM4LWY1MTBhNjI5OGVjYiJ9.A7lCMb4mBHjse6DlvFLVV5jEQSWzREtlbeZJ6StCW4kVyyRG4RlkhRl2FJvaBZEdtoEItI52IEgBsX4X_H1m4w',
62
62
  };
63
63
  },
64
64
  // 请求完成事件，可判断是否登录过期执行响应操作