centaline-data-driven 1.2.28 → 1.2.29

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/src/Form.vue +5 -20
  3. package/src/centaline/css/common.css +3 -0
  4. package/src/centaline/dialogList/src/dialog.vue +3 -3
  5. package/src/centaline/dynamicFile/src/dynamicFile.vue +16 -3
  6. package/src/centaline/dynamicForm/src/dynamicForm.vue +1 -2
  7. package/src/centaline/dynamicL/src/dynamicL.vue +2 -2
  8. package/src/centaline/dynamicPopupSearchList/src/dynamicPopupSearchListTable.vue +1 -1
  9. package/src/centaline/loader/src/ctl/Router.js +1 -0
  10. package/src/main.js +1 -1
  11. package/wwwroot/static/centaline/centaline-data-driven.js +3 -3
  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.2.28",
3
+ "version": "1.2.29",
4
4
  "description": "ccai",
5
5
  "author": "hjc <3226136347@qq.com>",
6
6
  "private": false,
package/src/Form.vue CHANGED
@@ -1,40 +1,25 @@
1
1
  <template>
2
2
  <div id="app-form" class="data-driven" style="width:100%;height:100%;overflow:auto">
3
- <!-- <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam"></ct-form> -->
3
+ <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam"></ct-form>
4
+ <!-- <ct-form :api="'/PropertyPublish/getLayoutOfNew'" :apiParam="apiParam"></ct-form> -->
4
5
  <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
5
6
  <!--:api="'FormSample/formdata'"-->
6
7
  <!--<ct-form :source="formdata.content"></ct-form>-->
7
8
  <!--<ct-form :api="'/api/form/formdata/contractDetail'" :apiParam="apiParam"></ct-form>-->
8
9
  <!--<ct-form :api="'api/Form/formdata'"></ct-form>-->
9
- <!-- <ct-form :api="'/forminfo/readDetail'" :apiParam="apiParam"></ct-form> -->
10
- <!-- <ct-form :api="'PropertyKey/getLayoutOfNew'" :apiParam="apiParam"></ct-form> -->
11
- <ct-form :api="'PropertyDuty/getLayoutOfClearDuty'" :apiParam="para"></ct-form>
12
- <!-- <ct-form :api="'/api/distribution/transaction/add'" :apiParam="apiParam"></ct-form> -->
13
10
  <ct-dialog-list></ct-dialog-list>
14
11
  </div>
15
12
  </template>
16
13
 
17
14
  <script>
