cloud-web-corejs 1.0.54-dev.470 → 1.0.54-dev.471

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.470",
+  "version": "1.0.54-dev.471",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/xform/form-designer/form-widget/field-widget/census-widget.vue

@@ -17,8 +17,13 @@
 					<b>19850</b>
 				</div>
 			</div> -->
-      <div class="form-count-item" v-for="(item, idx) in field.options.censusItems" :key="idx"
-           :style="{ marginLeft: field.options.space + 'px' }">
+      <div
+        class="form-count-item"
+        v-for="(item, idx) in field.options.censusItems"
+        :key="idx"
+        :style="{ marginLeft: field.options.space + 'px' }"
+        @click="handleClick(item, idx, $event)"
+      >
         <div class="t1">
           <p>{{ item.txt }}</p>
           <b>{{ getRealData(item) }}</b>
@@ -35,14 +40,14 @@
 </template>
 
 <script>
-import StaticContentWrapper from './static-content-wrapper';
-import emitter from '../../../../../components/xform/utils/emitter';
-import i18n from '../../../../../components/xform/utils/i18n';
-import fieldMixin from '../../../../../components/xform/form-designer/form-widget/field-widget/fieldMixin';
+import StaticContentWrapper from "./static-content-wrapper";
+import emitter from "../../../../../components/xform/utils/emitter";
+import i18n from "../../../../../components/xform/utils/i18n";
+import fieldMixin from "../../../../../components/xform/form-designer/form-widget/field-widget/fieldMixin";
 
 export default {
-  name: 'census-widget',
-  componentName: 'FieldWidget', //必须固定为FieldWidget，用于接收父级组件的broadcast事件
+  name: "census-widget",
+  componentName: "FieldWidget", //必须固定为FieldWidget，用于接收父级组件的broadcast事件
   mixins: [emitter, fieldMixin, i18n],
   props: {
     field: Object,
@@ -53,27 +58,27 @@ export default {
 
     designState: {
       type: Boolean,
-      default: false
+      default: false,
     },
 
     subFormRowIndex: {
       /* 子表单组件行索引，从0开始计数 */
       type: Number,
-      default: -1
+      default: -1,
     },
     subFormColIndex: {
       /* 子表单组件列索引，从0开始计数 */
       type: Number,
-      default: -1
+      default: -1,
     },
     subFormRowId: {
       /* 子表单组件行Id，唯一id且不可变 */
       type: String,
-      default: ''
-    }
+      default: "",
+    },
   },
   components: {
-    StaticContentWrapper
+    StaticContentWrapper,
   },
   data() {
     return {
@@ -122,20 +127,20 @@ export default {
         return;
       }
       let formScriptEnabled = this.field.options.formScriptEnabled || false;
-      let scriptCode = this.field.options.formScriptCode
+      let scriptCode = this.field.options.formScriptCode;
       if (!scriptCode) return;
-      if (!formScriptEnabled) return
+      if (!formScriptEnabled) return;
       this.loadDataDefaultHandle();
     },
     loadDataDefaultHandle() {
       let formScriptEnabled = this.field.options.formScriptEnabled || false;
-      let scriptCode = this.field.options.formScriptCode
+      let scriptCode = this.field.options.formScriptCode;
       if (!scriptCode) return;
-      if (!formScriptEnabled) return
+      if (!formScriptEnabled) return;
 
       let reportTemplate = this.getFormRef().reportTemplate;
       let formCode = reportTemplate.formCode;
-      let accessParam = this.handleCustomEvent(this.field.options.formScriptParam)
+      let accessParam = this.handleCustomEvent(this.field.options.formScriptParam);
       return this.formHttp({
         scriptCode: scriptCode,
         data: {
@@ -143,20 +148,29 @@ export default {
           formVersion: reportTemplate.formVersion,
           taBm: this.fieldKeyName,
           data: {
-            ...accessParam
-          }
+            ...accessParam,
+          },
         },
-        callback: res => {
+        callback: (res) => {
           let data = res.objx || {};
-          this.fieldModel = data
-        }
+          this.fieldModel = data;
+        },
       });
-
     },
-  }
+    handleClick(row, rowIndex, event) {
+      this.handleCustomEvent(
+        this.field.options.onClick,
+        ["event", "param"],
+        [event, { row, rowIndex }]
+      );
+    },
+  },
 };
 </script>
 
 <style lang="scss" scoped>
-@import '~@/styles/global.scss'; //* static-content-wrapper已引入，还需要重复引入吗？ *//
+@import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
+.form-count-item {
+  cursor: pointer;
+}
 </style>

package/src/components/xform/form-designer/setting-panel/property-editor/event-handler/onClick-editor.vue

@@ -1,6 +1,10 @@
 <template>
   <el-form-item label="onClick" label-width="150px">
-    <a href="javascript:void(0);" class="a-link link-oneLind" @click="editEventHandler('onClick', eventParams)">
+    <a
+      href="javascript:void(0);"
+      class="a-link link-oneLind"
+      @click="editEventHandler('onClick', eventParams)"
+    >
       <span>{{ optionModel.onClick }}</span>
       <i class="el-icon-edit"></i>
     </a>
@@ -24,15 +28,18 @@ export default {
       // eventParams: ["id", "formCode"],
     };
   },
-  computed:{
-    eventParams(){
-      let eventParams = ["dataId", "formCode","event"];
+  computed: {
+    eventParams() {
+      let eventParams = ["dataId", "formCode", "event"];
       if (this.optionModel.rowFlag) {
-        eventParams.push("row", "index","event");
+        eventParams.push("row", "index", "event");
+      }
+      if (this.selectedWidget.type == "census") {
+        eventParams.push("param");
       }
       return eventParams;
-    }
-  }
+    },
+  },
 };
 </script>
 

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

@@ -3313,6 +3313,7 @@ export const advancedFields = [
 
       onCreated: "",
       onMounted: "",
+      onClick: "",
       ...defaultWfConfig,
       showRuleFlag: 1,
       showRuleEnabled: 1,