centaline-data-driven 1.5.97 → 1.5.98

package/package.json

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

package/release-log.md

@@ -1,3 +1,10 @@
+# v1.5.98
+2024-01-31
+
+优化
+
+表单列表操作显示逻辑优化
+
 # v1.5.97
 2024-01-29
 新增

package/src/Form.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/necessaryfile/ContractConfirmImport/getContractConfirmImportForm'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-form :api="'/third-dept-tran/second-hand-transaction/electronic-contract'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,7 +12,7 @@
     data() {
       return {
         apiParam:{
-          
+          "originalTraId":"1752262617589448705"
         },
         topHeight:10,
       }

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

@@ -35,7 +35,6 @@
                 </span>
                 <!--可点击的列-->
                 <span v-else-if="v.router" :class="'cell'" style="display: flex;">
-                  <span>{{scope.row.isSet}}</span>
                   <ct-tablecurrency :router="v.router" :colValue="scope.row[v.id].code1" :rowData="scope.row" @click="rolRouterClickHandler">
                   </ct-tablecurrency>
                 </span>
@@ -44,7 +43,7 @@
             </el-table-column>
 
             <!--操作列-->
-            <el-table-column label="操作" v-if="model.rows[0].edit || model.rows[0].delete || model.buttons.length > 0" :fixed="fixedButtons" :width="'100%'" :render-header="renderHeader" :min-width="tableColumnWith">
+            <el-table-column label="操作" v-if="model.rows[0].edit || model.rows[0].delete || (model.buttons.length > 0 && model.buttonsShow.length > 0)" :fixed="fixedButtons" :width="'100%'" :render-header="renderHeader" :min-width="tableColumnWith">
               <template slot-scope="scope">
                 <span v-if="scope.row.edit || scope.row.isSet" class="el-tag el-tag--info el-tag--mini" style="cursor: pointer;" @click="saveRow(scope.row,scope.$index,true)">
                   {{scope.row.isSet?'保存':"修改"}}

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

@@ -131,6 +131,23 @@ const FormList = function (source, master) {
         return rtn._buttons;
       }
     },