18
15
  export default {
19
- name: 'DataDrivenForm',
16
+ name: 'App',
20
17
  data() {
21
18
  return {
22
- // apiParam: {originalTraId: "1481454808274235394", actionType: 3, pageTitle: "成交报告", pageOnly: true} ,
19
+ // apiParam: {originalTraId: "1475658732246241281", actionType: 2, chanceID: "1"} ,
20
+ apiParam: {originalTraId: "1475658732246241281", actionType: 3, pageTitle: "成交报告", pageOnly: true} ,
23
21
  // apiParam: {headerParam: {}, urlParam: {contractID: "06cad32e-4d0d-4b6f-bd24-16a28629a550", actionType: "0"}}
24
22
  // apiParam: {SN: "13557_132", UserID: "wuhan3"},
25
- // apiParam: {actionType: 3,formId: "2c12649f-09c5-4aa9-8011-b6d1c7b56a41"} ,
26
- // apiParam: {chanceID: "1", actionType: 2} ,
27
- // apiParam: {worklistID: "1494206747714392064", actionType: 2}
28
- para: {propertyID: "1", actionType: 2}
29
- // apiParam: {
30
- // actionType: 2,
31
- // agentId: "1450283160825425922",
32
- // estateId: "B6E6B3D8-FDF2-4AF8-91E6-B348D637E993",
33
- // pageOnly: true,
34
- // pageStyle: 2,
35
- // propertyId: "14102015-0736-9265-205A-451687BF7062",
36
- // relProId: "1475708315466829833",
37
- // }
38
23
  }
39
24
  },
40
25
  methods: {
package/src/centaline/css/common.css CHANGED
@@ -777,3 +777,6 @@ html {
777
777
  .details-mid .st-serach-screen,.details-mid .ct-searchtable{
778
778
  border-radius: initial;
779
779
  }
780
+ .current-row .el-table__cell .el-input-group__prepend{
781
+ min-width: 0!important;
782
+ }
package/src/centaline/dialogList/src/dialog.vue CHANGED
@@ -149,10 +149,10 @@
149
149
  if(item.attrs.height){
150
150
  ph=parseInt(item.attrs.height.replace('px',''));
151
151
  }
152
- if(self.vmodel.pane && self.vmodel.pane.$el.offsetHeight<ph){
153
- item.attrs.height=(self.vmodel.pane.$el.offsetHeight-30)+'px';
152
+ if(self.vmodel.pane && self.vmodel.pane.$el.clientHeight<ph){
153
+ item.attrs.height=(self.vmodel.pane.$el.clientHeight-40)+'px';
154
154
  }
155
- // console.log(document.body.offsetHeight);
155
+ // console.log(document.body.clientHeight);可见区域高度
156
156
  // console.log(item.attrs.height)
157
157
  return h('div', {
158
158
  style: {
package/src/centaline/dynamicFile/src/dynamicFile.vue CHANGED
@@ -34,16 +34,16 @@
34
34
  <span class="cover-list-item-span" v-if="model.lock||model.paramName">
35
35
  <!--锁定-->
36
36
  <span v-if="model.lock || !file.rightEdit" class="el-dropdown-link">
37
- &nbsp;{{file.mediaLabelName}}
37
+ <span style="width:80px;height:26px;display: inline-flex">&nbsp;{{file.mediaLabelName}}</span>
38
38
  </span>
39
39
  <!--复杂分类-->
40
40
  <span v-else-if="model.isComplexClassify" class="el-dropdown-link" @click="classifyFormClickHandle(file)">
41
- &nbsp;{{file.mediaLabelName}}<i class="el-icon-arrow-down el-icon--right"></i>
41
+ <span style="width:80px;height:26px;display: inline-flex">&nbsp;{{file.mediaLabelName}}</span><i class="el-icon-arrow-down el-icon--right"></i>
42
42
  </span>
43
43
  <!--简单分类-->
44
44
  <el-dropdown v-else class="el-upload-list__item-preview" trigger="click" placement="top" @command="classifySelectedClickHandle">
45
45
  <span class="el-dropdown-link" @click="classifyClickHandle">
46
- &nbsp;{{file.mediaLabelName}}<i class="el-icon-arrow-down el-icon--right"></i>
46
+ <span style="width:80px;height:26px;display: inline-flex">&nbsp;{{file.mediaLabelName}}</span><i class="el-icon-arrow-down el-icon--right"></i>
47
47
  </span>
48
48
  <el-dropdown-menu slot="dropdown" class="el-upload-list__item-preview">
49
49
  <el-dropdown-item v-for="(option, index) in model.optionModel.options" :key="index" :command="{option:option,file:file}">
@@ -331,6 +331,19 @@
331
331
  background-color: #544f48;
332
332
  opacity: 0.8;
333
333
  }
334
+ .ct-file .el-dropdown-link{
335
+ cursor: pointer;
336
+ color: #fff;
337
+ position: relative;
338
+ width: 100px;
339
+ height: 26px;
340
+ display: inline-block;
341
+ }
342
+ .el-icon--right {
343
+ position: absolute;
344
+ right: 5px;
345
+ top: 6px;
346
+ }
334
347
  .ct-file .cover-list-item-span-delete {
335
348
  position: inherit;
336
349
  bottom: 160px;
package/src/centaline/dynamicForm/src/dynamicForm.vue CHANGED
@@ -554,8 +554,7 @@
554
554
  },
555
555
  getFormObj(){
556
556
  let formData=this.model.getFormObj();
557
- if(this.$route && this.$route.query && this.$route.query.pageStyle)
558
- {
557
+ if(this.$route && this.$route.query && this.$route.query.pageStyle){
559
558
  return Object.assign(formData,{'pageStyle':this.$route.query.pageStyle});
560
559
  }
561
560
  return formData;
package/src/centaline/dynamicL/src/dynamicL.vue CHANGED
@@ -12,8 +12,8 @@
12
12
  </el-input>
13
13
  <span v-if="model.sufLabel" style="width:auto" class="spanMessage">{{model.sufLabel}}</span> -->
14
14
  <div class="el-input el-input--mini el-input-group el-input-group--prepend el-input--suffix showLabel lableinput">
15
- <div class="el-input-group__prepend">
16
- <div v-if="model.showLabel && model.label" slot="prepend" class="" :class="[model.labelClass]">
15
+ <div v-if="model.showLabel && model.label" class="el-input-group__prepend">
16
+ <div slot="prepend" class="" :class="[model.labelClass]">
17
17
  {{model.label}}
18
18
  </div>
19
19
  </div>
package/src/centaline/dynamicPopupSearchList/src/dynamicPopupSearchListTable.vue CHANGED
@@ -19,7 +19,7 @@
19
19
  :prop="col.id" :label="col.name" :min-width="col.width">
20
20
  </el-table-column>
21
21
  </el-table>
22
- <div style="margin-top: 20px; width:100%;">
22
+ <div style="margin-top: 20px;width: 100%;display: inline-block;height: 30px;margin-bottom: 10px;">
23
23
  <el-input v-if="jumpBtnName" size="mini" v-model="jumpStr" placeholder="定位" style="width:150px"></el-input>
24
24
  <el-button v-if="jumpBtnName" size="mini" @click="jumpClickHandler()">{{jumpBtnName}}</el-button>
25
25
  <el-button v-if="filterBtnName" size="mini" @click="filterClickHandler()" style="margin-left: 0px;">{{filterBtnName}}</el-button>
package/src/centaline/loader/src/ctl/Router.js CHANGED
@@ -213,6 +213,7 @@ const Router = function (source) {
213
213
  getActionPara(data) {
214
214
  let params = {};
215
215
  if (rtn.isSubmit) {
216
+ data = Object.assign(data, rtn.queryPara);
216
217
  params = {
217
218
  action: rtn.action,
218
219
  para: {
package/src/main.js CHANGED
@@ -36,7 +36,7 @@ Vue.use(centaline, {
36
36
  // 获取请求头
37
37
  getRequestHeaders: function () {
38
38
  return {
39
- oldToken: '3007e478-86db-4d5a-8ce0-7253afb746b2',
39
+ oldToken: 'e922a9d1-2dbe-4e39-91ca-aa77c4700aef',
40
40
  estateId: '20210729104021C49F04B55C50F6AF58',
41
41
  originalRequestURL: 'http://10.88.22.67:8080',
42
42
  Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjE0NmU5ZjEzLTVjMmYtNGVlMy1hM2U5LWIxM2QyZThjZTBhZSJ9.Gl8K5lbG7t5DyCqouu7Ux7Oh9xuAxqdOXr4JnoHCN-YwC3b2zPO-C2sHbYJUZHYQPa7kTNRmg1xJiwugpVo5Xw',