diff --git a/requirements.txt b/requirements.txt index 9d0deb6e..95edbd91 100644 --- a/requirements.txt +++ b/requirements.txt @@ -19,6 +19,7 @@ pytz==2020.1 requests==2.24.0 six==1.15.0 sqlparse==0.3.1 +tyadmin-api-cli==0.5.1 uritemplate==3.0.1 urllib3==1.25.10 tyadmin_api_cli diff --git a/tyadmin/config/auto_menu.json b/tyadmin/config/auto_menu.json index 2e271c3d..9ed6c2db 100644 --- a/tyadmin/config/auto_menu.json +++ b/tyadmin/config/auto_menu.json @@ -306,3 +306,4 @@ } ] }] + \ No newline at end of file diff --git a/tyadmin/src/pages/AutoGenPage/AddressList/index.jsx b/tyadmin/src/pages/AutoGenPage/AddressList/index.jsx index 226ff8c3..317091a1 100644 --- a/tyadmin/src/pages/AutoGenPage/AddressList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/AddressList/index.jsx @@ -12,7 +12,7 @@ import UploadAvatar from '@/components/UploadAvatar'; import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/AnswerList/index.jsx b/tyadmin/src/pages/AutoGenPage/AnswerList/index.jsx index 2bd60c98..328ac674 100644 --- a/tyadmin/src/pages/AutoGenPage/AnswerList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/AnswerList/index.jsx @@ -12,7 +12,7 @@ import UploadAvatar from '@/components/UploadAvatar'; import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/ArticleList/index.jsx b/tyadmin/src/pages/AutoGenPage/ArticleList/index.jsx index f98044d4..9142c924 100644 --- a/tyadmin/src/pages/AutoGenPage/ArticleList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/ArticleList/index.jsx @@ -12,7 +12,7 @@ import {queryArticleType, queryArticleTypeVerboseName} from '@/pages/AutoGenPage import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/ArticleTypeList/index.jsx b/tyadmin/src/pages/AutoGenPage/ArticleTypeList/index.jsx index 60c2c87b..139b9ed3 100644 --- a/tyadmin/src/pages/AutoGenPage/ArticleTypeList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/ArticleTypeList/index.jsx @@ -12,7 +12,7 @@ import UploadAvatar from '@/components/UploadAvatar'; import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/BillList/index.jsx b/tyadmin/src/pages/AutoGenPage/BillList/index.jsx index 46c0d46b..9e17d067 100644 --- a/tyadmin/src/pages/AutoGenPage/BillList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/BillList/index.jsx @@ -12,7 +12,7 @@ import {queryRechargePay, queryRechargePayVerboseName} from '@/pages/AutoGenPage import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/CartList/index.jsx b/tyadmin/src/pages/AutoGenPage/CartList/index.jsx index fd47dc52..4c9018bf 100644 --- a/tyadmin/src/pages/AutoGenPage/CartList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/CartList/index.jsx @@ -12,7 +12,7 @@ import UploadAvatar from '@/components/UploadAvatar'; import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/CatalogList/index.jsx b/tyadmin/src/pages/AutoGenPage/CatalogList/index.jsx index 3f32937a..7393a0ee 100644 --- a/tyadmin/src/pages/AutoGenPage/CatalogList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/CatalogList/index.jsx @@ -12,7 +12,7 @@ import UploadAvatar from '@/components/UploadAvatar'; import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/ChapterList/index.jsx b/tyadmin/src/pages/AutoGenPage/ChapterList/index.jsx index 01d5d7f0..ba2630f2 100644 --- a/tyadmin/src/pages/AutoGenPage/ChapterList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/ChapterList/index.jsx @@ -12,7 +12,7 @@ import {queryLesson, queryLessonVerboseName} from '@/pages/AutoGenPage/LessonLis import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/CommentList/index.jsx b/tyadmin/src/pages/AutoGenPage/CommentList/index.jsx index a87e542b..46f576f6 100644 --- a/tyadmin/src/pages/AutoGenPage/CommentList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/CommentList/index.jsx @@ -12,7 +12,7 @@ import UploadAvatar from '@/components/UploadAvatar'; import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/CommonPathConfigList/index.jsx b/tyadmin/src/pages/AutoGenPage/CommonPathConfigList/index.jsx index 1af7ebe4..d101feba 100644 --- a/tyadmin/src/pages/AutoGenPage/CommonPathConfigList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/CommonPathConfigList/index.jsx @@ -12,7 +12,7 @@ import UploadAvatar from '@/components/UploadAvatar'; import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/ConsultList/index.jsx b/tyadmin/src/pages/AutoGenPage/ConsultList/index.jsx index df577284..495c2cdf 100644 --- a/tyadmin/src/pages/AutoGenPage/ConsultList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/ConsultList/index.jsx @@ -12,7 +12,7 @@ import UploadAvatar from '@/components/UploadAvatar'; import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/ContentTypeList/index.jsx b/tyadmin/src/pages/AutoGenPage/ContentTypeList/index.jsx index 181803e6..b3313853 100644 --- a/tyadmin/src/pages/AutoGenPage/ContentTypeList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/ContentTypeList/index.jsx @@ -12,7 +12,7 @@ import UploadAvatar from '@/components/UploadAvatar'; import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/CouponList/index.jsx b/tyadmin/src/pages/AutoGenPage/CouponList/index.jsx index 6c95ba6b..228751e5 100644 --- a/tyadmin/src/pages/AutoGenPage/CouponList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/CouponList/index.jsx @@ -12,7 +12,7 @@ import {queryCouponRange, queryCouponRangeVerboseName} from '@/pages/AutoGenPage import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/CouponRangeList/index.jsx b/tyadmin/src/pages/AutoGenPage/CouponRangeList/index.jsx index 16c8c162..a4045cd9 100644 --- a/tyadmin/src/pages/AutoGenPage/CouponRangeList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/CouponRangeList/index.jsx @@ -12,7 +12,7 @@ import UploadAvatar from '@/components/UploadAvatar'; import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/CouponStatusList/index.jsx b/tyadmin/src/pages/AutoGenPage/CouponStatusList/index.jsx index 2e05fa7d..eab134a1 100644 --- a/tyadmin/src/pages/AutoGenPage/CouponStatusList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/CouponStatusList/index.jsx @@ -12,7 +12,7 @@ import UploadAvatar from '@/components/UploadAvatar'; import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/EmailVerifyRecordList/index.jsx b/tyadmin/src/pages/AutoGenPage/EmailVerifyRecordList/index.jsx index e69456d0..f74f0ef1 100644 --- a/tyadmin/src/pages/AutoGenPage/EmailVerifyRecordList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/EmailVerifyRecordList/index.jsx @@ -12,7 +12,7 @@ import UploadAvatar from '@/components/UploadAvatar'; import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/FooterList/index.jsx b/tyadmin/src/pages/AutoGenPage/FooterList/index.jsx index cf0288d4..1732b14f 100644 --- a/tyadmin/src/pages/AutoGenPage/FooterList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/FooterList/index.jsx @@ -12,7 +12,7 @@ import UploadAvatar from '@/components/UploadAvatar'; import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/GroupList/index.jsx b/tyadmin/src/pages/AutoGenPage/GroupList/index.jsx index ff1278b1..88dfdf4e 100644 --- a/tyadmin/src/pages/AutoGenPage/GroupList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/GroupList/index.jsx @@ -12,7 +12,7 @@ import {queryPermission} from '@/pages/AutoGenPage/PermissionList/service'; import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/HistoryList/index.jsx b/tyadmin/src/pages/AutoGenPage/HistoryList/index.jsx index 48147cf0..fd160909 100644 --- a/tyadmin/src/pages/AutoGenPage/HistoryList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/HistoryList/index.jsx @@ -12,7 +12,7 @@ import UploadAvatar from '@/components/UploadAvatar'; import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/HotList/index.jsx b/tyadmin/src/pages/AutoGenPage/HotList/index.jsx index 7c0b74e2..20e35af0 100644 --- a/tyadmin/src/pages/AutoGenPage/HotList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/HotList/index.jsx @@ -12,7 +12,7 @@ import UploadAvatar from '@/components/UploadAvatar'; import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/IntegralList/index.jsx b/tyadmin/src/pages/AutoGenPage/IntegralList/index.jsx index fbdaee06..c975b39d 100644 --- a/tyadmin/src/pages/AutoGenPage/IntegralList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/IntegralList/index.jsx @@ -12,7 +12,7 @@ import {queryIntegralType, queryIntegralTypeVerboseName} from '@/pages/AutoGenPa import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/IntegralTypeList/index.jsx b/tyadmin/src/pages/AutoGenPage/IntegralTypeList/index.jsx index 07441cca..c94a8c06 100644 --- a/tyadmin/src/pages/AutoGenPage/IntegralTypeList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/IntegralTypeList/index.jsx @@ -12,7 +12,7 @@ import UploadAvatar from '@/components/UploadAvatar'; import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/LabelFollowList/index.jsx b/tyadmin/src/pages/AutoGenPage/LabelFollowList/index.jsx index 9c36b14c..21a7dc33 100644 --- a/tyadmin/src/pages/AutoGenPage/LabelFollowList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/LabelFollowList/index.jsx @@ -12,7 +12,7 @@ import UploadAvatar from '@/components/UploadAvatar'; import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/LabelList/index.jsx b/tyadmin/src/pages/AutoGenPage/LabelList/index.jsx index 08abad9e..7e3b5a25 100644 --- a/tyadmin/src/pages/AutoGenPage/LabelList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/LabelList/index.jsx @@ -12,7 +12,7 @@ import {queryLabelType, queryLabelTypeVerboseName} from '@/pages/AutoGenPage/Lab import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/LabelTypeList/index.jsx b/tyadmin/src/pages/AutoGenPage/LabelTypeList/index.jsx index 68406657..d2867a04 100644 --- a/tyadmin/src/pages/AutoGenPage/LabelTypeList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/LabelTypeList/index.jsx @@ -12,7 +12,7 @@ import UploadAvatar from '@/components/UploadAvatar'; import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/LessonHardTypeList/index.jsx b/tyadmin/src/pages/AutoGenPage/LessonHardTypeList/index.jsx index 3ce18175..cb15fe29 100644 --- a/tyadmin/src/pages/AutoGenPage/LessonHardTypeList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/LessonHardTypeList/index.jsx @@ -12,7 +12,7 @@ import UploadAvatar from '@/components/UploadAvatar'; import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/LessonList/index.jsx b/tyadmin/src/pages/AutoGenPage/LessonList/index.jsx index b1482ec1..cd7e4c93 100644 --- a/tyadmin/src/pages/AutoGenPage/LessonList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/LessonList/index.jsx @@ -12,7 +12,7 @@ import {queryLabelType, queryLabelTypeVerboseName} from '@/pages/AutoGenPage/Lab import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/LessonScriptList/index.jsx b/tyadmin/src/pages/AutoGenPage/LessonScriptList/index.jsx index 05df1d92..879b8a36 100644 --- a/tyadmin/src/pages/AutoGenPage/LessonScriptList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/LessonScriptList/index.jsx @@ -12,7 +12,7 @@ import UploadAvatar from '@/components/UploadAvatar'; import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/LessonTypeList/index.jsx b/tyadmin/src/pages/AutoGenPage/LessonTypeList/index.jsx index cecfe9fd..20570b8b 100644 --- a/tyadmin/src/pages/AutoGenPage/LessonTypeList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/LessonTypeList/index.jsx @@ -12,7 +12,7 @@ import UploadAvatar from '@/components/UploadAvatar'; import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/LogList/index.jsx b/tyadmin/src/pages/AutoGenPage/LogList/index.jsx index 8b7d7183..f2a2ce1d 100644 --- a/tyadmin/src/pages/AutoGenPage/LogList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/LogList/index.jsx @@ -12,7 +12,7 @@ import {queryLogType, queryLogTypeVerboseName} from '@/pages/AutoGenPage/LogType import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/LogTypeList/index.jsx b/tyadmin/src/pages/AutoGenPage/LogTypeList/index.jsx index cfb8b1f1..39e315c6 100644 --- a/tyadmin/src/pages/AutoGenPage/LogTypeList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/LogTypeList/index.jsx @@ -12,7 +12,7 @@ import UploadAvatar from '@/components/UploadAvatar'; import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/NavList/index.jsx b/tyadmin/src/pages/AutoGenPage/NavList/index.jsx index 1e857c88..461eb55e 100644 --- a/tyadmin/src/pages/AutoGenPage/NavList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/NavList/index.jsx @@ -12,7 +12,7 @@ import UploadAvatar from '@/components/UploadAvatar'; import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/NavigationList/index.jsx b/tyadmin/src/pages/AutoGenPage/NavigationList/index.jsx index 81adcff0..f0a1b6db 100644 --- a/tyadmin/src/pages/AutoGenPage/NavigationList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/NavigationList/index.jsx @@ -12,7 +12,7 @@ import UploadAvatar from '@/components/UploadAvatar'; import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/NoticeList/index.jsx b/tyadmin/src/pages/AutoGenPage/NoticeList/index.jsx index b1237a17..0580bfc6 100644 --- a/tyadmin/src/pages/AutoGenPage/NoticeList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/NoticeList/index.jsx @@ -12,7 +12,7 @@ import UploadAvatar from '@/components/UploadAvatar'; import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/OrderItemList/index.jsx b/tyadmin/src/pages/AutoGenPage/OrderItemList/index.jsx index de86e47e..a0e94edb 100644 --- a/tyadmin/src/pages/AutoGenPage/OrderItemList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/OrderItemList/index.jsx @@ -12,7 +12,7 @@ import {queryOrder, queryOrderVerboseName} from '@/pages/AutoGenPage/OrderList/s import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/OrderList/index.jsx b/tyadmin/src/pages/AutoGenPage/OrderList/index.jsx index 0d4b90c7..d58c3fbd 100644 --- a/tyadmin/src/pages/AutoGenPage/OrderList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/OrderList/index.jsx @@ -12,7 +12,7 @@ import {queryOrderStatus, queryOrderStatusVerboseName} from '@/pages/AutoGenPage import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/OrderStatusList/index.jsx b/tyadmin/src/pages/AutoGenPage/OrderStatusList/index.jsx index 2aa9bd48..e1cccf84 100644 --- a/tyadmin/src/pages/AutoGenPage/OrderStatusList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/OrderStatusList/index.jsx @@ -12,7 +12,7 @@ import UploadAvatar from '@/components/UploadAvatar'; import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/PermissionList/index.jsx b/tyadmin/src/pages/AutoGenPage/PermissionList/index.jsx index eefd18bd..e926896b 100644 --- a/tyadmin/src/pages/AutoGenPage/PermissionList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/PermissionList/index.jsx @@ -12,7 +12,7 @@ import {queryContentType, queryContentTypeVerboseName} from '@/pages/AutoGenPage import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/QaList/index.jsx b/tyadmin/src/pages/AutoGenPage/QaList/index.jsx index e7ee2140..a5e88f42 100644 --- a/tyadmin/src/pages/AutoGenPage/QaList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/QaList/index.jsx @@ -12,7 +12,7 @@ import {queryQaType, queryQaTypeVerboseName} from '@/pages/AutoGenPage/QaTypeLis import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/QaTypeList/index.jsx b/tyadmin/src/pages/AutoGenPage/QaTypeList/index.jsx index f1e63ebd..4a931099 100644 --- a/tyadmin/src/pages/AutoGenPage/QaTypeList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/QaTypeList/index.jsx @@ -12,7 +12,7 @@ import UploadAvatar from '@/components/UploadAvatar'; import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/QuestionList/index.jsx b/tyadmin/src/pages/AutoGenPage/QuestionList/index.jsx index 02282c7f..06fe0fe7 100644 --- a/tyadmin/src/pages/AutoGenPage/QuestionList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/QuestionList/index.jsx @@ -12,7 +12,7 @@ import {queryLabel} from '@/pages/AutoGenPage/LabelList/service'; import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/ReadChapterItemList/index.jsx b/tyadmin/src/pages/AutoGenPage/ReadChapterItemList/index.jsx index f30ccf3b..4b491f53 100644 --- a/tyadmin/src/pages/AutoGenPage/ReadChapterItemList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/ReadChapterItemList/index.jsx @@ -12,7 +12,7 @@ import {queryReadChapter, queryReadChapterVerboseName} from '@/pages/AutoGenPage import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/ReadChapterList/index.jsx b/tyadmin/src/pages/AutoGenPage/ReadChapterList/index.jsx index e19aa914..995f3599 100644 --- a/tyadmin/src/pages/AutoGenPage/ReadChapterList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/ReadChapterList/index.jsx @@ -12,7 +12,7 @@ import {queryRead, queryReadVerboseName} from '@/pages/AutoGenPage/ReadList/serv import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/ReadList/index.jsx b/tyadmin/src/pages/AutoGenPage/ReadList/index.jsx index fe7b7174..8872d5e5 100644 --- a/tyadmin/src/pages/AutoGenPage/ReadList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/ReadList/index.jsx @@ -12,7 +12,7 @@ import {queryTeacher, queryTeacherVerboseName} from '@/pages/AutoGenPage/Teacher import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/ReadTypeList/index.jsx b/tyadmin/src/pages/AutoGenPage/ReadTypeList/index.jsx index 36587ee1..856ac71b 100644 --- a/tyadmin/src/pages/AutoGenPage/ReadTypeList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/ReadTypeList/index.jsx @@ -12,7 +12,7 @@ import UploadAvatar from '@/components/UploadAvatar'; import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/RechargeActionList/index.jsx b/tyadmin/src/pages/AutoGenPage/RechargeActionList/index.jsx index fed3e205..00337f9e 100644 --- a/tyadmin/src/pages/AutoGenPage/RechargeActionList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/RechargeActionList/index.jsx @@ -12,7 +12,7 @@ import UploadAvatar from '@/components/UploadAvatar'; import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/RechargeList/index.jsx b/tyadmin/src/pages/AutoGenPage/RechargeList/index.jsx index 7ef89188..a64281fa 100644 --- a/tyadmin/src/pages/AutoGenPage/RechargeList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/RechargeList/index.jsx @@ -12,7 +12,7 @@ import {queryRechargeAction, queryRechargeActionVerboseName} from '@/pages/AutoG import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/RechargePayList/index.jsx b/tyadmin/src/pages/AutoGenPage/RechargePayList/index.jsx index 09f19518..c3e4ec6f 100644 --- a/tyadmin/src/pages/AutoGenPage/RechargePayList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/RechargePayList/index.jsx @@ -12,7 +12,7 @@ import UploadAvatar from '@/components/UploadAvatar'; import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/SliderList/index.jsx b/tyadmin/src/pages/AutoGenPage/SliderList/index.jsx index dcb26252..f4a46bfb 100644 --- a/tyadmin/src/pages/AutoGenPage/SliderList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/SliderList/index.jsx @@ -12,7 +12,7 @@ import UploadAvatar from '@/components/UploadAvatar'; import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/StudentList/index.jsx b/tyadmin/src/pages/AutoGenPage/StudentList/index.jsx index 122f69cc..0ceddec8 100644 --- a/tyadmin/src/pages/AutoGenPage/StudentList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/StudentList/index.jsx @@ -12,7 +12,7 @@ import {queryStudentType, queryStudentTypeVerboseName} from '@/pages/AutoGenPage import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/StudentTypeList/index.jsx b/tyadmin/src/pages/AutoGenPage/StudentTypeList/index.jsx index 94ccb0eb..d279f952 100644 --- a/tyadmin/src/pages/AutoGenPage/StudentTypeList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/StudentTypeList/index.jsx @@ -12,7 +12,7 @@ import UploadAvatar from '@/components/UploadAvatar'; import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/SysLogList/index.jsx b/tyadmin/src/pages/AutoGenPage/SysLogList/index.jsx index 034e4c76..6443d824 100644 --- a/tyadmin/src/pages/AutoGenPage/SysLogList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/SysLogList/index.jsx @@ -12,7 +12,7 @@ import UploadAvatar from '@/components/UploadAvatar'; import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/TeacherList/index.jsx b/tyadmin/src/pages/AutoGenPage/TeacherList/index.jsx index 4dbff993..13a92cf5 100644 --- a/tyadmin/src/pages/AutoGenPage/TeacherList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/TeacherList/index.jsx @@ -12,7 +12,7 @@ import UploadAvatar from '@/components/UploadAvatar'; import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/TermList/index.jsx b/tyadmin/src/pages/AutoGenPage/TermList/index.jsx index 71f9a9c5..5a8936e3 100644 --- a/tyadmin/src/pages/AutoGenPage/TermList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/TermList/index.jsx @@ -12,7 +12,7 @@ import {queryChapter, queryChapterVerboseName} from '@/pages/AutoGenPage/Chapter import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/UserLessonList/index.jsx b/tyadmin/src/pages/AutoGenPage/UserLessonList/index.jsx index ec6149af..7dd617b5 100644 --- a/tyadmin/src/pages/AutoGenPage/UserLessonList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/UserLessonList/index.jsx @@ -12,7 +12,7 @@ import {queryLessonType, queryLessonTypeVerboseName} from '@/pages/AutoGenPage/L import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/UserList/index.jsx b/tyadmin/src/pages/AutoGenPage/UserList/index.jsx index 697c3151..e64fc8ca 100644 --- a/tyadmin/src/pages/AutoGenPage/UserList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/UserList/index.jsx @@ -13,7 +13,7 @@ import {updateUserPassword} from './service'; import UpdatePasswordForm from './components/UpdatePasswordForm'; import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin/src/pages/AutoGenPage/UserNoticeList/index.jsx b/tyadmin/src/pages/AutoGenPage/UserNoticeList/index.jsx index d45d6fe0..f6ecec90 100644 --- a/tyadmin/src/pages/AutoGenPage/UserNoticeList/index.jsx +++ b/tyadmin/src/pages/AutoGenPage/UserNoticeList/index.jsx @@ -12,7 +12,7 @@ import {queryNotice, queryNoticeVerboseName} from '@/pages/AutoGenPage/NoticeLis import moment from 'moment'; const {Option} = Select; -import { dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; +import { richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils'; import 'braft-editor/dist/index.css' const FormItem = Form.Item; const TableList = () => { diff --git a/tyadmin_api/auto_serializers.py b/tyadmin_api/auto_serializers.py index 75a52685..e6a1f78c 100644 --- a/tyadmin_api/auto_serializers.py +++ b/tyadmin_api/auto_serializers.py @@ -1,13 +1,12 @@ from rest_framework import serializers from django.contrib.auth.models import Permission, Group from django.contrib.contenttypes.models import ContentType -from app_api.models import EmailVerifyRecord, OrderStatus, Order, OrderItem, CouponRange, CouponStatus, Coupon, IntegralType, Integral, Notice, \ - LessonScript, Lesson, Question, Cart, Consult, User, Bill, Address, Catalog, LogType, Log, ReadType, ReadChapter, ReadChapterItem, Teacher, \ - Comment, Hot, RechargeAction, RechargePay, Recharge, LabelFollow, Student, StudentType, Navigation, Read, Article, History, QaType, Answer, Qa, \ - ArticleType, UserNotice, Slider, UserLesson, Nav, LabelType, LessonType, LessonHardType, Label, Footer, CommonPathConfig, Chapter, Term, SysLog +from app_api.models import EmailVerifyRecord, OrderStatus, Order, OrderItem, CouponRange, CouponStatus, Coupon, IntegralType, Integral, Notice, LessonScript, Lesson, Question, Cart, Consult, User, Bill, Address, Catalog, LogType, Log, ReadType, ReadChapter, ReadChapterItem, Teacher, Comment, Hot, RechargeAction, RechargePay, Recharge, LabelFollow, Student, StudentType, Navigation, Read, Article, History, QaType, Answer, Qa, ArticleType, UserNotice, Slider, UserLesson, Nav, LabelType, LessonType, LessonHardType, Label, Footer, CommonPathConfig, Chapter, Term, SysLog class ContentTypeListSerializer(serializers.ModelSerializer): + + key = serializers.CharField(source="pk") ty_options_display_txt = serializers.SerializerMethodField() @@ -21,18 +20,19 @@ def get_ty_options_display_txt(obj): class ContentTypeCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = ContentType fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class EmailVerifyRecordListSerializer(serializers.ModelSerializer): + + key = serializers.CharField(source="pk") ty_options_display_txt = serializers.SerializerMethodField() @@ -46,18 +46,19 @@ def get_ty_options_display_txt(obj): class EmailVerifyRecordCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = EmailVerifyRecord fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class OrderStatusListSerializer(serializers.ModelSerializer): + + key = serializers.CharField(source="pk") ty_options_display_txt = serializers.SerializerMethodField() @@ -71,18 +72,19 @@ def get_ty_options_display_txt(obj): class OrderStatusCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = OrderStatus fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class CouponRangeListSerializer(serializers.ModelSerializer): + + key = serializers.CharField(source="pk") ty_options_display_txt = serializers.SerializerMethodField() @@ -96,18 +98,19 @@ def get_ty_options_display_txt(obj): class CouponRangeCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = CouponRange fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class CouponStatusListSerializer(serializers.ModelSerializer): + + key = serializers.CharField(source="pk") ty_options_display_txt = serializers.SerializerMethodField() @@ -121,18 +124,19 @@ def get_ty_options_display_txt(obj): class CouponStatusCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = CouponStatus fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class IntegralTypeListSerializer(serializers.ModelSerializer): + + key = serializers.CharField(source="pk") ty_options_display_txt = serializers.SerializerMethodField() @@ -146,18 +150,19 @@ def get_ty_options_display_txt(obj): class IntegralTypeCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = IntegralType fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class NoticeListSerializer(serializers.ModelSerializer): + + key = serializers.CharField(source="pk") ty_options_display_txt = serializers.SerializerMethodField() @@ -171,18 +176,19 @@ def get_ty_options_display_txt(obj): class NoticeCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = Notice fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class LessonScriptListSerializer(serializers.ModelSerializer): + + key = serializers.CharField(source="pk") ty_options_display_txt = serializers.SerializerMethodField() @@ -196,18 +202,19 @@ def get_ty_options_display_txt(obj): class LessonScriptCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = LessonScript fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class CartListSerializer(serializers.ModelSerializer): + + key = serializers.CharField(source="pk") ty_options_display_txt = serializers.SerializerMethodField() @@ -221,18 +228,19 @@ def get_ty_options_display_txt(obj): class CartCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = Cart fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class ConsultListSerializer(serializers.ModelSerializer): + + key = serializers.CharField(source="pk") ty_options_display_txt = serializers.SerializerMethodField() @@ -246,18 +254,19 @@ def get_ty_options_display_txt(obj): class ConsultCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = Consult fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class AddressListSerializer(serializers.ModelSerializer): + + key = serializers.CharField(source="pk") ty_options_display_txt = serializers.SerializerMethodField() @@ -271,18 +280,19 @@ def get_ty_options_display_txt(obj): class AddressCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = Address fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class CatalogListSerializer(serializers.ModelSerializer): + + key = serializers.CharField(source="pk") ty_options_display_txt = serializers.SerializerMethodField() @@ -296,18 +306,19 @@ def get_ty_options_display_txt(obj): class CatalogCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = Catalog fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class LogTypeListSerializer(serializers.ModelSerializer): + + key = serializers.CharField(source="pk") ty_options_display_txt = serializers.SerializerMethodField() @@ -321,18 +332,19 @@ def get_ty_options_display_txt(obj): class LogTypeCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = LogType fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class ReadTypeListSerializer(serializers.ModelSerializer): + + key = serializers.CharField(source="pk") ty_options_display_txt = serializers.SerializerMethodField() @@ -346,18 +358,19 @@ def get_ty_options_display_txt(obj): class ReadTypeCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = ReadType fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class TeacherListSerializer(serializers.ModelSerializer): + + key = serializers.CharField(source="pk") ty_options_display_txt = serializers.SerializerMethodField() @@ -371,18 +384,19 @@ def get_ty_options_display_txt(obj): class TeacherCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = Teacher fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class CommentListSerializer(serializers.ModelSerializer): + + key = serializers.CharField(source="pk") ty_options_display_txt = serializers.SerializerMethodField() @@ -396,18 +410,19 @@ def get_ty_options_display_txt(obj): class CommentCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = Comment fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class HotListSerializer(serializers.ModelSerializer): + + key = serializers.CharField(source="pk") ty_options_display_txt = serializers.SerializerMethodField() @@ -421,18 +436,19 @@ def get_ty_options_display_txt(obj): class HotCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = Hot fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class RechargeActionListSerializer(serializers.ModelSerializer): + + key = serializers.CharField(source="pk") ty_options_display_txt = serializers.SerializerMethodField() @@ -446,18 +462,19 @@ def get_ty_options_display_txt(obj): class RechargeActionCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = RechargeAction fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class RechargePayListSerializer(serializers.ModelSerializer): + + key = serializers.CharField(source="pk") ty_options_display_txt = serializers.SerializerMethodField() @@ -471,18 +488,19 @@ def get_ty_options_display_txt(obj): class RechargePayCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = RechargePay fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class LabelFollowListSerializer(serializers.ModelSerializer): + + key = serializers.CharField(source="pk") ty_options_display_txt = serializers.SerializerMethodField() @@ -496,18 +514,19 @@ def get_ty_options_display_txt(obj): class LabelFollowCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = LabelFollow fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class StudentTypeListSerializer(serializers.ModelSerializer): + + key = serializers.CharField(source="pk") ty_options_display_txt = serializers.SerializerMethodField() @@ -521,18 +540,19 @@ def get_ty_options_display_txt(obj): class StudentTypeCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = StudentType fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class NavigationListSerializer(serializers.ModelSerializer): + + key = serializers.CharField(source="pk") ty_options_display_txt = serializers.SerializerMethodField() @@ -546,18 +566,19 @@ def get_ty_options_display_txt(obj): class NavigationCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = Navigation fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class HistoryListSerializer(serializers.ModelSerializer): + + key = serializers.CharField(source="pk") ty_options_display_txt = serializers.SerializerMethodField() @@ -571,18 +592,19 @@ def get_ty_options_display_txt(obj): class HistoryCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = History fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class QaTypeListSerializer(serializers.ModelSerializer): + + key = serializers.CharField(source="pk") ty_options_display_txt = serializers.SerializerMethodField() @@ -596,18 +618,19 @@ def get_ty_options_display_txt(obj): class QaTypeCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = QaType fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class AnswerListSerializer(serializers.ModelSerializer): + + key = serializers.CharField(source="pk") ty_options_display_txt = serializers.SerializerMethodField() @@ -621,18 +644,19 @@ def get_ty_options_display_txt(obj): class AnswerCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = Answer fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class ArticleTypeListSerializer(serializers.ModelSerializer): + + key = serializers.CharField(source="pk") ty_options_display_txt = serializers.SerializerMethodField() @@ -646,18 +670,19 @@ def get_ty_options_display_txt(obj): class ArticleTypeCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = ArticleType fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class SliderListSerializer(serializers.ModelSerializer): + + key = serializers.CharField(source="pk") ty_options_display_txt = serializers.SerializerMethodField() @@ -671,18 +696,19 @@ def get_ty_options_display_txt(obj): class SliderCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = Slider fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class NavListSerializer(serializers.ModelSerializer): + + key = serializers.CharField(source="pk") ty_options_display_txt = serializers.SerializerMethodField() @@ -696,18 +722,19 @@ def get_ty_options_display_txt(obj): class NavCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = Nav fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class LabelTypeListSerializer(serializers.ModelSerializer): + + key = serializers.CharField(source="pk") ty_options_display_txt = serializers.SerializerMethodField() @@ -721,18 +748,19 @@ def get_ty_options_display_txt(obj): class LabelTypeCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = LabelType fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class LessonTypeListSerializer(serializers.ModelSerializer): + + key = serializers.CharField(source="pk") ty_options_display_txt = serializers.SerializerMethodField() @@ -746,18 +774,19 @@ def get_ty_options_display_txt(obj): class LessonTypeCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = LessonType fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class LessonHardTypeListSerializer(serializers.ModelSerializer): + + key = serializers.CharField(source="pk") ty_options_display_txt = serializers.SerializerMethodField() @@ -771,18 +800,19 @@ def get_ty_options_display_txt(obj): class LessonHardTypeCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = LessonHardType fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class FooterListSerializer(serializers.ModelSerializer): + + key = serializers.CharField(source="pk") ty_options_display_txt = serializers.SerializerMethodField() @@ -796,18 +826,19 @@ def get_ty_options_display_txt(obj): class FooterCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = Footer fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class CommonPathConfigListSerializer(serializers.ModelSerializer): + + key = serializers.CharField(source="pk") ty_options_display_txt = serializers.SerializerMethodField() @@ -821,18 +852,19 @@ def get_ty_options_display_txt(obj): class CommonPathConfigCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = CommonPathConfig fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class SysLogListSerializer(serializers.ModelSerializer): + + key = serializers.CharField(source="pk") ty_options_display_txt = serializers.SerializerMethodField() @@ -846,18 +878,18 @@ def get_ty_options_display_txt(obj): class SysLogCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = SysLog fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class PermissionListSerializer(serializers.ModelSerializer): + content_type = ContentTypeCreateUpdateSerializer() key = serializers.CharField(source="pk") @@ -873,18 +905,18 @@ def get_ty_options_display_txt(obj): class PermissionCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = Permission fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class GroupListSerializer(serializers.ModelSerializer): + permissions = PermissionCreateUpdateSerializer(many=True) key = serializers.CharField(source="pk") @@ -900,18 +932,18 @@ def get_ty_options_display_txt(obj): class GroupCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = Group fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class OrderListSerializer(serializers.ModelSerializer): + status = OrderStatusCreateUpdateSerializer() way = RechargePayCreateUpdateSerializer() @@ -928,18 +960,18 @@ def get_ty_options_display_txt(obj): class OrderCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = Order fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class OrderItemListSerializer(serializers.ModelSerializer): + order = OrderCreateUpdateSerializer() key = serializers.CharField(source="pk") @@ -955,18 +987,18 @@ def get_ty_options_display_txt(obj): class OrderItemCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = OrderItem fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class CouponListSerializer(serializers.ModelSerializer): + range = CouponRangeCreateUpdateSerializer() status = CouponStatusCreateUpdateSerializer() @@ -983,18 +1015,18 @@ def get_ty_options_display_txt(obj): class CouponCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = Coupon fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class IntegralListSerializer(serializers.ModelSerializer): + type = IntegralTypeCreateUpdateSerializer() key = serializers.CharField(source="pk") @@ -1010,42 +1042,18 @@ def get_ty_options_display_txt(obj): class IntegralCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = Integral fields = "__all__" - - @staticmethod - def get_ty_options_display_txt(obj): - return str(obj) - - -class ReadCreateUpdateSerializer(serializers.ModelSerializer): - ty_options_display_txt = serializers.SerializerMethodField() - - class Meta: - model = Read - fields = "__all__" - - @staticmethod - def get_ty_options_display_txt(obj): - return str(obj) - - -class LabelCreateUpdateSerializer(serializers.ModelSerializer): - ty_options_display_txt = serializers.SerializerMethodField() - - class Meta: - model = Label - fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class LessonListSerializer(serializers.ModelSerializer): + category = LabelTypeCreateUpdateSerializer() type = LessonTypeCreateUpdateSerializer() hard = LessonHardTypeCreateUpdateSerializer() @@ -1066,18 +1074,18 @@ def get_ty_options_display_txt(obj): class LessonCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = Lesson fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class QuestionListSerializer(serializers.ModelSerializer): + tags = LabelCreateUpdateSerializer(many=True) key = serializers.CharField(source="pk") @@ -1093,18 +1101,18 @@ def get_ty_options_display_txt(obj): class QuestionCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = Question fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class UserListSerializer(serializers.ModelSerializer): + groups = GroupCreateUpdateSerializer(many=True) user_permissions = PermissionCreateUpdateSerializer(many=True) @@ -1121,18 +1129,18 @@ def get_ty_options_display_txt(obj): class UserCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = User fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class BillListSerializer(serializers.ModelSerializer): + way = RechargePayCreateUpdateSerializer() key = serializers.CharField(source="pk") @@ -1148,18 +1156,18 @@ def get_ty_options_display_txt(obj): class BillCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = Bill fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class LogListSerializer(serializers.ModelSerializer): + type = LogTypeCreateUpdateSerializer() key = serializers.CharField(source="pk") @@ -1175,18 +1183,18 @@ def get_ty_options_display_txt(obj): class LogCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = Log fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class ReadChapterListSerializer(serializers.ModelSerializer): + read = ReadCreateUpdateSerializer() key = serializers.CharField(source="pk") @@ -1202,18 +1210,18 @@ def get_ty_options_display_txt(obj): class ReadChapterCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = ReadChapter fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class ReadChapterItemListSerializer(serializers.ModelSerializer): + read_chapter = ReadChapterCreateUpdateSerializer() key = serializers.CharField(source="pk") @@ -1229,18 +1237,18 @@ def get_ty_options_display_txt(obj): class ReadChapterItemCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = ReadChapterItem fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class RechargeListSerializer(serializers.ModelSerializer): + action = RechargeActionCreateUpdateSerializer() way = RechargePayCreateUpdateSerializer() @@ -1257,18 +1265,18 @@ def get_ty_options_display_txt(obj): class RechargeCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = Recharge fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class StudentListSerializer(serializers.ModelSerializer): + type = StudentTypeCreateUpdateSerializer() key = serializers.CharField(source="pk") @@ -1284,18 +1292,18 @@ def get_ty_options_display_txt(obj): class StudentCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = Student fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class ReadListSerializer(serializers.ModelSerializer): + author = TeacherCreateUpdateSerializer() key = serializers.CharField(source="pk") @@ -1310,7 +1318,19 @@ def get_ty_options_display_txt(obj): return str(obj) +class ReadCreateUpdateSerializer(serializers.ModelSerializer): + + ty_options_display_txt = serializers.SerializerMethodField() + class Meta: + model = Read + fields = "__all__" + @staticmethod + def get_ty_options_display_txt(obj): + return str(obj) + + class ArticleListSerializer(serializers.ModelSerializer): + type = ArticleTypeCreateUpdateSerializer() key = serializers.CharField(source="pk") @@ -1326,18 +1346,18 @@ def get_ty_options_display_txt(obj): class ArticleCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = Article fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class QaListSerializer(serializers.ModelSerializer): + type = QaTypeCreateUpdateSerializer() key = serializers.CharField(source="pk") @@ -1353,18 +1373,18 @@ def get_ty_options_display_txt(obj): class QaCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = Qa fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class UserNoticeListSerializer(serializers.ModelSerializer): + messageid = NoticeCreateUpdateSerializer() key = serializers.CharField(source="pk") @@ -1380,18 +1400,18 @@ def get_ty_options_display_txt(obj): class UserNoticeCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = UserNotice fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class UserLessonListSerializer(serializers.ModelSerializer): + type = LessonTypeCreateUpdateSerializer() key = serializers.CharField(source="pk") @@ -1407,18 +1427,18 @@ def get_ty_options_display_txt(obj): class UserLessonCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = UserLesson fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class LabelListSerializer(serializers.ModelSerializer): + type = LabelTypeCreateUpdateSerializer() key = serializers.CharField(source="pk") @@ -1433,7 +1453,19 @@ def get_ty_options_display_txt(obj): return str(obj) +class LabelCreateUpdateSerializer(serializers.ModelSerializer): + + ty_options_display_txt = serializers.SerializerMethodField() + class Meta: + model = Label + fields = "__all__" + @staticmethod + def get_ty_options_display_txt(obj): + return str(obj) + + class ChapterListSerializer(serializers.ModelSerializer): + lesson = LessonCreateUpdateSerializer() key = serializers.CharField(source="pk") @@ -1449,18 +1481,18 @@ def get_ty_options_display_txt(obj): class ChapterCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = Chapter fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) class TermListSerializer(serializers.ModelSerializer): + chapter = ChapterCreateUpdateSerializer() key = serializers.CharField(source="pk") @@ -1476,12 +1508,11 @@ def get_ty_options_display_txt(obj): class TermCreateUpdateSerializer(serializers.ModelSerializer): + ty_options_display_txt = serializers.SerializerMethodField() - class Meta: model = Term fields = "__all__" - @staticmethod def get_ty_options_display_txt(obj): return str(obj) diff --git a/tyadmin_api/menu.json b/tyadmin_api/menu.json index 2e271c3d..9ed6c2db 100644 --- a/tyadmin_api/menu.json +++ b/tyadmin_api/menu.json @@ -306,3 +306,4 @@ } ] }] + \ No newline at end of file diff --git a/tyadmin_api_cli-0.5.3-py2.py3-none-any.whl b/tyadmin_api_cli-0.5.3-py2.py3-none-any.whl new file mode 100644 index 00000000..08670365 Binary files /dev/null and b/tyadmin_api_cli-0.5.3-py2.py3-none-any.whl differ