提交
This commit is contained in:
1 parent
0e1b750457
commit
8c49021d38
93 files changed
+22731
-12107
No files matched your search
@@ -11,6 +11,7 @@ from sqlalchemy.orm import Session
|
||||
from app.core.utils import generate_uuid
|
||||
from app.crud import oa_approval as oa_crud
|
||||
from app.models.models import OaApp, OaAppGroup, OaAppVersion, OaInstanceDraft
|
||||
from app.services.oa_related_approval import flatten_form_fields_for_summary
|
||||
|
||||
|
||||
def _loads(raw: Any, default: Any) -> Any:
|
||||
@@ -187,15 +188,21 @@ def list_drafts(
|
||||
)
|
||||
items: List[Dict[str, Any]] = []
|
||||
for d, app, ver, group in rows:
|
||||
items.append(
|
||||
row_to_dict(
|
||||
d,
|
||||
app_name=(app.app_name if app else "") or "",
|
||||
version_no=ver.version_no if ver else None,
|
||||
group_id=(app.group_id if app else "") or "",
|
||||
group_name=(group.group_name if group else "") or "",
|
||||
)
|
||||
item = row_to_dict(
|
||||
d,
|
||||
app_name=(app.app_name if app else "") or "",
|
||||
version_no=ver.version_no if ver else None,
|
||||
group_id=(app.group_id if app else "") or "",
|
||||
group_name=(group.group_name if group else "") or "",
|
||||
)
|
||||
schema = _loads(getattr(ver, "form_schema_json", None), {}) if ver else {}
|
||||
form_data = _loads(d.form_data_json, {}) or {}
|
||||
preview = [
|
||||
{"label": f.get("label") or "", "value": f.get("value") or ""}
|
||||
for f in flatten_form_fields_for_summary(schema, form_data)[:3]
|
||||
]
|
||||
item["previewFields"] = preview
|
||||
items.append(item)
|
||||
return items, int(total)
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user