centaline-data-driven-v3 0.0.64 → 0.0.66

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 (23) hide show
  1. package/dist/centaline-data-driven-v3.umd.js +82 -82
  2. package/package.json +2 -2
  3. package/src/assets/commonWeb.css +1 -45
  4. package/src/components/app/PhotoSelectList.vue +3 -1
  5. package/src/components/app/ViewerFile.vue +8 -7
  6. package/src/components/web/Button.vue +65 -8
  7. package/src/components/web/ComboBox.vue +2 -2
  8. package/src/components/web/Form.vue +157 -11
  9. package/src/components/web/FormList.vue +33 -2
  10. package/src/components/web/SearchList/SearchTable.vue +12 -3
  11. package/src/components/web/SearchScreen.vue +13 -4
  12. package/src/components/web/SensitiveEye.vue +3 -2
  13. package/src/components/web/TextBox.vue +11 -5
  14. package/src/loader/src/Button.js +6 -6
  15. package/src/loader/src/Field.js +1 -1
  16. package/src/loader/src/Form.js +4 -1
  17. package/src/loader/src/FormList.js +7 -1
  18. package/src/loader/src/SearchScreen.js +10 -10
  19. package/src/loader/src/SearchTable.js +5 -2
  20. package/src/main.js +5 -5
  21. package/src/utils/common.js +0 -1
  22. package/src/utils/mixins.js +11 -13
  23. package/src/views/SearchList.vue +3 -3
package/src/components/web/SensitiveEye.vue CHANGED
@@ -2,7 +2,7 @@
2
2
  <ct-field :vmodel="model">
3
3
  <template #Control>
4
4
  <span class="eyelabel">{{ showLable == true ? model.code1 : model.name1 }}</span>
5
- <el-icon size="16" v-if="model.name1" @click="onSensitiveEye()" style="margin-top: -2px;">
5
+ <el-icon size="16" v-if="model.name1" @click="onSensitiveEye()" style="margin-top: 5px;">
6
6
  <View v-if="showLable" />
7
7
  <Hide v-else />
8
8
  </el-icon>
