feat: support Form.Tag and remove unique formType checks (casibase#1634)

Attack825 · web-flow · commit 02469a3ef6d9 · 2025-10-11T20:37:58.000+08:00
diff --git a/object/form.go b/object/form.go
@@ -38,42 +38,12 @@ type Form struct {
 	Position    string `xorm:"varchar(100)" json:"position"`
 	Category    string `xorm:"varchar(100)" json:"category"`
 	Type        string `xorm:"varchar(100)" json:"type"`
+	Tag         string `xorm:"varchar(100)" json:"tag"`
 	Url         string `xorm:"varchar(100)" json:"url"`
 
 	FormItems []*FormItem `xorm:"varchar(5000)" json:"formItems"`
 }
 
-func getFormByType(formType string) ([]*Form, error) {
-	forms := []*Form{}
-	err := adapter.engine.Desc("created_time").Find(&forms, &Form{Type: formType})
-	if err != nil {
-		return forms, err
-	}
-
-	return forms, nil
-}
-
-func checkFormTypeExists(formType string, excludeId string) (bool, error) {
-	forms, err := getFormByType(formType)
-	if err != nil {
-		return false, err
-	}
-
-	if len(forms) == 0 {
-		return false, nil
-	}
-
-	if excludeId != "" {
-		for _, form := range forms {
-			if form.GetId() != excludeId {
-				return true, nil
-			}
-		}
-		return false, nil
-	}
-	return true, nil
-}
-
 func GetMaskedForm(form *Form, isMaskEnabled bool) *Form {
 	if !isMaskEnabled {
 		return form
@@ -149,16 +119,6 @@ func UpdateForm(id string, form *Form) (bool, error) {
 		return false, nil
 	}
 
-	if form.Type != "" && form.Type != existingForm.Type {
-		exists, err := checkFormTypeExists(form.Type, id)
-		if err != nil {
-			return false, err
-		}
-		if exists {
-			return false, fmt.Errorf("form type %s already exists", form.Type)
-		}
-	}
-
 	_, err = adapter.engine.ID(core.PK{owner, name}).AllCols().Update(form)
 	if err != nil {
 		return false, err
@@ -169,16 +129,6 @@ func UpdateForm(id string, form *Form) (bool, error) {
 }
 
 func AddForm(form *Form) (bool, error) {
-	if form.Type != "" {
-		exists, err := checkFormTypeExists(form.Type, "")
-		if err != nil {
-			return false, err
-		}
-		if exists {
-			return false, fmt.Errorf("form type %s already exists", form.Type)
-		}
-	}
-
 	affected, err := adapter.engine.Insert(form)
 	if err != nil {
 		return false, err
diff --git a/web/src/BaseListPage.js b/web/src/BaseListPage.js
@@ -70,7 +70,29 @@ class BaseListPage extends React.Component {
   UNSAFE_componentWillMount() {
     const {pagination} = this.state;
     this.fetch({pagination});
-    FormBackend.getForm(this.props.account.name, this.props.match?.path?.replace(/^\//, ""))
+    this.getForm();
+  }
+  getForm() {
+    const tag = this.props.account.tag;
+    const formType = this.props.match?.path?.replace(/^\//, "");
+    let formName = formType;
+    if (tag !== "") {
+      formName = formType + "-tag-" + tag;
+      FormBackend.getForm(this.props.account.owner, formName)
+        .then(res => {
+          if (res.status === "ok" && res.data) {
+            this.setState({formItems: res.data.formItems});
+          } else {
+            this.fetchFormWithoutTag(formType);
+          }
+        });
+    } else {
+      this.fetchFormWithoutTag(formType);
+    }
+  }
+
+  fetchFormWithoutTag(formName) {
+    FormBackend.getForm(this.props.account.owner, formName)
       .then(res => {
         if (res.status === "ok" && res.data) {
           this.setState({formItems: res.data.formItems});
diff --git a/web/src/FormDataPage.js b/web/src/FormDataPage.js
@@ -34,7 +34,7 @@ class FormDataPage extends Component {
   }
 
   getForm() {
-    FormBackend.getForm(this.props.account.name, this.state.formName)
+    FormBackend.getForm(this.props.account.owner, this.state.formName)
       .then((res) => {
         if (res.status === "ok") {
           this.setState({
diff --git a/web/src/FormDataTablePage.js b/web/src/FormDataTablePage.js
@@ -43,7 +43,7 @@ class FormDataPage extends BaseListPage {
   }
 
   getForm() {
-    FormBackend.getForm(this.props.account.name, this.state.formName)
+    FormBackend.getForm(this.props.account.owner, this.state.formName)
       .then((res) => {
         if (res.status === "ok") {
           this.setState({
diff --git a/web/src/FormEditPage.js b/web/src/FormEditPage.js
@@ -47,7 +47,7 @@ class FormEditPage extends React.Component {
   }
 
   getForm() {
-    FormBackend.getForm(this.props.account.name, this.state.formName)
+    FormBackend.getForm(this.props.account.owner, this.state.formName)
       .then((res) => {
         if (res.status === "ok") {
           this.setState({
@@ -187,6 +187,17 @@ class FormEditPage extends React.Component {
                   </Select>
                 </Col>
               </Row>
+              <Row style={{marginTop: "20px"}}>
+                <Col style={{marginTop: "5px"}} span={Setting.isMobile() ? 22 : 2}>
+                  {Setting.getLabel(i18next.t("general:Tag"), i18next.t("general:Tag - Tooltip"))} :
+                </Col>
+                <Col span={22}>
+                  <Input value={this.state.form.tag} onChange={e => {
+                    this.updateFormField("tag", e.target.value);
+                    this.updateFormField("name", e.target.value ? `${this.state.form.type}-tag-${e.target.value}` : this.state.form.type);
+                  }} />
+                </Col>
+              </Row>
               <Row style={{marginTop: "20px"}}>
                 <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
                   {Setting.getLabel(i18next.t("form:Form items"), i18next.t("form:Form items - Tooltip"))} :
diff --git a/web/src/FormListPage.js b/web/src/FormListPage.js
@@ -32,7 +32,7 @@ class FormListPage extends BaseListPage {
   newForm() {
     const randomName = Setting.getRandomName();
     return {
-      owner: this.props.account.name,
+      owner: this.props.account.owner,
       name: `form_${randomName}`,
       createdTime: moment().format(),
       displayName: `New Form - ${randomName}`,
@@ -256,7 +256,7 @@ class FormListPage extends BaseListPage {
     const field = params.searchedColumn, value = params.searchText;
     const sortField = params.sortField, sortOrder = params.sortOrder;
     this.setState({loading: true});
-    FormBackend.getForms(this.props.account.name, params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder)
+    FormBackend.getForms(this.props.account.owner, params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder)
       .then((res) => {
         this.setState({
           loading: false,

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ class FormDataPage extends Component {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`getForm() {`
`37`		`- FormBackend.getForm(this.props.account.name, this.state.formName)`
	`37`	`+ FormBackend.getForm(this.props.account.owner, this.state.formName)`
`38`	`38`	`.then((res) => {`
`39`	`39`	`if (res.status === "ok") {`
`40`	`40`	`this.setState({`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ class FormDataPage extends BaseListPage {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`getForm() {`
`46`		`- FormBackend.getForm(this.props.account.name, this.state.formName)`
	`46`	`+ FormBackend.getForm(this.props.account.owner, this.state.formName)`
`47`	`47`	`.then((res) => {`
`48`	`48`	`if (res.status === "ok") {`
`49`	`49`	`this.setState({`