+    _buttonsShow: null,
+    get buttonsShow() {
+      if (rtn._buttonsShow !== null) {
+        return rtn._buttonsShow;
+      }
+      else {
+        rtn._buttonsShow = [];
+        if (rtn.buttons) {
+          rtn.buttons.forEach((v) => {
+            if(v.show){
+              rtn._buttonsShow.push(button);
+            }
+          });
+        }
+        return rtn._buttonsShow;
+      }
+    },
     _rows:null,
     get rows() {     
       if (this._rows) {

package/src/main.js

@@ -20,10 +20,10 @@ Vue.use(centaline, {
   // 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.25.10.63:22026/service-api/v1/form/router",
-  // baseUrl: "http://10.25.10.67:8080/",
+  // baseUrl: "http://10.25.10.69:8080/",
   // baseUrl: "https://ccesutest.centaline.com.cn/service-api/v1/form/router", 
-  // baseUrl: "http://10.88.22.69:8080/api/", 
-  baseUrl: "http://10.88.22.42:9999/service-api/",
+  baseUrl: "http://10.88.22.69:8080/api/", 
+  // baseUrl: "http://10.88.22.42:9999/service-api/",
   // baseUrl: "http://10.1.245.111:38028/",
   // baseUrl: "http://tjcptest.centaline.com.cn/", 
   // baseUrl: "http://tjcpuat.centaline.com.cn:9090/",
@@ -55,7 +55,7 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '1f487e18-c090-4d24-b9a7-630de58cfccc',
+        oldToken: 'ef4d1857-73a3-4ff7-960b-1c27f1ae3f95',
         token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOgkAQRe-yNZPsMrM7M3TsAo2HIKBLgpURSDTGu6tRO3tf8YvXvH8zyzaayjRSW0odQmpLD9Swh7pjgZhEbCwZKUqvH-DHfOmdI2UXWqiVE1AgBHFJIFFI1DUtptiYwuTLyVSObXDsUUJh5mF9CyuiL7Et-bzL13-cO67zM4u4Z1GLEDwj0KQDjKwHyL5kl0nVDZO5PwAAAP__.lLGz-ut5lOSrU5OeZVNG6UwRNZx3ds6ezV19Y0wF3Kw',
         authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOgkAQRe-yNZPsMrM7M3TsAo2HIKBLgpURSDTGu6tRO3tf8YvXvH8zyzaayjRSW0odQmpLD9Swh7pjgZhEbCwZKUqvH-DHfOmdI2UXWqiVE1AgBHFJIFFI1DUtptiYwuTLyVSObXDsUUJh5mF9CyuiL7Et-bzL13-cO67zM4u4Z1GLEDwj0KQDjKwHyL5kl0nVDZO5PwAAAP__.lLGz-ut5lOSrU5OeZVNG6UwRNZx3ds6ezV19Y0wF3Kw"}',
 

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

@@ -29757,7 +29757,6 @@ module.exports = g;
 //
 //
 //
-//
 
 //Form内表格
 var ctSpan = { //临时的span组件对象，用于vue双向绑定，强制更新
@@ -56577,6 +56576,22 @@ var FormList = function FormList(source, master) {
         return rtn._buttons;
       }
     },
+    _buttonsShow: null,
+    get buttonsShow() {
+      if (rtn._buttonsShow !== null) {
+        return rtn._buttonsShow;
+      } else {
+        rtn._buttonsShow = [];
+        if (rtn.buttons) {
+          rtn.buttons.forEach(function (v) {
+            if (v.show) {
+              rtn._buttonsShow.push(button);
+            }
+          });
+        }
+        return rtn._buttonsShow;
+      }
+    },
     _rows: null,
     get rows() {
       var _this = this;
@@ -73318,7 +73333,7 @@ exports.push([module.i, ".el-collapse{border-top:none}.ct-collapse-item-title .e
 "use strict";
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_dynamicFormListTable_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_5613368b_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicFormListTable_vue__ = __webpack_require__(608);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_47f25bea_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicFormListTable_vue__ = __webpack_require__(608);
 function injectStyle (ssrContext) {
   __webpack_require__(606)
 }
@@ -73338,7 +73353,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_dynamicFormListTable_vue__["a" /* default */],
-  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_5613368b_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicFormListTable_vue__["a" /* default */],
+  __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_47f25bea_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_dynamicFormListTable_vue__["a" /* default */],
   __vue_template_functional__,
   __vue_styles__,
   __vue_scopeId__,
@@ -73359,7 +73374,7 @@ var content = __webpack_require__(607);
 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)("7146639c", content, true, {});
+var update = __webpack_require__(3)("33d760c4", content, true, {});
 
 /***/ }),
 /* 607 */
@@ -73380,7 +73395,7 @@ exports.push([module.i, ".el-table-add-row{margin-top:10px;width:100%;height:34p
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{directives:[{name:"focus",rawName:"v-focus",value:(_vm.foucus),expression:"foucus"}],staticClass:"ct-form-list",class:{'tableDisabled':_vm.model.tableDisabled}},[(_vm.model.title)?_c('div',{staticClass:"list-title"},[_c('h5',[_vm._v(_vm._s(_vm.model.title))])]):(_vm.model.create || (_vm.model.selectRouter && _vm.model.selectRouter.id))?_c('div',{staticClass:"list-title"}):_vm._e(),_vm._v(" "),_c('div',{staticClass:"list-button"},[(_vm.model.selectRouter!==null)?_c(_vm.model.selectRouter.is,{tag:"component",attrs:{"vmodel":_vm.model.selectRouter},on:{"click":_vm.popupSearchListHandle}}):_vm._e(),_vm._v(" "),(_vm.model.create)?_c('el-button',{staticClass:"max-btn-add",staticStyle:{"width":"auto"},attrs:{"disabled":_vm.model.disabled,"type":"success","size":"mini","icon":"el-icon-circle-plus-outline"},on:{"click":_vm.addRow}},[_vm._v("\n      "+_vm._s(_vm.model.createText)+"\n    ")]):_vm._e()],1),_vm._v(" "),_c('div',{attrs:{"id":"listTable"}},[_c('el-row',[_c('el-col',{attrs:{"span":24}},[_c('el-table',{staticClass:"max-table--border",staticStyle:{"width":"100%"},attrs:{"size":"mini","data":_vm.model.tableData,"border":"","highlight-current-row":"","show-summary":_vm.model.showSummary,"summary-method":_vm.getSummaries}},[_vm._l((_vm.model.rows[0].field),function(v,i){return (v.show !== false && v.type!==13)?_c('el-table-column',{key:i,attrs:{"prop":v.id,"label":v.label,"width":v.width,"fixed":_vm.model.frozenColumns.includes(v.id),"render-header":_vm.renderHeader,"min-width":_vm.tableColumnWith},scopedSlots:_vm._u([{key:"header",fn:function(scope){return [_c('div',{class:[{'ct-table-required':v.required&&_vm.model.rows[0].edit&& _vm.model.rows[0].delete&&!_vm.model.tableDisabled},_vm.getHeadClass(v)]},[_vm._v("\n                "+_vm._s(v.label)+"\n              ")])]}},{key:"default",fn:function(scope){return [(scope.row.isSet)?_c('span',[_c(_vm.model.currentRow.data[v.id].locked || _vm.model.currentRow.data[v.id].is!==v.is?_vm.model.currentRow.data[v.id].is:v.is,{key:_vm.model.currentRow.data[v.id].rowKey+_vm.itemKey,ref:"Fields",refInFor:true,tag:"component",attrs:{"vmodel":_vm.model.currentRow.data[v.id],"api":_vm.model.OptApi},on:{"change":function($event){_vm.changeHandler(_vm.model.currentRow.data[v.id], _vm.model.currentRow.data.$sourceIndex)},"input":function($event){_vm.inputHandler(_vm.model.currentRow.data[v.id], _vm.model.currentRow.data.$sourceIndex)}}})],1):(v.is=='ct-sensitiveeye')?_c('span',[_c(v.is,{key:_vm.itemKey,ref:"Fields",refInFor:true,tag:"component",attrs:{"vmodel":scope.row[v.id],"vrowmodel":scope.row,"api":_vm.model.OptApi}})],1):(v.router)?_c('span',{class:'cell',staticStyle:{"display":"flex"}},[_c('span',[_vm._v(_vm._s(scope.row.isSet))]),_vm._v(" "),_c('ct-tablecurrency',{attrs:{"router":v.router,"colValue":scope.row[v.id].code1,"rowData":scope.row},on:{"click":_vm.rolRouterClickHandler}})],1):_c('ct-span',{key:scope.row[v.id].rowKey+_vm.itemKey,ref:"FieldsLabel",refInFor:true,attrs:{"vmodel":scope.row[v.id],"rowNum":scope.row.$sourceIndex,"rowData":scope.row}})]}}])}):_vm._e()}),_vm._v(" "),(_vm.model.rows[0].edit || _vm.model.rows[0].delete || _vm.model.buttons.length > 0)?_c('el-table-column',{attrs:{"label":"操作","fixed":_vm.fixedButtons,"width":'100%',"render-header":_vm.renderHeader,"min-width":_vm.tableColumnWith},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [(scope.row.edit || scope.row.isSet)?_c('span',{staticClass:"el-tag el-tag--info el-tag--mini",staticStyle:{"cursor":"pointer"},on:{"click":function($event){_vm.saveRow(scope.row,scope.$index,true)}}},[_vm._v("\n                "+_vm._s(scope.row.isSet?'保存':"修改")+"\n              ")]):_vm._e(),_vm._v(" "),(scope.row.delete && !scope.row.isSet)?_c('span',{staticClass:"el-tag el-tag--danger el-tag--mini",staticStyle:{"cursor":"pointer"},on:{"click":function($event){_vm.deleteRow(scope.$index, scope.row.$sourceIndex)}}},[_vm._v("\n                删除\n              ")]):(scope.row.isSet)?_c('span',{staticClass:"el-tag  el-tag--mini",staticStyle:{"cursor":"pointer"},on:{"click":function($event){_vm.saveRow(scope.row,scope.$index,false)}}},[_vm._v("\n                取消\n              ")]):_vm._e(),_vm._v(" "),_vm._l((_vm.model.buttons),function(v,i){return (!scope.row.isSet && v.show && ( !v.rightField || !scope.row[v.rightField] || scope.row[v.rightField].value == 1 ))?_c('span',{staticClass:"el-tag el-tag--info el-tag--mini",staticStyle:{"cursor":"pointer"},on:{"click":function($event){_vm.buttonClick(scope.row, v)}}},[_vm._v("\n                "+_vm._s(v.label)+"\n              ")]):_vm._e()})]}}])}):_vm._e()],2)],1)],1)],1),_vm._v(" "),(_vm.model.description)?_c('div',{domProps:{"innerHTML":_vm._s(_vm.model.description)}}):_vm._e()])}
+var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{directives:[{name:"focus",rawName:"v-focus",value:(_vm.foucus),expression:"foucus"}],staticClass:"ct-form-list",class:{'tableDisabled':_vm.model.tableDisabled}},[(_vm.model.title)?_c('div',{staticClass:"list-title"},[_c('h5',[_vm._v(_vm._s(_vm.model.title))])]):(_vm.model.create || (_vm.model.selectRouter && _vm.model.selectRouter.id))?_c('div',{staticClass:"list-title"}):_vm._e(),_vm._v(" "),_c('div',{staticClass:"list-button"},[(_vm.model.selectRouter!==null)?_c(_vm.model.selectRouter.is,{tag:"component",attrs:{"vmodel":_vm.model.selectRouter},on:{"click":_vm.popupSearchListHandle}}):_vm._e(),_vm._v(" "),(_vm.model.create)?_c('el-button',{staticClass:"max-btn-add",staticStyle:{"width":"auto"},attrs:{"disabled":_vm.model.disabled,"type":"success","size":"mini","icon":"el-icon-circle-plus-outline"},on:{"click":_vm.addRow}},[_vm._v("\n      "+_vm._s(_vm.model.createText)+"\n    ")]):_vm._e()],1),_vm._v(" "),_c('div',{attrs:{"id":"listTable"}},[_c('el-row',[_c('el-col',{attrs:{"span":24}},[_c('el-table',{staticClass:"max-table--border",staticStyle:{"width":"100%"},attrs:{"size":"mini","data":_vm.model.tableData,"border":"","highlight-current-row":"","show-summary":_vm.model.showSummary,"summary-method":_vm.getSummaries}},[_vm._l((_vm.model.rows[0].field),function(v,i){return (v.show !== false && v.type!==13)?_c('el-table-column',{key:i,attrs:{"prop":v.id,"label":v.label,"width":v.width,"fixed":_vm.model.frozenColumns.includes(v.id),"render-header":_vm.renderHeader,"min-width":_vm.tableColumnWith},scopedSlots:_vm._u([{key:"header",fn:function(scope){return [_c('div',{class:[{'ct-table-required':v.required&&_vm.model.rows[0].edit&& _vm.model.rows[0].delete&&!_vm.model.tableDisabled},_vm.getHeadClass(v)]},[_vm._v("\n                "+_vm._s(v.label)+"\n              ")])]}},{key:"default",fn:function(scope){return [(scope.row.isSet)?_c('span',[_c(_vm.model.currentRow.data[v.id].locked || _vm.model.currentRow.data[v.id].is!==v.is?_vm.model.currentRow.data[v.id].is:v.is,{key:_vm.model.currentRow.data[v.id].rowKey+_vm.itemKey,ref:"Fields",refInFor:true,tag:"component",attrs:{"vmodel":_vm.model.currentRow.data[v.id],"api":_vm.model.OptApi},on:{"change":function($event){_vm.changeHandler(_vm.model.currentRow.data[v.id], _vm.model.currentRow.data.$sourceIndex)},"input":function($event){_vm.inputHandler(_vm.model.currentRow.data[v.id], _vm.model.currentRow.data.$sourceIndex)}}})],1):(v.is=='ct-sensitiveeye')?_c('span',[_c(v.is,{key:_vm.itemKey,ref:"Fields",refInFor:true,tag:"component",attrs:{"vmodel":scope.row[v.id],"vrowmodel":scope.row,"api":_vm.model.OptApi}})],1):(v.router)?_c('span',{class:'cell',staticStyle:{"display":"flex"}},[_c('ct-tablecurrency',{attrs:{"router":v.router,"colValue":scope.row[v.id].code1,"rowData":scope.row},on:{"click":_vm.rolRouterClickHandler}})],1):_c('ct-span',{key:scope.row[v.id].rowKey+_vm.itemKey,ref:"FieldsLabel",refInFor:true,attrs:{"vmodel":scope.row[v.id],"rowNum":scope.row.$sourceIndex,"rowData":scope.row}})]}}])}):_vm._e()}),_vm._v(" "),(_vm.model.rows[0].edit || _vm.model.rows[0].delete || (_vm.model.buttons.length > 0 && _vm.model.buttonsShow.length > 0))?_c('el-table-column',{attrs:{"label":"操作","fixed":_vm.fixedButtons,"width":'100%',"render-header":_vm.renderHeader,"min-width":_vm.tableColumnWith},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [(scope.row.edit || scope.row.isSet)?_c('span',{staticClass:"el-tag el-tag--info el-tag--mini",staticStyle:{"cursor":"pointer"},on:{"click":function($event){_vm.saveRow(scope.row,scope.$index,true)}}},[_vm._v("\n                "+_vm._s(scope.row.isSet?'保存':"修改")+"\n              ")]):_vm._e(),_vm._v(" "),(scope.row.delete && !scope.row.isSet)?_c('span',{staticClass:"el-tag el-tag--danger el-tag--mini",staticStyle:{"cursor":"pointer"},on:{"click":function($event){_vm.deleteRow(scope.$index, scope.row.$sourceIndex)}}},[_vm._v("\n                删除\n              ")]):(scope.row.isSet)?_c('span',{staticClass:"el-tag  el-tag--mini",staticStyle:{"cursor":"pointer"},on:{"click":function($event){_vm.saveRow(scope.row,scope.$index,false)}}},[_vm._v("\n                取消\n              ")]):_vm._e(),_vm._v(" "),_vm._l((_vm.model.buttons),function(v,i){return (!scope.row.isSet && v.show && ( !v.rightField || !scope.row[v.rightField] || scope.row[v.rightField].value == 1 ))?_c('span',{staticClass:"el-tag el-tag--info el-tag--mini",staticStyle:{"cursor":"pointer"},on:{"click":function($event){_vm.buttonClick(scope.row, v)}}},[_vm._v("\n                "+_vm._s(v.label)+"\n              ")]):_vm._e()})]}}])}):_vm._e()],2)],1)],1)],1),_vm._v(" "),(_vm.model.description)?_c('div',{domProps:{"innerHTML":_vm._s(_vm.model.description)}}):_vm._e()])}
 var staticRenderFns = []
 var esExports = { render: render, staticRenderFns: staticRenderFns }
 /* harmony default export */ __webpack_exports__["a"] = (esExports);