cloud-web-corejs 1.0.54-dev.281 → 1.0.54-dev.283

package/src/components/xform/form-designer/setting-panel/property-editor/field-button/search-dialog-event-editor.vue

@@ -11,13 +11,20 @@
     <el-form-item label="弹框表单编码">
       <el-input type="text" v-model="eventConfig.formCode"></el-input>
     </el-form-item>
-    <el-form-item label="弹框参数">
+    <el-form-item label="弹框查询参数">
       <a href="javascript:void(0);" class="a-link link-oneLind"
          @click="editEventHandler('confirmCallback', ['dataId', 'formCode','rows'], option2)">
         <span>{{ eventConfig.dialogQueryParam }}</span>
         <i class="el-icon-edit"></i>
       </a>
     </el-form-item>
+    <el-form-item label="弹框自定义参数">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('dialogCustomParam', ['dataId', 'formCode','rows'], option3)">
+        <span>{{ eventConfig.dialogCustomParam }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
     <template v-if="hasConfig('vabsearchFlag')">
       <el-form-item label="关联来源字段">
         <el-input type="text" v-model="eventConfig.valueSourceField"></el-input>
@@ -175,7 +182,16 @@ export default {
           this.eventConfig.dialogQueryParam = code;
           this.$forceUpdate()
         }
-      }
+      },
+      option3: {
+        customCode: () => {
+          return this.eventConfig.dialogCustomParam;
+        },
+        callback: (code) => {
+          this.eventConfig.dialogCustomParam = code;
+          this.$forceUpdate()
+        }
+      },
     }
   },
   computed: {

package/src/components/xform/form-designer/widget-panel/widgetsConfig.js

@@ -779,6 +779,7 @@ export const defaultSearchDialogConfig = {
   multipleChoices: true,
   confirmCallback: null,
   dialogQueryParam: null,
+  dialogCustomParam:null
 };
 
 export const defaultWfConfig = {

package/src/layout/components/TagsView/index.vue

@@ -100,7 +100,7 @@ export default {
   methods: {
     getMenuName(item) {
       let locale = this.$i18n?.locale;
-      let zhTitle = item.meta?.reTitle || item.meta?.title || "";
+      let zhTitle = item.meta?.title || "";
       let enTitle = item.meta?.enTitle || '';
       let title;
       if (locale == "en") {

package/src/views/bd/setting/form_script/mixins/list1.js

@@ -150,6 +150,15 @@ modules = {
             width: 180,
             fixed: 'left'
           },
+          {
+            title: this.$t1('项目标签'), field: 'tag', width: 250, slots: {default: "tag"}, params: {
+              exportVal: ({row}) => {
+                if (row.formScriptTagDTOs) {
+                  return row.formScriptTagDTOs.map(item => item.tagName).join(",")
+                }
+              }
+            }
+          },
           {
             title: this.$t1('脚本编码'),
             field: 'scriptCode',
@@ -209,15 +218,6 @@ modules = {
               }
             }
           },
-          {
-            title: this.$t1('项目标签'), field: 'tag', width: 250, slots: {default: "tag"}, params: {
-              exportVal: ({row}) => {
-                if (row.formScriptTagDTOs) {
-                  return row.formScriptTagDTOs.map(item => item.tagName).join(",")
-                }
-              }
-            }
-          },
           {field: 'serviceName', title: this.$t1('服务名'), width: 150},
           {
             field: 'sid',

package/src/views/bd/setting/form_template/mixins/list.js

@@ -292,6 +292,21 @@ modules = {
             width: 150,
             fixed: "left",
           },
+          {
+            title: this.$t1("项目标签"),
+            field: "tag",
+            width: 250,
+            slots: {default: "tag"},
+            params: {
+              exportVal: ({row}) => {
+                if (row.formTemplateTagDTOs) {
+                  return row.formTemplateTagDTOs
+                    .map((item) => item.tagName)
+                    .join(",");
+                }
+              },
+            },
+          },
           {
             title: this.$t1("模板编码"),
             field: "formCode",
@@ -350,21 +365,6 @@ modules = {
             field: "remark",
             width: 150,
           },
-          {
-            title: this.$t1("项目标签"),
-            field: "tag",
-            width: 250,
-            slots: {default: "tag"},
-            params: {
-              exportVal: ({row}) => {
-                if (row.formTemplateTagDTOs) {
-                  return row.formTemplateTagDTOs
-                    .map((item) => item.tagName)
-                    .join(",");
-                }
-              },
-            },
-          },
           {field: "serviceName", title: this.$t1("服务名"), width: 150},
           {title: this.$t1("唯一标识"), field: "sid", width: 280},
           {

package/src/views/bd/setting/table_model/mixins/list.js

@@ -152,6 +152,15 @@ modules = {
         columns: [
           {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
           {title: this.$t1('实体名称'), field: 'taEn', width: 150, fixed: 'left'},
+          {
+            title: this.$t1('项目标签'), field: 'tag', width: 250, slots: {default: "tag"}, params: {
+              exportVal: ({row}) => {
+                if (row.szTaMbTagDTOs) {
+                  return row.szTaMbTagDTOs.map(item => item.tagName).join(",")
+                }
+              }
+            }
+          },
           {title: this.$t1('数据库表名'), field: 'taBm', width: 150},
           {title: this.$t1('表描述'), field: 'taCh', width: 150},
           {
@@ -179,15 +188,6 @@ modules = {
             }
           },
           {title: this.$t1('表单分类'), field: 'menuKindName', width: 150},
-          {
-            title: this.$t1('项目标签'), field: 'tag', width: 250, slots: {default: "tag"}, params: {
-              exportVal: ({row}) => {
-                if (row.szTaMbTagDTOs) {
-                  return row.szTaMbTagDTOs.map(item => item.tagName).join(",")
-                }
-              }
-            }
-          },
           {
             title: this.$t1("是否启用"),
             field: "enabled",