centaline-data-driven 1.5.47 → 1.5.49

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 (12) hide show
  1. package/package.json +1 -1
  2. package/release-log.md +7 -0
  3. package/src/centaline/dynamicForm/src/dynamicForm.vue +6 -2
  4. package/src/centaline/dynamicLayout/src/dynamicLayout.vue +7 -3
  5. package/src/centaline/dynamicLayout/src/dynamicLayoutLabel.vue +2 -2
  6. package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue +7 -1
  7. package/src/centaline/dynamicT/src/dynamicT.vue +1 -1
  8. package/src/centaline/loader/src/ctl/CellLayout.js +1 -1
  9. package/src/centaline/loader/src/ctl/lib/LibFunction.js +2 -1
  10. package/src/main.js +3 -3
  11. package/wwwroot/static/centaline/centaline-data-driven.js +81 -68
  12. 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.47",
3
+ "version": "1.5.49",
4
4
  "description": "ccai",
5
5
  "author": "hjc <3226136347@qq.com>",
6
6
  "private": false,
package/release-log.md CHANGED
@@ -1,3 +1,10 @@
1
+ ## v1.5.48
2
+ 2023-08-10
3
+
4
+ bug修复
5
+
6
+ Layout 操作按钮权限问题修复
7
+
1
8
  ## v1.5.47
2
9
  2023-08-09
3
10
 
package/src/centaline/dynamicForm/src/dynamicForm.vue CHANGED
@@ -998,9 +998,13 @@
998
998
  }
