centaline-data-driven 1.6.30 → 1.6.32

package/package.json

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

package/release-log.md

@@ -1,3 +1,17 @@
+# v1.6.32
+2024-11-20
+
+BUG
+
+BUG修复缺少formData.enableRelationFields
+
+# v1.6.31
+2024-11-20
+
+优化
+
+表单添加参数isIframe
+
 # v1.6.30
 2024-11-18
 

package/src/SearchList.vue

@@ -109,7 +109,7 @@
 
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/SystemParameterList/getLayoutOfSearch'" :searchDataApi="'/SystemParameterList/getListOfSearchModel'"></ct-searchlist> -->
 
-    <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/EmployeeResourcesTranList/getLayoutOfSearch'" :searchDataApi="'/EmployeeResourcesTranList/getListOfSearchModel'"></ct-searchlist>
+    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/EmployeeResourcesTranList/getLayoutOfSearch'" :searchDataApi="'/EmployeeResourcesTranList/getListOfSearchModel'"></ct-searchlist> -->
 
 
     <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyPublishList/getLayoutOfSearch'"

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

@@ -204,6 +204,10 @@
         String,
         default: '',
       },
+      isIframe: {
+        Boolean,
+        default: false,
+      },
     },
     data() {
       return {
@@ -722,6 +726,7 @@
                       height: field.dialogHeight + 'px',
                       documentHeight: self.documentHeight,
                       documentWidth: self.documentWidth,
+                      isIframe: self.isIframe,
                     },
                     on: {
                       submit(ev) {
@@ -760,7 +765,8 @@
                       searchDataApi: field.actionForSearch,
                       apiParam: submitData,
                       width: field.dialogWidth + 'px',
-                      height: field.dialogHeight + 'px'
+                      height: field.dialogHeight + 'px',
+                      isIframe: self.isIframe,
                     },
                     on: {
                       submit(ev) {
@@ -1031,6 +1037,9 @@
             submitData = field.getActionPara(submitData).para;
             let title = field.pageTitle == undefined ? field.label : field.pageTitle;
             submitData.actionType = field.actionType;
+            if (self.isIframe) {
+              submitData.isIframe = self.isIframe;
+            }
             var fun = self.$common.getDataDrivenOpts().handler[field.action];
             fun(submitData, title, self.model);
           }

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

@@ -1557,6 +1557,7 @@ export default {
                       documentHeight: self.documentHeight,
                       documentWidth: self.documentWidth,
                       flagScroll: true,
+                      isIframe: self.isIframe,
                     },
                     on: {
                       submit(ev) {
@@ -1620,6 +1621,7 @@ export default {
                       height: field.dialogHeight + "px",
                       documentHeight: self.documentHeight,
                       documentWidth: self.documentWidth,
+                      isIframe: self.isIframe,
                     },
                     on: {
                       refreshParent() {
@@ -1889,6 +1891,7 @@ export default {
                       width: field.dialogWidth + "px",
                       height: field.dialogHeight + "px",
                       flagScroll: true,
+                      isIframe: self.isIframe,
                     },
                     on: {
                       submit(ev) {
@@ -1929,6 +1932,7 @@ export default {
                       apiParam: field.getActionPara(submitData).para,
                       width: field.dialogWidth + "px",
                       height: field.dialogHeight + "px",
+                      isIframe: self.isIframe,
                     },
                     on: {
                       refreshParent() {

package/src/centaline/loader/src/ctl/SearchScreen.js

@@ -21,6 +21,9 @@ const SearchScreen = function (source, callBack, screenPara, prevParam) {
         fieldsDic: null,//fieldsDic
         _excuteListData: undefined,
 
+        enableRelationFields(FlagRelation) {
+          this.form.enableRelationFields = FlagRelation
+        },
         //获取code1
         getCode1ByField1(id) {
           var rtn1 = this.fieldsDic[id];

package/src/main.js

@@ -16,10 +16,11 @@ Vue.config.productionTip = false;
 Vue.use(centaline, {
   // baseUrl: "http://10.88.22.46:17070/max-uplink-api/",
   // baseUrl: "http://10.88.22.46:6060/onecard-api/",
-  baseUrl: "http://10.88.22.46:9999/service-api/",  
+  // baseUrl: "http://10.88.22.46:9999/service-api/", 
   // baseUrl: "http://10.88.22.46:22324/service-api/v1/form/router",
   // baseUrl: "http://10.88.22.13:17070/max-uplink-api/",
-  baseUrl: "http://10.88.22.13:9004/max-uplink-api/",
+  // baseUrl: "http://10.88.22.13:9004/max-uplink-api/",
+  baseUrl:"http://szamax-api.centaline.com.cn/max-uplink-api/",
   // baseUrl: "http://10.88.22.13:6060/onecard-api/",
   // baseUrl: "http://10.6.1.163:9000/max-uplink-api/v1/form/router",
   // baseUrl: "http://10.28.21.164:9004/max-uplink-api/",
@@ -66,8 +67,8 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: 'da18df1e-9ee2-49fd-a5ca-a3e17c8947e5',
-        token:'1080-1762727915918856192',
-        authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe_iOit5vevYm87ETsMhonwcKVSIJBIIcXeIgI6eKV4xzby7WrZeVQo_wI_50gaUmsrdihZgKwkksIMYrBjjXZLoW1_W1ARrIDF5YEoHCAFrSDHZWIu2jaAqVL6eVYWOULwxzhZq7ta38GL9LrYlX4759o9zp3V-ZWXgcRqMg1J6A4zdBB45gyNCJp21GXv1eAIAAP__.q-sq_mdABjuvK8oabisCJlc_V2EbYOnPq8OmiNKhTIg"}',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjksOwjAMBe-SdS05tuPE7PpJNhwCBWglWCHaSiDE3SniEGznjfTm5eb16HYuIUWltoc-sYKkYGDcF_ApGWYzjrE_CHOHKANQxAJSYgYTCYBoahaC0qAHJc6lbRW8bLuUbpNIBDS3QTJhZiHXuPFxczsfmXxCJG3cpS4_gMb6Bes83vfj8x9x1-Wy3eJ48seQJuCaziATTWDRIlSazCNrlerd-wMAAP__.93H7c7k4TLTqbKpozp0aTSU4U_WrQu3eS990iS-TCpw',
+        authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjksOwjAMBe-SdS05tuPE7PpJNhwCBWglWCHaSiDE3SniEGznjfTm5eb16HYuIUWltoc-sYKkYGDcF_ApGWYzjrE_CHOHKANQxAJSYgYTCYBoahaC0qAHJc6lbRW8bLuUbpNIBDS3QTJhZiHXuPFxczsfmXxCJG3cpS4_gMb6Bes83vfj8x9x1-Wy3eJ48seQJuCaziATTWDRIlSazCNrlerd-wMAAP__.93H7c7k4TLTqbKpozp0aTSU4U_WrQu3eS990iS-TCpw"}',
 
         // originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"1c581b7c-d629-4670-8a7c-6d622860bc58","estateName":"0%E9%87%91%E9%9A%85%E4%BA%91%E7%AD%91%E5%A4%A9%E6%B4%A5","estDeptPath":"009.014.001.001"}',

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

@@ -11254,7 +11254,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__(185);
 /* unused harmony namespace reexport */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_1dcf9d7a_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicForm_vue__ = __webpack_require__(617);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_5b0ebfe6_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicForm_vue__ = __webpack_require__(617);
 function injectStyle (ssrContext) {
   __webpack_require__(611)
 }
@@ -11274,7 +11274,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_1dcf9d7a_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_5b0ebfe6_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__,
@@ -20224,7 +20224,7 @@ exports.f = __webpack_require__(30) ? gOPD : function getOwnPropertyDescriptor(O
 "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__(156);
 /* unused harmony namespace reexport */
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_67db7d97_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchTable_vue__ = __webpack_require__(572);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_c8c25f46_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicSearchTable_vue__ = __webpack_require__(572);
 function injectStyle (ssrContext) {
   __webpack_require__(534)
 }
@@ -20244,7 +20244,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_67db7d97_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_c8c25f46_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__,
@@ -21733,7 +21733,8 @@ var Component = normalizeComponent(
                     height: field.dialogHeight + "px",
                     documentHeight: self.documentHeight,
                     documentWidth: self.documentWidth,
-                    flagScroll: true
+                    flagScroll: true,
+                    isIframe: self.isIframe
                   },
                   on: {
                     submit: function submit(ev) {
@@ -21793,7 +21794,8 @@ var Component = normalizeComponent(
                       width: field.dialogWidth + "px",
                       height: field.dialogHeight + "px",
                       documentHeight: self.documentHeight,
-                      documentWidth: self.documentWidth
+                      documentWidth: self.documentWidth,
+                      isIframe: self.isIframe
                     },
                     on: {
                       refreshParent: function refreshParent() {
@@ -22026,7 +22028,8 @@ var Component = normalizeComponent(
                     showTitle: false,
                     width: field.dialogWidth + "px",
                     height: field.dialogHeight + "px",
-                    flagScroll: true
+                    flagScroll: true,
+                    isIframe: self.isIframe
                   },
                   on: {
                     submit: function submit(ev) {
@@ -22061,7 +22064,8 @@ var Component = normalizeComponent(
                       searchDataApi: field.actionForSearch,
                       apiParam: field.getActionPara(submitData).para,
                       width: field.dialogWidth + "px",
-                      height: field.dialogHeight + "px"
+                      height: field.dialogHeight + "px",
+                      isIframe: self.isIframe
                     },
                     on: {
                       refreshParent: function refreshParent() {
@@ -28873,6 +28877,10 @@ module.exports = g;
     openType: {
       String: String,
       default: ''
+    },
+    isIframe: {
+      Boolean: Boolean,
+      default: false
     }
   },
   data: function data() {
@@ -29360,7 +29368,8 @@ module.exports = g;
                     width: field.dialogWidth + 'px',
                     height: field.dialogHeight + 'px',
                     documentHeight: self.documentHeight,
-                    documentWidth: self.documentWidth
+                    documentWidth: self.documentWidth,
+                    isIframe: self.isIframe
                   },
                   on: {
                     submit: function submit(ev) {
@@ -29397,7 +29406,8 @@ module.exports = g;
                     searchDataApi: field.actionForSearch,
                     apiParam: submitData,
                     width: field.dialogWidth + 'px',
-                    height: field.dialogHeight + 'px'
+                    height: field.dialogHeight + 'px',
+                    isIframe: self.isIframe
                   },
                   on: {
                     submit: function submit(ev) {
@@ -29645,6 +29655,9 @@ module.exports = g;
             submitData = field.getActionPara(submitData).para;
             var title = field.pageTitle == undefined ? field.label : field.pageTitle;
             submitData.actionType = field.actionType;
+            if (self.isIframe) {
+              submitData.isIframe = self.isIframe;
+            }
             var fun = self.$common.getDataDrivenOpts().handler[field.action];
             fun(submitData, title, self.model);
           }
@@ -56571,6 +56584,10 @@ var SearchScreen = function SearchScreen(source, callBack, screenPara, prevParam
         fieldsDic: null, //fieldsDic
         _excuteListData: undefined,
 
+        enableRelationFields: function enableRelationFields(FlagRelation) {
+          this.form.enableRelationFields = FlagRelation;
+        },
+
         //获取code1
         getCode1ByField1: function getCode1ByField1(id) {
           var rtn1 = this.fieldsDic[id];
@@ -74254,7 +74271,7 @@ var content = __webpack_require__(535);
 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__(3)("0b32e8d8", content, true, {});
+var update = __webpack_require__(3)("5f599561", content, true, {});
 
 /***/ }),
 /* 535 */
@@ -75674,7 +75691,7 @@ var content = __webpack_require__(612);
 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__(3)("2dfdacf9", content, true, {});
+var update = __webpack_require__(3)("37ef10e5", content, true, {});
 
 /***/ }),
 /* 612 */