Skip to content

Commit d23086b

Browse files
longynlongyn
committed
Merge
1 parent 30ef75a commit d23086b

File tree

11 files changed

+62
-148
lines changed

11 files changed

+62
-148
lines changed

‎tyadmin_api_cli/antd/field.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ def Field_Template_Factory(field, many=None, manyStyle=None):
218218
<>
219219
220220
<EditOutlined title="编辑" className="icon" onClick={async () => {
221-
>>TIME_DEAL_PLACEHOLDER<<
221+
>>TIME_DEAL_PLACEHOLDER<<
222222
handleUpdateModalVisible(true);
223223
setUpdateFormValues(record);
224224
}} />
@@ -254,7 +254,7 @@ def Field_Template_Factory(field, many=None, manyStyle=None):
254254
<>
255255
256256
<EditOutlined title="编辑" className="icon" onClick={async () => {
257-
>>TIME_DEAL_PLACEHOLDER<<
257+
>>TIME_DEAL_PLACEHOLDER<<
258258
handleUpdateModalVisible(true);
259259
setUpdateFormValues(record);
260260
}} />

‎tyadmin_api_cli/antd_full_templates/config/auto_menu.json‎

Lines changed: 0 additions & 84 deletions
This file was deleted.

‎tyadmin_api_cli/antd_full_templates/config/config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import proxy from './proxy';
66
var fs = require("fs");
77
const path = require('path');
88
const { REACT_APP_ENV } = process.env;
9-
const auto_route = eval(fs.readFileSync(path.join(__dirname, 'route.js')).toString());
9+
const auto_route = eval(fs.readFileSync(path.join(__dirname, 'routes.js')).toString());
1010
export default defineConfig({
1111
hash: true,
1212
antd: {},

‎tyadmin_api_cli/antd_page_templates/base/index.jsx‎

Lines changed: 47 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -5,75 +5,75 @@ import KeyOutlined from '@ant-design/icons/lib/icons/KeyOutlined';
55
import { PageHeaderWrapper } from '@ant-design/pro-layout';
66
import ProTable from 'mtianyan-pro-table';
77
import CreateForm from './components/CreateForm';
8-
import {add>>MODEL_NAME<<, query>>MODEL_NAME<<, remove>>MODEL_NAME<<, update>>MODEL_NAME<<,query>>MODEL_NAME<<VerboseName, query>>MODEL_NAME<<ListDisplay, query>>MODEL_NAME<<DisplayOrder} from './service';
8+
import { add>>MODEL_NAME<<, query>>MODEL_NAME<<, remove>>MODEL_NAME<<, update>>MODEL_NAME<<, query>>MODEL_NAME<<VerboseName, query>>MODEL_NAME<<ListDisplay, query>>MODEL_NAME<<DisplayOrder} from './service';
99
import UpdateForm from './components/UpdateForm';
1010
import UploadAvatar from '@/components/UploadAvatar';
1111
>>IMPORT_PLACE<<
1212
>>PASSWORD_FORM<<
1313
import moment from 'moment';
14-
const {Option} = Select;
15-
import { BooleanFormItem, dealManyToManyFieldTags, fileUpload,twoColumns, richForm, richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans,dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle} from '@/utils/utils';
14+
const { Option } = Select;
15+
import { BooleanFormItem, dealManyToManyFieldTags, fileUpload, twoColumns, richForm, richCol, dealPureSelectField, orderForm, exportExcelCurrent, exportExcelAll, getUpdateColumns, dealRemoveError, dealError, BooleanDisplay, dealDateTimeDisplay, dealManyToManyField, dealTime, deepCopy, fieldErrorHandle, getTableColumns, renderManyToMany, richTrans, dealForeignKeyField, renderForeignKey, fieldsLevelErrorHandle } from '@/utils/utils';
1616
import 'braft-editor/dist/index.css'
1717
const FormItem = Form.Item;
1818
const TableList = () => {
1919
const [createModalVisible, handleModalVisible] = useState(false);
2020
const [updateModalVisible, handleUpdateModalVisible] = useState(false);
21-
>>PASSWORD_PLACE<<
21+
>>PASSWORD_PLACE<<
2222
const [updateFormValues, setUpdateFormValues] = useState({});
2323
const actionRef = useRef();
2424
const addFormRef = useRef();
2525
const updateFormRef = useRef();
2626

2727
const handleAdd = async fields => {
28-
const hide = message.loading('正在添加');
29-
30-
try {
31-
await add>>MODEL_NAME<<({...fields});
32-
hide();
33-
message.success('添加成功');
34-
return true;
35-
} catch (error) {
36-
return dealError(error, addFormRef, hide, "添加");
37-
}
38-
};
28+
const hide = message.loading('正在添加');
29+
30+
try {
31+
await add>>MODEL_NAME<<({ ...fields });
32+
hide();
33+
message.success('添加成功');
34+
return true;
35+
} catch (error) {
36+
return dealError(error, addFormRef, hide, "添加");
37+
}
38+
};
3939

4040
const handleUpdate = async (value, current_id) => {
41-
const hide = message.loading('正在修改');
42-
43-
try {
44-
await update>>MODEL_NAME<<(value, current_id);
45-
hide();
46-
message.success('修改成功');
47-
return true;
48-
} catch (error) {
41+
const hide = message.loading('正在修改');
42+
43+
try {
44+
await update>>MODEL_NAME<<(value, current_id);
45+
hide();
46+
message.success('修改成功');
47+
return true;
48+
} catch (error) {
4949
return dealError(error, updateFormRef, hide, "修改");
5050
}
5151
};
5252

5353
const handleRemove = async selectedRows => {
54-
const hide = message.loading('正在删除');
55-
if (!selectedRows) return true;
56-
57-
try {
58-
const ids = selectedRows.map(row => row.id).join(',');
59-
await remove>>MODEL_NAME<<(ids);
60-
hide();
61-
message.success('删除成功');
62-
return true;
63-
} catch (error) {
54+
const hide = message.loading('正在删除');
55+
if (!selectedRows) return true;
56+
57+
try {
58+
const ids = selectedRows.map(row => row.id).join(',');
59+
await remove>>MODEL_NAME<<(ids);
60+
hide();
61+
message.success('删除成功');
62+
return true;
63+
} catch (error) {
6464
hide()
6565
return dealRemoveError(error, "删除");
66-
}
67-
};
68-
>>UPDATE_PASSWORD_METHOD<<
66+
}
67+
};
68+
>>UPDATE_PASSWORD_METHOD<<
6969
const dateFieldList = [>>TIME_PLACE<<]
7070
const base_columns = [>>COLUMNS_LIST<<];
7171

7272
let cp = deepCopy(base_columns);
7373

7474
const [formOrder, setFormOrder] = useState([]);
7575

76-
useEffect(()=>{
76+
useEffect(() => {
7777
query>>MODEL_NAME<<DisplayOrder().then(r => {
7878
setFormOrder(r.form_order)
7979
})
@@ -91,18 +91,17 @@ const TableList = () => {
9191

9292
const [paramState, setParamState] = useState({});
9393

94-
useEffect(()=>{
94+
useEffect(() => {
9595
query>>MODEL_NAME<<ListDisplay().then(value => {
9696
setColumnsStateMap(value)
9797
})
98-
},[])
98+
}, [])
9999

100100

101-
>>FOREIGNKEY_PLACE<<
101+
>>FOREIGNKEY_PLACE<<
102102

103-
$外键占位$
104103

105-
>>MANY_TO_MANY_PLACE<<
104+
>>MANY_TO_MANY_PLACE<<
106105
return (
107106
<PageHeaderWrapper>
108107
<ProTable
@@ -121,10 +120,10 @@ $外键占位$
121120
<Button type="primary" onClick={() => handleModalVisible(true)}>
122121
<PlusOutlined /> 新建
123122
</Button>,
124-
<Button type="primary" onClick={() => exportExcelAll(paramState, query>>MODEL_NAME<<, table_columns, '>>MODEL_VERBOSE_NAME<<-All')}>
123+
<Button type="primary" onClick={() => exportExcelAll(paramState, query>>MODEL_NAME<<, table_columns, '>>MODEL_VERBOSE_NAME<<-All')}>
125124
<ExportOutlined /> 导出全部
126125
</Button>,
127-
<Input.Search style={{marginRight: 20}} placeholder="搜索>>MODEL_VERBOSE_NAME<< " onSearch={value => {
126+
<Input.Search style={{ marginRight: 20 }} placeholder="搜索>>MODEL_VERBOSE_NAME<<" onSearch={value => {
128127
setParamState({
129128
search: value,
130129
});
@@ -139,8 +138,8 @@ $外键占位$
139138
await handleRemove(selectedRows);
140139
actionRef.current.reloadAndRest();
141140
}
142-
else if(e.key === 'export_current'){
143-
exportExcelCurrent(selectedRows,table_columns, '>>MODEL_VERBOSE_NAME<<-select')
141+
else if (e.key === 'export_current') {
142+
exportExcelCurrent(selectedRows, table_columns, '>>MODEL_VERBOSE_NAME<<-select')
144143
}
145144
}}
146145
selectedKeys={[]}
@@ -170,7 +169,7 @@ $外键占位$
170169
</div> : false
171170

172171
)}
173-
request={(params, sorter, filter) => query>>MODEL_NAME<<({...params, sorter, filter})}
172+
request={(params, sorter, filter) => query>>MODEL_NAME<<({ ...params, sorter, filter })}
174173
columns={table_columns}
175174
rowSelection={{}}
176175
/>
@@ -227,7 +226,7 @@ $外键占位$
227226
rowSelection={{}}
228227
/>
229228
</UpdateForm>
230-
>>PASSWORD_UPDATE_FORM<<
229+
>>PASSWORD_UPDATE_FORM<<
231230
</PageHeaderWrapper>
232231
);
233232
};

‎tyadmin_api_cli/antd_page_templates/base/service.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import request from 'umi-request';
22

3-
import {buildFileFormData} from '@/utils/utils'
3+
import { buildFileFormData } from '@/utils/utils'
44
export async function query>>MODEL_NAME<<(params) {
55
return request('/api/xadmin/v1/>>MODEL_NAME_LOWER_CASE<<', {
66
params,

‎tyadmin_api_cli/deal_antd_route.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,13 @@ def gen_route(project_name_settings, user_label_list):
124124

125125
# Used for menu items loading from server side
126126
path = f'{settings.BASE_DIR}/tyadmin_api/menu.json'
127-
logging.info(f'gen: {path}')
127+
print(f'gen: {path}')
128128
with open(path, 'w', encoding='utf-8') as fw:
129129
fw.write(menu_string)
130130

131131
# Used for frontend url route in config.js
132132
path = f'{settings.BASE_DIR}/tyadmin/config/routes.js'
133-
logging.info(f'gen: {path}')
133+
print(f'gen: {path}')
134134
with open(path, 'w', encoding='utf-8') as fw:
135135
fw.write(route_string)
136136

‎tyadmin_api_cli/gen_one_model_all.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class {model_name}ViewSet(MyViewSet):
2020
"""
2121

2222
url_txt = f"""
23-
router.register('{get_lower_case_name(model_name)}/?', views.{model_name}ViewSet)
23+
router.register('{get_lower_case_name(model_name)}', views.{model_name}ViewSet)
2424
"""
2525

2626
filter_txt = f"""

‎tyadmin_api_cli/gen_serializer.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ def gen_serializer(project_name_settings, user_label_list):
9797
model_fk_dict[model_name] = fk_field_list
9898
model_list.append(model_name)
9999
many_2_many_list = []
100-
for filed in one.objects.model._meta.many_to_many:
101-
name = filed.name
102-
rela_model = filed.related_model._meta.object_name
100+
for field in one.objects.model._meta.many_to_many:
101+
name = field.name
102+
rela_model = field.related_model._meta.object_name
103103
# print("&&&" * 30)
104104
# print(one._meta.app_label, one._meta.model.__name__, rela_model)
105105
many_2_many_list.append(name + "$分割$" + rela_model)

‎tyadmin_api_cli/tyadmin_api_init/models.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
from datetime import datetime
21

32
from django.db import models
3+
from django.utils import timezone
44

55

66
class TyAdminSysLog(models.Model):
7-
action_time = models.DateTimeField(verbose_name="动作时间", default=datetime.now)
7+
action_time = models.DateTimeField(verbose_name="动作时间", default=timezone.now)
88
ip_addr = models.CharField(max_length=39, blank=True, null=True, verbose_name="操作ip")
99
action_flag = models.CharField(blank=True, null=True, max_length=32, verbose_name="操作flag")
1010
message = models.TextField(verbose_name="日志记录")
@@ -34,7 +34,7 @@ class TyAdminEmailVerifyRecord(models.Model):
3434
verbose_name=u"验证码类型")
3535
# 这里的now得去掉(),不去掉会根据编译时间。而不是根据实例化时间。
3636
send_time = models.DateTimeField(
37-
default=datetime.now, verbose_name=u"发送时间")
37+
default=timezone.now, verbose_name=u"发送时间")
3838

3939
class Meta:
4040
verbose_name = "TyAdmin邮箱验证码"

‎tyadmin_api_cli/tyadmin_api_init/urls.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
from rest_framework.routers import DefaultRouter
33

44
from tyadmin_api_cli.adapters.django_celery_beat_ty_admin import PeriodicTask_task
5-
from tyadmin_api.views import LoginView, CurrentUserView, CaptchaView, \
6-
UserSendCaptchaView, DashBoardView, UploadView, MenuView, \
5+
from tyadmin_api.views import LoginView, CurrentUserView, CaptchaView, UserSendCaptchaView, DashBoardView, UploadView, MenuView, \
76
UserChangePasswordView, UserListChangePasswordView, UserLogoutView
87
from tyadmin_api.views import TyAdminSysLogViewSet, TyAdminEmailVerifyRecordViewSet
98

0 commit comments

Comments
 (0)