neo-cmp-cli 1.2.23 → 1.2.25

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 (3) hide show
  1. package/package.json +1 -1
  2. package/src/template/neo-custom-cmp-template/package.json +1 -1
  3. package/src/template/neo-custom-cmp-template/src/components/xobject-table/index.tsx +3 -3
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "neo-cmp-cli",
3
- "version": "1.2.23",
3
+ "version": "1.2.25",
4
4
  "description": "前端脚手架：自定义组件开发工具，支持react 和 vue2.0技术栈。",
5
5
  "keywords": [
6
6
  "neo-cli",
package/src/template/neo-custom-cmp-template/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "neo-custom-cmp-template",
3
- "version": "1.1.7",
3
+ "version": "1.1.9",
4
4
  "description": "neo自定义组件模板（react&ts技术栈）",
5
5
  "keywords": [
6
6
  "自定义组件模板",
package/src/template/neo-custom-cmp-template/src/components/xobject-table/index.tsx CHANGED
@@ -248,8 +248,8 @@ export default class XObjectTable extends React.PureComponent<
248
248
  generateColumns() {
249
249
  const { showEditButton, showDeleteButton, xObjectDataApi } = this.props;
250
250
  const { fieldList } = this.state;
251
- const { fields } = xObjectDataApi || {};
252
- let curFieldList = fieldList;
251
+ const { fields, fieldDescList } = xObjectDataApi || {};
252
+ let curFieldList = fieldDescList && fieldDescList.length > 0 ? fieldDescList : fieldList;
253
253
 
254
254
  if (fields && fields.length > 0) {
255
255
  // 如果 fields 存在，则过滤掉 fieldList 中不存在的字段
@@ -681,7 +681,7 @@ export default class XObjectTable extends React.PureComponent<
681
681
  const systemInfo = curAmisData.__NeoSystemInfo || {};
682
682
  const { xObjectApiKey } = this.props.xObjectDataApi || {};
683
683
  const columns = this.generateColumns();
684
- console.log('this.props：', this.props);
684
+ console.log('this.props：', this.props, columns);
685
685
 
686
686
  return (
687
687
  <div className="xobject-table-container">