999
999
  else {
1000
1000
  if (f.validMessage) {
1001
- if (f.validMessage == '必填' && f.model.label) {
1001
+ if (f.validMessage == '必填' && (f.model.label || (f.model.attrs && f.model.attrs.placeholder))) {
1002
+ let m=f.model.label;
1003
+ if(!m && f.model.attrs && f.model.attrs.placeholder){
1004
+ m=f.model.attrs.placeholder;
1005
+ }
1002
1006
  self.$message({
1003
- message: '【' + f.model.label + '】' + f.validMessage,
1007
+ message: '【' + m + '】' + f.validMessage,
1004
1008
  type: 'error',
1005
1009
  showClose:true,
1006
1010
  });
package/src/centaline/dynamicLayout/src/dynamicLayout.vue CHANGED
@@ -97,12 +97,16 @@
97
97
  getValue(data, val) {
98
98
  return val.split('.').reduce((data, currentVal) => {
99
99
  var rtn = data[currentVal];
100
- if (typeof rtn !== 'undefined' && typeof (rtn) == 'string') {
100
+ if (typeof rtn !== "undefined" && typeof rtn == "string") {
101
101
  rtn = rtn.replace(/"/g, "'");
102
+ rtn = rtn.replace(/&/g, "&amp;");
102
103
  rtn = rtn.replace(/>/g, "&gt;");
103
104
  rtn = rtn.replace(/</g, "&lt;");
104
- }
105
- else {
105
+ } else if (typeof rtn == "object") {
106
+ rtn = currentVal;
107
+ } else if (typeof rtn == "number") {
108
+ rtn = rtn;
109
+ } else {
106
110
  rtn = "";
107
111
  }
108
112
  return rtn
package/src/centaline/dynamicLayout/src/dynamicLayoutLabel.vue CHANGED
@@ -1,6 +1,6 @@
1
1
  <template>
2
- <div v-if="model.routerKey&&model.visibility!='0'&&model.rightRouter&&model.value!=''">
3
- <div class="wb" :style="model.styleObject">
2
+ <div v-if="model.routerKey&&model.visibility!='0'">
3
+ <div v-if="model.rightRouter&&model.value!=''" class="wb" :style="model.styleObject">
4
4
  <a href="javascript:void(0);" @click="clickHandler($event)" class="ct-tablecurrencyItem">
5
5
  {{model.value}}
6
6
  </a>
package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue CHANGED
@@ -734,7 +734,13 @@ export default {
734
734
  var h7 = this.$refs.tableStats ? (this.$refs.tableStats.$el.offsetHeight + 7) | 0 : 0;
735
735
  var h8 = this.$refs.popupButton ? this.$refs.popupButton.offsetHeight + 21 : 0;
736
736
  var h9 = 0
737
- if (this.$parent.$parent.$parent.$children[0].$el.classList.contains('el-aside')) {
737
+ if (this.$parent
738
+ && this.$parent.$parent
739
+ && this.$parent.$parent.$parent
740
+ && this.$parent.$parent.$parent.$children
741
+ && this.$parent.$parent.$parent.$children[0]
742
+ && this.$parent.$parent.$parent.$children[0].$el
743
+ && this.$parent.$parent.$parent.$children[0].$el.classList.contains('el-aside')) {
738
744
  h9 = 4
739
745
  }
740
746
  let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - h7 - h8 + h9 - 8 ;
package/src/centaline/dynamicT/src/dynamicT.vue CHANGED
@@ -200,7 +200,7 @@
200
200
  popupSearchListHandle: function (e) {
201
201
  var self = this;
202
202
  self.showDrop=false;
203
- self.$emit('popupSearchList', false, self.model, self.model.moreActionRouter, (optionArr) => {
203
+ self.$emit('popupSearchList', self.model.type===3?false:true, self.model, self.model.moreActionRouter, (optionArr) => {
204
204
  optionArr.forEach(row => {
205
205
  if(self.model.type===3){
206
206
  self.model.value=self.model.value+(self.model.value?'\r\n':'')+row[self.model.optionAttrs.label];
package/src/centaline/loader/src/ctl/CellLayout.js CHANGED
@@ -75,7 +75,7 @@ const CellLayout = function (source, actionRouter,rowdata, forname, forrowindex)
75
75
  return b.id === source.routerKey;
76
76
  });
77
77
  if (typeof field !== "undefined") {
78
- if ((!field.rightField || (typeof rowdata[forname][forrowindex] !== "undefined" && rowdata[forname][forrowindex][field.rightField] == 1)) && field.show) {
78
+ if ((!field.rightField || (typeof rowdata[forname][forrowindex] !== "undefined" && (!rowdata[forname][forrowindex][field.rightField]||rowdata[forname][forrowindex][field.rightField] == 1)))) {
79
79
  forrightRouter = true;
80
80
  }
81
81
  }
package/src/centaline/loader/src/ctl/lib/LibFunction.js CHANGED
@@ -137,7 +137,8 @@ const LibFunction = {
137
137
  item.is = 'ct-so';
138
138
  break;
139
139
  case Enum.ControlType.TextBox: //单行文本框
140
- item = T(field, "text");
140
+ moreActionRouter = LibFunction.getRouter(source.actionRouters, field.moreActionRouterKey);
141
+ item = T(field, "text",false,false,moreActionRouter);
141
142
  item.is = 'ct-text';
142
143
  break;
143
144
  case Enum.ControlType.PasswordTextBox: //密码
package/src/main.js CHANGED
@@ -14,14 +14,14 @@ Vue.use(ElementUI, { size: 'mini'});
14
14
  // 关闭生产模式下给出的提示
15
15
  Vue.config.productionTip = false;
16
16
  Vue.use(centaline, {
17
- // baseUrl: "http://10.88.22.46:17070/max-uplink-api/",
17
+ baseUrl: "http://10.88.22.46:17070/max-uplink-api/",
18
18
  // baseUrl: "http://10.88.22.13:17070/max-uplink-api/",
19
19
  // baseUrl: "http://10.6.1.163:9000/max-uplink-api/v1/form/router",
20
20
  // baseUrl: "http://10.25.10.63:9999/service-api/v1/form/router",
21
21
  // baseUrl: "http://10.25.10.67:8080/",
22
22
  // baseUrl: "http://10.88.22.42:9999/service-api/v1/form/router",
23
23
  // baseUrl: "http://10.88.22.69:8080/api/",
24
- baseUrl: "http://10.88.22.16:8080/",
24
+ // baseUrl: "http://10.88.22.16:8080/",
25
25
  // baseUrl: "http://10.58.2.108:8080/",
26
26
  // baseUrl: "http://tjcptest.centaline.com.cn/",
27
27
  // baseUrl: "http://tjcpuat.centaline.com.cn:9090/",
@@ -58,7 +58,7 @@ Vue.use(centaline, {
58
58
  return {
59
59
  oldToken: '681f7eeb-e659-4c3b-a8c4-88d60c36a518',
60
60
  token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQRO_iOiv5s1570zn-NBwiIuBIoUIkkUCIuxMEdPRMMRq95s1dzOsgWmHIccikIFr0gKQsMJYCURKxKdKYlHr-BH7UNz26yCFkByg7Aiw2A-tYwLDtEubgUibRiHo9i1aRRy-dtdSIab-8gdNKvcA618uu3v5x7rRMm3YkOZAfR6BtAWp_3LQHBNI8KHbkqlHi8QQAAP__.RrBgBqaFlp478oO3g5k_EEtjPt_o8qpJBkzgSP78Wa4',
61
- authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEOgjAURf-lMy9p6aPvlY2-wuJHkAIlwckIJBrjv6tRN3fPcIeznHtT6z6oWkVuNEpnQdqyAoxUQdMRQxBmHUqyGLj3H-DHfOmNQU_GtdB4EkCHFtgIg6AT7GJrJURVqHw5qdo4b5CRNBZqSdtbWM_2JfY1nw_5-o9zx215Zj2lZFEbGGbUgKUfIc2ZIdPoHI5I05TV_QEAAP__.JcB2iXcfHNcB2eJQ_kEIhID-UXCMx-HDoIuv9ZIA33I"}',
61
+ authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOwjAMRe-SuZbixI2dbo3bLhwCNSiVyoRoK4EQdwcEbOy84Q9vef9mli2bxnTSWtLBg_auBuq4hnZggaQiNjn2lGQfP8CP-bJHpMgYemgjK1AgD4IqoBSUhq73mjpTmXI5mQZDdMgBLVZmHte3sBL5JbalnHfl-o9zx3V-ZicX-cBZYJqIgNAVkBgQfBYXQ03Zjc7cHwAAAP__.-lkfBY8Qlu2nt6fc_7LyMJb2c8Ki5dxMCR6fga2a1Ec"}',
62
62
 
63
63
  originalRequestURL: 'http://10.88.22.67:8080',
64
64
  EstateInfo: '{"estateId":"201806071109550C867184E8BCA56EC3","estateName":"C%E5%BE%A1%E6%9E%97%E5%B1%B1%E6%99%AF%E6%A5%BC"}',