centaline-data-driven 1.5.48 → 1.5.49

package/package.json

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

package/release-log.md

@@ -1,3 +1,10 @@
+## v1.5.48
+2023-08-10
+
+bug修复
+
+Layout 操作按钮权限问题修复
+
 ## v1.5.47
 2023-08-09
 

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

@@ -998,9 +998,13 @@
                 }
                 else {
                   if (f.validMessage) {
-                    if (f.validMessage == '必填' && f.model.label) {
+                    if (f.validMessage == '必填' && (f.model.label || (f.model.attrs && f.model.attrs.placeholder))) {
+                      let m=f.model.label;
+                      if(!m && f.model.attrs && f.model.attrs.placeholder){
+                        m=f.model.attrs.placeholder;
+                      }
                       self.$message({
-                        message: '【' + f.model.label + '】' + f.validMessage,
+                        message: '【' + m + '】' + f.validMessage,
                         type: 'error',
                         showClose:true,
                       });

package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue

@@ -734,7 +734,13 @@ export default {
           var h7 = this.$refs.tableStats ? (this.$refs.tableStats.$el.offsetHeight + 7) | 0 : 0;
           var h8 = this.$refs.popupButton ? this.$refs.popupButton.offsetHeight + 21 : 0;
           var h9 = 0
-          if (this.$parent.$parent.$parent.$children[0].$el.classList.contains('el-aside')) {
+          if (this.$parent 
+          && this.$parent.$parent 
+          && this.$parent.$parent.$parent 
+          && this.$parent.$parent.$parent.$children 
+          && this.$parent.$parent.$parent.$children[0]
+          && this.$parent.$parent.$parent.$children[0].$el
+          && this.$parent.$parent.$parent.$children[0].$el.classList.contains('el-aside')) {
             h9 = 4
           }
           let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - h7 - h8 + h9 - 8 ;

package/src/centaline/dynamicT/src/dynamicT.vue

@@ -200,7 +200,7 @@
       popupSearchListHandle: function (e) {
         var self = this;
         self.showDrop=false;
-        self.$emit('popupSearchList', false, self.model, self.model.moreActionRouter, (optionArr) => {
+        self.$emit('popupSearchList', self.model.type===3?false:true, self.model, self.model.moreActionRouter, (optionArr) => {
           optionArr.forEach(row => {
             if(self.model.type===3){
               self.model.value=self.model.value+(self.model.value?'\r\n':'')+row[self.model.optionAttrs.label];

package/src/centaline/loader/src/ctl/lib/LibFunction.js

@@ -137,7 +137,8 @@ const LibFunction = {
         item.is = 'ct-so';
         break;
       case Enum.ControlType.TextBox: //单行文本框
-        item = T(field, "text");
+        moreActionRouter = LibFunction.getRouter(source.actionRouters, field.moreActionRouterKey);
+        item = T(field, "text",false,false,moreActionRouter);
         item.is = 'ct-text';
         break;
       case Enum.ControlType.PasswordTextBox: //密码

package/src/main.js

@@ -14,14 +14,14 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  // baseUrl: "http://10.88.22.46:17070/max-uplink-api/",
+  baseUrl: "http://10.88.22.46:17070/max-uplink-api/",
   // baseUrl: "http://10.88.22.13:17070/max-uplink-api/",
   // baseUrl: "http://10.6.1.163:9000/max-uplink-api/v1/form/router",
   // baseUrl: "http://10.25.10.63:9999/service-api/v1/form/router",
   // baseUrl: "http://10.25.10.67:8080/",
   // baseUrl: "http://10.88.22.42:9999/service-api/v1/form/router", 
   // baseUrl: "http://10.88.22.69:8080/api/", 
-  baseUrl: "http://10.88.22.16:8080/",
+  // baseUrl: "http://10.88.22.16:8080/",
   // baseUrl: "http://10.58.2.108:8080/",
   // baseUrl: "http://tjcptest.centaline.com.cn/", 
   // baseUrl: "http://tjcpuat.centaline.com.cn:9090/",
@@ -58,7 +58,7 @@ Vue.use(centaline, {
       return {
         oldToken: '681f7eeb-e659-4c3b-a8c4-88d60c36a518',
         token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQRO_iOiv5s1570zn-NBwiIuBIoUIkkUCIuxMEdPRMMRq95s1dzOsgWmHIccikIFr0gKQsMJYCURKxKdKYlHr-BH7UNz26yCFkByg7Aiw2A-tYwLDtEubgUibRiHo9i1aRRy-dtdSIab-8gdNKvcA618uu3v5x7rRMm3YkOZAfR6BtAWp_3LQHBNI8KHbkqlHi8QQAAP__.RrBgBqaFlp478oO3g5k_EEtjPt_o8qpJBkzgSP78Wa4',
-        authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEOgjAURf-lMy9p6aPvlY2-wuJHkAIlwckIJBrjv6tRN3fPcIeznHtT6z6oWkVuNEpnQdqyAoxUQdMRQxBmHUqyGLj3H-DHfOmNQU_GtdB4EkCHFtgIg6AT7GJrJURVqHw5qdo4b5CRNBZqSdtbWM_2JfY1nw_5-o9zx215Zj2lZFEbGGbUgKUfIc2ZIdPoHI5I05TV_QEAAP__.JcB2iXcfHNcB2eJQ_kEIhID-UXCMx-HDoIuv9ZIA33I"}',
+        authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOwjAMRe-SuZbixI2dbo3bLhwCNSiVyoRoK4EQdwcEbOy84Q9vef9mli2bxnTSWtLBg_auBuq4hnZggaQiNjn2lGQfP8CP-bJHpMgYemgjK1AgD4IqoBSUhq73mjpTmXI5mQZDdMgBLVZmHte3sBL5JbalnHfl-o9zx3V-ZicX-cBZYJqIgNAVkBgQfBYXQ03Zjc7cHwAAAP__.-lkfBY8Qlu2nt6fc_7LyMJb2c8Ki5dxMCR6fga2a1Ec"}',
 
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"201806071109550C867184E8BCA56EC3","estateName":"C%E5%BE%A1%E6%9E%97%E5%B1%B1%E6%99%AF%E6%A5%BC"}',

package/wwwroot/static/centaline/centaline-data-driven.js

@@ -4903,7 +4903,8 @@ var LibFunction = {
         break;
       case __WEBPACK_IMPORTED_MODULE_1__Enum__["default"].ControlType.TextBox:
         //单行文本框
-        item = Object(__WEBPACK_IMPORTED_MODULE_9__T__["default"])(field, "text");
+        moreActionRouter = LibFunction.getRouter(source.actionRouters, field.moreActionRouterKey);
+        item = Object(__WEBPACK_IMPORTED_MODULE_9__T__["default"])(field, "text", false, false, moreActionRouter);
         item.is = 'ct-text';
         break;
       case __WEBPACK_IMPORTED_MODULE_1__Enum__["default"].ControlType.PasswordTextBox:
@@ -5336,7 +5337,7 @@ module.exports = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABX
 "use strict";
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_dynamicForm_vue__ = __webpack_require__(188);
 /* unused harmony namespace reexport */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_986333ee_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicForm_vue__ = __webpack_require__(489);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_36ba1c23_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicForm_vue__ = __webpack_require__(489);
 function injectStyle (ssrContext) {
   __webpack_require__(483)
 }
@@ -5356,7 +5357,7 @@ var __vue_scopeId__ = null
 var __vue_module_identifier__ = null
 var Component = normalizeComponent(
   __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_dynamicForm_vue__["a" /* default */],
-  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_986333ee_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicForm_vue__["a" /* default */],
+  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_36ba1c23_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicForm_vue__["a" /* default */],
   __vue_template_functional__,
   __vue_styles__,
   __vue_scopeId__,
@@ -16867,7 +16868,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 "use strict";
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_dynamicSearchTable_vue__ = __webpack_require__(164);
 /* unused harmony namespace reexport */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_3d8a4cc6_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchTable_vue__ = __webpack_require__(455);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_fc3a37d6_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchTable_vue__ = __webpack_require__(455);
 function injectStyle (ssrContext) {
   __webpack_require__(417)
 }
@@ -16887,7 +16888,7 @@ var __vue_scopeId__ = null
 var __vue_module_identifier__ = null
 var Component = normalizeComponent(
   __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_dynamicSearchTable_vue__["a" /* default */],
-  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_3d8a4cc6_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchTable_vue__["a" /* default */],
+  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_fc3a37d6_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchTable_vue__["a" /* default */],
   __vue_template_functional__,
   __vue_styles__,
   __vue_scopeId__,
@@ -17619,7 +17620,7 @@ var Component = normalizeComponent(
           var h7 = _this3.$refs.tableStats ? _this3.$refs.tableStats.$el.offsetHeight + 7 | 0 : 0;
           var h8 = _this3.$refs.popupButton ? _this3.$refs.popupButton.offsetHeight + 21 : 0;
           var h9 = 0;
-          if (_this3.$parent.$parent.$parent.$children[0].$el.classList.contains('el-aside')) {
+          if (_this3.$parent && _this3.$parent.$parent && _this3.$parent.$parent.$parent && _this3.$parent.$parent.$parent.$children && _this3.$parent.$parent.$parent.$children[0] && _this3.$parent.$parent.$parent.$children[0].$el && _this3.$parent.$parent.$parent.$children[0].$el.classList.contains('el-aside')) {
             h9 = 4;
           }
           var tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - h7 - h8 + h9 - 8;
@@ -24104,9 +24105,13 @@ module.exports = g;
                 });
               } else {
                 if (f.validMessage) {
-                  if (f.validMessage == '必填' && f.model.label) {
+                  if (f.validMessage == '必填' && (f.model.label || f.model.attrs && f.model.attrs.placeholder)) {
+                    var m = f.model.label;
+                    if (!m && f.model.attrs && f.model.attrs.placeholder) {
+                      m = f.model.attrs.placeholder;
+                    }
                     self.$message({
-                      message: '【' + f.model.label + '】' + f.validMessage,
+                      message: '【' + m + '】' + f.validMessage,
                       type: 'error',
                       showClose: true
                     });
@@ -32522,7 +32527,7 @@ if (typeof window !== 'undefined' && window.Vue) {
     popupSearchListHandle: function popupSearchListHandle(e) {
       var self = this;
       self.showDrop = false;
-      self.$emit('popupSearchList', false, self.model, self.model.moreActionRouter, function (optionArr) {
+      self.$emit('popupSearchList', self.model.type === 3 ? false : true, self.model, self.model.moreActionRouter, function (optionArr) {
         optionArr.forEach(function (row) {
           if (self.model.type === 3) {
             self.model.value = self.model.value + (self.model.value ? '\r\n' : '') + row[self.model.optionAttrs.label];
@@ -49698,7 +49703,7 @@ var content = __webpack_require__(418);
 if(typeof content === 'string') content = [[module.i, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
-var update = __webpack_require__(2)("04d26cc6", content, true, {});
+var update = __webpack_require__(2)("5ee3eb6b", content, true, {});
 
 /***/ }),
 /* 418 */
@@ -50952,7 +50957,7 @@ var content = __webpack_require__(484);
 if(typeof content === 'string') content = [[module.i, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
-var update = __webpack_require__(2)("1c9a8e0a", content, true, {});
+var update = __webpack_require__(2)("f5d57f3a", content, true, {});
 
 /***/ }),
 /* 484 */
@@ -56025,7 +56030,7 @@ var esExports = { render: render, staticRenderFns: staticRenderFns }
 "use strict";
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_dynamicT_vue__ = __webpack_require__(214);
 /* unused harmony namespace reexport */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_f813a064_hasScoped_true_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicT_vue__ = __webpack_require__(566);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_15570dea_hasScoped_true_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicT_vue__ = __webpack_require__(566);
 function injectStyle (ssrContext) {
   __webpack_require__(560)
 }
@@ -56040,12 +56045,12 @@ var __vue_template_functional__ = false
 /* styles */
 var __vue_styles__ = injectStyle
 /* scopeId */
-var __vue_scopeId__ = "data-v-f813a064"
+var __vue_scopeId__ = "data-v-15570dea"
 /* moduleIdentifier (server only) */
 var __vue_module_identifier__ = null
 var Component = normalizeComponent(
   __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_dynamicT_vue__["a" /* default */],
-  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_f813a064_hasScoped_true_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicT_vue__["a" /* default */],
+  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_15570dea_hasScoped_true_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicT_vue__["a" /* default */],
   __vue_template_functional__,
   __vue_styles__,
   __vue_scopeId__,
@@ -56066,7 +56071,7 @@ var content = __webpack_require__(561);
 if(typeof content === 'string') content = [[module.i, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
-var update = __webpack_require__(2)("3bdc25be", content, true, {});
+var update = __webpack_require__(2)("b0c4141a", content, true, {});
 
 /***/ }),
 /* 561 */
@@ -56077,7 +56082,7 @@ exports = module.exports = __webpack_require__(1)(false);
 
 
 // module
-exports.push([module.i, ".errorMessageMarginLeft[data-v-f813a064]{margin-left:108px}.hoverColor[data-v-f813a064]:hover{border-color:var(--centalineBlue)}.is-show-Span[data-v-f813a064]{display:none}.hoverColor:hover .is-show-Span[data-v-f813a064]{display:inline-block}.backdrop[data-v-f813a064]{position:absolute;z-index:1;border:1px solid #dcdfe6;background-color:#fff;pointer-events:none;overflow-y:auto;border-radius:4px;-webkit-transition:-webkit-transform 1s;transition:-webkit-transform 1s;transition:transform 1s;transition:transform 1s,-webkit-transform 1s}.highlights[data-v-f813a064]{white-space:pre-wrap;word-wrap:break-word;color:transparent;padding:5px 15px;line-height:1.5;font-family:monospace}.autoFill[data-v-f813a064]{width:100%}", ""]);
+exports.push([module.i, ".errorMessageMarginLeft[data-v-15570dea]{margin-left:108px}.hoverColor[data-v-15570dea]:hover{border-color:var(--centalineBlue)}.is-show-Span[data-v-15570dea]{display:none}.hoverColor:hover .is-show-Span[data-v-15570dea]{display:inline-block}.backdrop[data-v-15570dea]{position:absolute;z-index:1;border:1px solid #dcdfe6;background-color:#fff;pointer-events:none;overflow-y:auto;border-radius:4px;-webkit-transition:-webkit-transform 1s;transition:-webkit-transform 1s;transition:transform 1s;transition:transform 1s,-webkit-transform 1s}.highlights[data-v-15570dea]{white-space:pre-wrap;word-wrap:break-word;color:transparent;padding:5px 15px;line-height:1.5;font-family:monospace}.autoFill[data-v-15570dea]{width:100%}", ""]);
 
 // exports