@@ -57,6 +57,7 @@ defineExpose({
57
57
  </script>
58
58
  <style scoped>
59
59
  .eyelabel {
60
- min-width: 80px;
60
+ min-width: 80px;
61
+ line-height: 26px;
61
62
  }
62
63
  </style>
package/src/components/web/TextBox.vue CHANGED
@@ -2,7 +2,7 @@
2
2
  <ct-field :vmodel="model">
3
3
  <template #Control>
4
4
  <div v-if="model.controlType === Enum.ControlType.MultiLineText" style="width: 100%;">
5
- <el-input :type="model.inputType" v-model="model.code1" v-bind="model.attrs" @input="change()"
5
+ <el-input :type="model.inputType" v-model="model.code1" v-bind="model.attrs" @input="input()" @change="change()"
6
6
  :disabled="model.locked" :rows="model.rows" :readonly="model.readonly"
7
7
  :show-password="model.inputType == 'password'" autocomplete="on" :maxlength="model.maxValue1"
8
8
  :show-word-limit="model.showWordLimit" clearable @keyup.enter.native="search()" class="fieldControl">
@@ -12,7 +12,7 @@
12
12
  </el-input>
13
13
  <span v-if="model.sufLabel1" class="sufLabel" v-html="model.sufLabel1"></span>
14
14
  </div>
15
- <el-input v-else :type="model.inputType" v-model="model.code1" v-bind="model.attrs" @input="change()"
15
+ <el-input v-else :type="model.inputType" v-model="model.code1" v-bind="model.attrs" @input="input()" @change="change()"
16
16
  :disabled="model.locked" :rows="model.rows" :readonly="model.readonly"
17
17
  :show-password="model.inputType == 'password'" autocomplete="on" :maxlength="model.maxValue1"
18
18
  :show-word-limit="model.showWordLimit" clearable @keyup.enter.native="search()" class="fieldControl">
@@ -51,10 +51,16 @@ function search() {
51
51
  emit('search');
52
52
  }
53
53
  }
54
-
54
+ function input() {
55
+ if(model.value.controlType===Enum.ControlType.MultiLineText || model.value.controlType===Enum.ControlType.TextBox){
56
+ }
57
+ else{
58
+ change();
59
+ }
60
+ }
55
61
  function change() {
56
- changeHandler(model.value, emit);
57
- if (props.from == 'tree') { emit('search'); }
62
+ changeHandler(model.value, emit);
63
+ if (props.from == 'tree') { emit('search'); }
58
64
  }
59
65
  //弹出选择列表
60
66
  function popupSearchListHandle() {
package/src/loader/src/Button.js CHANGED
@@ -7,15 +7,15 @@ const Button = function (source) {
7
7
  let rtn = {
8
8
  icon: '',
9
9
  get bgColor() {
10
- if (source.controlType == Enum.ControlType.ButtonReset) {
11
- return '#519DA6'
12
- }
10
+ // if (source.controlType == Enum.ControlType.ButtonReset) {
11
+ // return '#519DA6'
12
+ // }
13
13
  return source.bgColor
14
14
  },
15
15
  get borderColor() {
16
- if (source.controlType == Enum.ControlType.ButtonReset) {
17
- return '#519DA6'
18
- }
16
+ // if (source.controlType == Enum.ControlType.ButtonReset) {
17
+ // return '#519DA6'
18
+ // }
19
19
  return source.borderColor
20
20
  },
21
21
  get action() {
package/src/loader/src/Field.js CHANGED
@@ -964,7 +964,7 @@ const Base = function (source, moreActionRouter) {
964
964
  getFormParentFieldPara() {
965
965
  if (rtn.form && typeof rtn.parentFields !== 'undefined' && rtn.parentFields.length > 0) {
966
966
  if (typeof rtn.form.getRefFieldPara === 'function') {
967
- return rtn.form.getParentFieldPara(rtn.parentFields);
967
+ return rtn.form.getParentFieldPara(rtn.parentFields,rtn.form);
968
968
  }
969
969
  }
970
970
  return null;
package/src/loader/src/Form.js CHANGED
@@ -706,6 +706,9 @@ function loadFromModel(source, isFormList) {
706
706
  get tip() {
707
707
  return source.tip;
708
708
  },
709
+ get flagAlertCloseWindowAfterSave() {
710
+ return source.flagAlertCloseWindowAfterSave === true;
711
+ },
709
712
  //获取表单数据
710
713
  getFormObj() {
711
714
  var rtnFormObj = {};
@@ -754,7 +757,7 @@ function loadFromModel(source, isFormList) {
754
757
  return submitData;
755
758
  },
756
759
  //获取父级关联数据
757
- getParentFieldPara(parentFieldNameArr) {
760
+ getParentFieldPara(parentFieldNameArr,model) {
758
761
  let submitData = {};
759
762
  var tempFormData = rtn.getFormObj();
760
763
  parentFieldNameArr.forEach((v) => {
package/src/loader/src/FormList.js CHANGED
@@ -324,7 +324,13 @@ function FormListModel(source, master,actionRouters) {
324
324
  }
325
325
  }
326
326
  return relfields;
327
- }
327
+ },
328
+ get rowActionRoutersAlign(){
329
+ if(source.rowActionRoutersAlign != undefined && source.rowActionRoutersAlign != null && source.rowActionRoutersAlign != ""){
330
+ return source.rowActionRoutersAlign;
331
+ }
332
+ return 2;
333
+ },
328
334
  };
329
335
  return rtn;
330
336
  }
package/src/loader/src/SearchScreen.js CHANGED
@@ -135,16 +135,16 @@ function loadSearchScreenModel(source, prevParam) {
135
135
  var advIndex = rtn.sourceFieldsArr.findIndex((v) => {
136
136
  return v.controlType === Enum.ControlType.ButtonAdvancedSearch;
137
137
  });
138
- if (advIndex === -1) {
139
- advIndex = rtn.sourceFieldsArr.findIndex((v) => {
140
- return v.controlType === Enum.ControlType.ButtonReset;
141
- });
142
- }
143
- if (advIndex === -1) {
144
- advIndex = rtn.sourceFieldsArr.findIndex((v) => {
145
- return v.controlType === Enum.ControlType.ButtonSearch;
146
- });
147
- }
138
+ // if (advIndex === -1) {
139
+ // advIndex = rtn.sourceFieldsArr.findIndex((v) => {
140
+ // return v.controlType === Enum.ControlType.ButtonReset;
141
+ // });
142
+ // }
143
+ // if (advIndex === -1) {
144
+ // advIndex = rtn.sourceFieldsArr.findIndex((v) => {
145
+ // return v.controlType === Enum.ControlType.ButtonSearch;
146
+ // });
147
+ // }
148
148
  var screens = rtn.sourceFieldsArr.filter((v, i) => {
149
149
  return (advIndex !== -1 && i > advIndex) && v.controlType !== Enum.ControlType.From;
150
150
  });
package/src/loader/src/SearchTable.js CHANGED
@@ -598,6 +598,9 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
598
598
  get dataDictionary() {
599
599
  return rtn._dataDictionary;
600
600
  },
601
+ get rowColorColumn() { //行字体颜色列
602
+ return source.content.rowColorColumn;
603
+ },
601
604
  //设置行样式
602
605
  setRow(rows) {
603
606
  rtn.setStyleRow(rows);
@@ -610,10 +613,10 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
610
613
  row.rowStyle = "";
611
614
  }
612
615
  if (rtn.rowColorColumn && row[rtn.rowColorColumn]) {
613
- row.rowStyle = row.rowStyle + "color:" + row[rtn.rowColorColumn] + ";";
616
+ row.rowStyle = row.rowStyle + ";color:" + row[rtn.rowColorColumn] + ";";
614
617
  }
615
618
  if (row.flagDrag && row.flagDrag == '1') {
616
- row.rowStyle = row.rowStyle + "cursor:move;";
619
+ row.rowStyle = row.rowStyle + "cursor:move;";
617
620
  }
618
621
  });
619
622
  },
package/src/main.js CHANGED
@@ -21,12 +21,12 @@ for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
21
21
  }
22
22
 
23
23
  app.use(centaline, {
24
- //baseUrl:"http://10.88.22.66/IBS.Mvc/api/",
25
- baseUrl: "http://10.88.22.66:6060/xian/",
24
+ baseUrl:"http://10.88.22.66/IBS.Mvc/api/",
25
+ //baseUrl: "http://10.88.22.66:6060/xian/",
26
26
  //baseUrl: "http://10.1.245.50:38735/max-uplink-api/",
27
27
  //baseUrl: "http://10.1.245.111:38028/",
28
28
  flagRouterSelf: true,
29
- flagApp: false,//是否app端
29
+ flagApp: true,//是否app端
30
30
  zindex: 999,
31
31
  showRequestSuccessMessage: true,
32
32
  showRequestErrorMessage: true,
@@ -63,8 +63,8 @@ app.use(centaline, {
63
63
  return {
64
64
  //authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVay1xvvOl3sJA2HiPIxElSIJBIIcXdAQEfPFK-YZt4Nlm2EChqtDafOYWqpRG6kxLoTxZhUTSRxHLUPH_DHfOmt5SDWt1gHScieHapNiol94q5pXYoNFJAvJ6isGHWmNMYVcBjWtyCr_iW2JZ93-fqPc8f18MwGIqFRCIO1GXmWGYd9npCZJ6N5JjYZ7g8AAAD__w.HgtNKtHWooj8c9Hy_vB8CfKq-qOeHMp0irnW0DfXtHo"}',
65
65
  //oldToken: 'd92d4a3b-2274-42e8-96f0-100ffb579b6e',
66
- authObject: '{token:"1-62bcf715-79c4-4a23-9780-269ea2f31478"}',
67
- //authObject: '{EmpID:"Token_1f937895-684b-4db0-83e5-6a18ce16763b",MachineCode:"7a216b39-84af-43bb-842b-07604ac37a10",SSO_Token:"SSOToken_1f937895-684b-4db0-83e5-6a18ce16763b",Platform:"WEB"}',
66
+ //authObject: '{token:"1-a7289bb2-9f1e-4a04-9016-1e555bf39188"}',
67
+ authObject: '{EmpID:"Token_052cca91-c75e-45cc-b549-90730d12f6bc",MachineCode:"e1f39b75-7069-4c4f-b5d5-c590da2d9aa2",SSO_Token:"SSOToken_052cca91-c75e-45cc-b549-90730d12f6bc",Platform:"IOS"}',
68
68
  };
69
69
  },
70
70
  // 请求完成事件，可判断是否登录过期执行响应操作
package/src/utils/common.js CHANGED
@@ -253,7 +253,6 @@ const common = {
253
253
  attrs: {
254
254
  options: options,
255
255
  text: message,
256
-
257
256
  onAccess: () => {
258
257
  self.closeDialog(dialogOption);
259
258
  resolve();
package/src/utils/mixins.js CHANGED
@@ -140,8 +140,6 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
140
140
  verified = model.$vue.validExcute();
141
141
  }
142
142
  if (verified) {
143
-
144
-
145
143
  if (verified) {
146
144
  //action有值，提交到后台
147
145
  if (field.action) {
@@ -189,7 +187,7 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
189
187
  common.message(data.rtnMsg, 'success')
190
188
  }
191
189
  if (data.notification === Enum.ActionType.Router) {
192
- if (common.dialogList && common.dialogList.List.length > 0
190
+ if (common.dialogList && common.dialogList.List.value.length > 0
193
191
  && (data.content.pageStyle === Enum.PageStyle.FormPageInLayer || data.content.pageStyle === Enum.PageStyle.SearchPageInLayer)) {
194
192
  }
195
193
  else {
@@ -256,7 +254,7 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
256
254
  common.message(data.rtnMsg, 'success')
257
255
  }
258
256
  if (data.notification === Enum.ActionType.Router) {
259
- if (common.dialogList && common.dialogList.List.length > 0
257
+ if (common.dialogList && common.dialogList.List.value.length > 0
260
258
  && (data.content.pageStyle === Enum.PageStyle.FormPageInLayer || data.content.pageStyle === Enum.PageStyle.SearchPageInLayer)) {
261
259
  }
262
260
  else {
@@ -300,21 +298,21 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
300
298
  model.pageDisabled = false;
301
299
  if (data.rtnCode === Enum.ReturnCode.Successful) {
302
300
  if (data.notification === Enum.ActionType.Router) {
303
- if (common.dialogList && common.dialogList.List.length > 0
301
+ if (common.dialogList && common.dialogList.List.value.length > 0
304
302
  && (data.content.pageStyle === Enum.PageStyle.FormPageInLayer || data.content.pageStyle === Enum.PageStyle.SearchPageInLayer)) {
305
303
  }
306
304
  else {
307
305
  model.$vue.clickHandler(model.getRtnRouter(data.content), null)
308
306
  }
309
307
  }
310
- if (model.flagAlertClose) {
308
+ if (model.flagAlertCloseWindowAfterSave) {
311
309
  common.confirm('操作成功，是否关闭本页面?', '提示', {
312
310
  confirmButtonText: '确定',
313
311
  cancelButtonText: '取消',
314
312
  type: 'warning'
315
313
  }).then(() => {
316
314
  //如果没有弹框 则关闭tab页
317
- if (common.dialogList && common.dialogList.List.length === 0) {
315
+ if (common.dialogList && common.dialogList.List.value.length === 0) {
318
316
  if (typeof common.getDataDrivenOpts().handler.closeTab === 'function') {
319
317
  common.getDataDrivenOpts().handler.closeTab(data);
320
318
  }
@@ -347,7 +345,7 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
347
345
  field.doAction(model.$vue.getFormObj({ flagHaveAlert: '1' }), (res) => {
348
346
  if (res.rtnCode === Enum.ReturnCode.Successful) {
349
347
  if (res.notification === Enum.ActionType.Router) {
350
- if (common.dialogList && common.dialogList.List.length > 0
348
+ if (common.dialogList && common.dialogList.List.value.length > 0
351
349
  && (res.content.pageStyle === Enum.PageStyle.FormPageInLayer || res.content.pageStyle === Enum.PageStyle.SearchPageInLayer)) {
352
350
  }
353
351
  else {
@@ -1008,7 +1006,7 @@ export function RouterMouseenterHandler(field, submitData, action, model, source
1008
1006
  common.message(data.rtnMsg, 'success')
1009
1007
  }
1010
1008
  if (data.notification === Enum.ActionType.Router) {
1011
- if (common.dialogList && common.dialogList.List.length > 0
1009
+ if (common.dialogList && common.dialogList.List.value.length > 0
1012
1010
  && (data.content.pageStyle === Enum.PageStyle.FormPageInLayer || data.content.pageStyle === Enum.PageStyle.SearchPageInLayer)) {
1013
1011
  }
1014
1012
  else {
@@ -1069,7 +1067,7 @@ export function RouterMouseenterHandler(field, submitData, action, model, source
1069
1067
  common.message(data.rtnMsg, 'success')
1070
1068
  }
1071
1069
  if (data.notification === Enum.ActionType.Router) {
1072
- if (common.dialogList && common.dialogList.List.length > 0
1070
+ if (common.dialogList && common.dialogList.List.value.length > 0
1073
1071
  && (data.content.pageStyle === Enum.PageStyle.FormPageInLayer || data.content.pageStyle === Enum.PageStyle.SearchPageInLayer)) {
1074
1072
  }
1075
1073
  else {
@@ -1111,14 +1109,14 @@ export function RouterMouseenterHandler(field, submitData, action, model, source
1111
1109
  model.$vue.clickHandler(model.getRtnRouter(data.content), null)
1112
1110
  }
1113
1111
  }
1114
- if (model.flagAlertClose) {
1112
+ if (model.flagAlertCloseWindowAfterSave) {
1115
1113
  common.confirm('操作成功，是否关闭本页面?', '提示', {
1116
1114
  confirmButtonText: '确定',
1117
1115
  cancelButtonText: '取消',
1118
1116
  type: 'warning'
1119
1117
  }).then(() => {
1120
1118
  //如果没有弹框 则关闭tab页
1121
- if (common.dialogList && common.dialogList.List.length === 0) {
1119
+ if (common.dialogList && common.dialogList.List.value.length === 0) {
1122
1120
  if (typeof common.getDataDrivenOpts().handler.closeTab === 'function') {
1123
1121
  common.getDataDrivenOpts().handler.closeTab(data);
1124
1122
  }
@@ -1151,7 +1149,7 @@ export function RouterMouseenterHandler(field, submitData, action, model, source
1151
1149
  field.doAction(model.$vue.getFormObj({ flagHaveAlert: '1' }), (res) => {
1152
1150
  if (res.rtnCode === Enum.ReturnCode.Successful) {
1153
1151
  if (res.notification === Enum.ActionType.Router) {
1154
- if (common.dialogList && common.dialogList.List.length > 0
1152
+ if (common.dialogList && common.dialogList.List.value.length > 0
1155
1153
  && (res.content.pageStyle === Enum.PageStyle.FormPageInLayer || res.content.pageStyle === Enum.PageStyle.SearchPageInLayer)) {
1156
1154
  }
1157
1155
  else {
package/src/views/SearchList.vue CHANGED
@@ -1,8 +1,8 @@
1
1
  <template>
2
2
  <div id="app-search" style="width:100%;height:100%;position: fixed;">
3
- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/admin/SchoolTeachingPlanList/getLayoutOfSearch'"
4
- :searchDataApi="'/admin/SchoolTeachingPlanList/getListOfSearchModel'"
5
- :searchStatsApi="'/admin/SchoolTeachingPlanList/getListStats'"></ct-searchlist>
3
+ <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyPublishList/getLayoutOfSearch'"
4
+ :searchDataApi="'/propertyPublishList/getListOfSearchModel'"
5
+ :searchStatsApi="'/propertyPublishList/getListStats'"></ct-searchlist>
6
6
  <ct-dialoglist ref="dialogList"></ct-dialoglist>
7
7
 
8
8
  </div>