aldehyde 0.2.76 → 0.2.78

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 (64) hide show
  1. package/lib/controls/action/utils.js +1 -1
  2. package/lib/controls/action/utils.js.map +1 -1
  3. package/lib/controls/entity-select/popover-entity-select.d.ts +2 -0
  4. package/lib/controls/entity-select/popover-entity-select.d.ts.map +1 -1
  5. package/lib/controls/entity-select/popover-entity-select.js +31 -14
  6. package/lib/controls/entity-select/popover-entity-select.js.map +1 -1
  7. package/lib/controls/rfield/index.js +1 -1
  8. package/lib/detail/view/field-view-group.d.ts.map +1 -1
  9. package/lib/detail/view/field-view-group.js +0 -15
  10. package/lib/detail/view/field-view-group.js.map +1 -1
  11. package/lib/form/criteria-form.js +1 -1
  12. package/lib/form/criteria-form.js.map +1 -1
  13. package/lib/import/excel-import.d.ts +1 -0
  14. package/lib/import/excel-import.d.ts.map +1 -1
  15. package/lib/import/excel-import.js +66 -47
  16. package/lib/import/excel-import.js.map +1 -1
  17. package/lib/table/act-table.js +1 -1
  18. package/lib/table/act-table.js.map +1 -1
  19. package/lib/table/modal-select-table.d.ts.map +1 -1
  20. package/lib/table/modal-select-table.js +1 -1
  21. package/lib/table/modal-select-table.js.map +1 -1
  22. package/lib/table/query-table.d.ts +2 -1
  23. package/lib/table/query-table.d.ts.map +1 -1
  24. package/lib/table/query-table.js +10 -8
  25. package/lib/table/query-table.js.map +1 -1
  26. package/lib/table/select-table.d.ts.map +1 -1
  27. package/lib/table/select-table.js +1 -1
  28. package/lib/table/select-table.js.map +1 -1
  29. package/lib/tmpl/hcservice-v3.d.ts.map +1 -1
  30. package/lib/tmpl/hcservice-v3.js +3 -1
  31. package/lib/tmpl/hcservice-v3.js.map +1 -1
  32. package/lib/tmpl/interface.d.ts +2 -1
  33. package/lib/tmpl/interface.d.ts.map +1 -1
  34. package/lib/tmpl/interface.js.map +1 -1
  35. package/lib/tmpl/model-struc-v3.d.ts.map +1 -1
  36. package/lib/tmpl/model-struc-v3.js +6 -2
  37. package/lib/tmpl/model-struc-v3.js.map +1 -1
  38. package/lib/tmpl/superagent.d.ts.map +1 -1
  39. package/lib/tmpl/superagent.js +3 -1
  40. package/lib/tmpl/superagent.js.map +1 -1
  41. package/lib/tree/act-tree.js +2 -2
  42. package/lib/tree/tmpl-tree.d.ts.map +1 -1
  43. package/lib/tree/tmpl-tree.js +2 -5
  44. package/lib/tree/tmpl-tree.js.map +1 -1
  45. package/lib/welcome/HCWelcome.js +2 -1
  46. package/lib/welcome/HCWelcome.js.map +1 -1
  47. package/package.json +1 -1
  48. package/src/aldehyde/controls/action/utils.tsx +1 -1
  49. package/src/aldehyde/controls/entity-select/popover-entity-select.tsx +31 -11
  50. package/src/aldehyde/controls/rfield/index.tsx +1 -1
  51. package/src/aldehyde/detail/view/field-view-group.tsx +0 -15
  52. package/src/aldehyde/form/criteria-form.tsx +1 -1
  53. package/src/aldehyde/import/excel-import.tsx +204 -166
  54. package/src/aldehyde/table/act-table.tsx +1 -1
  55. package/src/aldehyde/table/modal-select-table.tsx +3 -1
  56. package/src/aldehyde/table/query-table.tsx +12 -9
  57. package/src/aldehyde/table/select-table.tsx +3 -1
  58. package/src/aldehyde/tmpl/hcservice-v3.tsx +3 -1
  59. package/src/aldehyde/tmpl/interface.tsx +2 -1
  60. package/src/aldehyde/tmpl/model-struc-v3.tsx +7 -2
  61. package/src/aldehyde/tmpl/superagent.js +3 -1
  62. package/src/aldehyde/tree/act-tree.tsx +2 -2
  63. package/src/aldehyde/tree/tmpl-tree.tsx +4 -5
  64. package/src/aldehyde/welcome/HCWelcome.js +1 -1
package/src/aldehyde/tmpl/model-struc-v3.tsx CHANGED
@@ -56,7 +56,9 @@ export default class ModelStrucV3 {
56
56
  }
57
57
  code = res.entityCode ? res.entityCode : res.code;
58
58
  }else{
59
- message.error("查询失败! " + res.message, 6);
59
+ if(res.message){
60
+ message.error("查询失败! " + res.message, 6);
61
+ }
60
62
  }
61
63
  } else {
62
64
  if (message) {
@@ -84,7 +86,10 @@ export default class ModelStrucV3 {
84
86
  }
85
87
  code = res.entityCode ? res.entityCode : res.code;
86
88
  }else{
87
- message.error("删除失败! " + res.message, 6);
89
+ if(res.message){
90
+ message.error("删除失败! " + res.message, 6);
91
+ }
92
+
88
93
  }
89
94
  } else {
90
95
  if (message) {
package/src/aldehyde/tmpl/superagent.js CHANGED
@@ -75,7 +75,9 @@ export default class Superagent {
75
75
  //message.error("没找到服务(" + options.url + ")")
76
76
  resolve(res);
77
77
  } else if (res.status === 500) {
78
- message.error("后台处理错误(" + res.text + ")",5)
78
+ if(res.text){
79
+ message.error("后台处理错误(" + res.text + ")",5)
80
+ }
79
81
  resolve(res);
80
82
  } else {
81
83
  message.error("请求服务失败!("+options.url+")",5)
package/src/aldehyde/tree/act-tree.tsx CHANGED
@@ -107,7 +107,7 @@ export default class ActTree extends React.PureComponent<ActTreeProps, ActTreeSt
107
107
  return <Card loading={true}></Card>
108
108
  }
109
109
  return (<Layout hasSider style={{backgroundColor: '#fff'}}>
110
- <Sider width={360} theme={'light'}
110
+ <Sider width={300} theme={'light'}
111
111
  style={{
112
112
  height: '90vh',
113
113
  position: 'fixed',
@@ -126,7 +126,7 @@ export default class ActTree extends React.PureComponent<ActTreeProps, ActTreeSt
126
126
  ref={this.refTmplTree}
127
127
  ></TmplTree>
128
128
  </Sider>
129
- <Layout style={{marginLeft: 382, backgroundColor: '#fff'}}>
129
+ <Layout style={{marginLeft: 322, backgroundColor: '#fff'}}>
130
130
  <Content style={{overflow: 'initial'}}>
131
131
  {showEdit ? <DtmplEditCard title={<>{recordCode ? <>编辑 {cardtitle?cardtitle:""}</> : <>添加 {cardtitle?cardtitle:""}</>} </>}
132
132
  mainCode={mainCode}
package/src/aldehyde/tree/tmpl-tree.tsx CHANGED
@@ -79,10 +79,10 @@ class TmplTree extends React.PureComponent<TmplTreeProps, TmplTreeState> {
79
79
  }
80
80
 
81
81
  async componentDidUpdate(prevProps) {
82
- debugger
82
+
83
83
  let {ttmplNodeConfig: preTtmplNodeConfig} = prevProps;
84
84
  let {ttmplNodeConfig} = this.props;
85
- debugger
85
+
86
86
  if (!ttmplNodeConfig || (preTtmplNodeConfig && ttmplNodeConfig.id == preTtmplNodeConfig.id)) {
87
87
  return;
88
88
  }
@@ -90,7 +90,6 @@ class TmplTree extends React.PureComponent<TmplTreeProps, TmplTreeState> {
90
90
  }
91
91
 
92
92
  async refresh() {
93
- debugger
94
93
  const {ttmplNodeConfig} = this.props;
95
94
  if (!ttmplNodeConfig) {
96
95
  return;
@@ -370,11 +369,11 @@ class TmplTree extends React.PureComponent<TmplTreeProps, TmplTreeState> {
370
369
  </Row>
371
370
  <Row>
372
371
  <Col span={24}>
373
- <Card bodyStyle={{padding: '4px 4px 4px 16px', height: '80vh', minWidth: '320px'}}
372
+ <Card bodyStyle={{padding: '4px 4px 4px 16px', height: '80vh', minWidth: '292px'}}
374
373
  loading={loading}>
375
374
  {treeData.length == 0 ? '没有找到数据' :
376
375
  <Scrollbars style={{height: '80vh'}} autoHide autoHideTimeout={1000}>
377
- <Tree blockNode
376
+ <Tree blockNode showLine={ttmplNodeConfig.showLine}
378
377
  checkable={false}
379
378
  expandedKeys={expandedKeys}
380
379
  onExpand={this.onExpand}
package/src/aldehyde/welcome/HCWelcome.js CHANGED
@@ -158,7 +158,7 @@ import withRouter from "../routable/withroute";
158
158
  <Col span={24} >
159
159
  <Card className="hovercard">
160
160
  <Row gutter={{xs: 8, sm: 16, md: 24, lg: 32}}>
161
- <Col span={12}><Image src={PainPoint} ></Image></Col>
161
+ <Col span={12}><Image src={PainPoint} ></Image>112ewqrewf</Col>
162
162
  <Col span={12}> <Image src={Target} ></Image></Col>
163
163
  </Row>
164
164
  </Card>