cloud-web-corejs 1.0.54-dev.112 → 1.0.54-dev.113

package/package.json

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

package/src/components/xform/form-designer/setting-panel/property-editor/project-tag-editor.vue

@@ -14,11 +14,16 @@
     </el-form-item>
     <el-form-item label="明细字段回填">
       <el-input v-model="optionModel.tagFillConfig" clearable></el-input>
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="openDialog">
+        <span>{{ optionModel.tagFillConfig.length ? "已维护" : "" }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
     </el-form-item>
     <el-form-item label="确认回调">
 <!--      <el-input v-model="optionModel.tagConfirmCallback" clearable></el-input>-->
       <a href="javascript:void(0);" class="a-link link-oneLind"
-         @click="editEventHandler('tagConfirmCallback', [])">
+         @click="editEventHandler('tagConfirmCallback', ['dataId', 'formCode'])">
         <span>{{ optionModel.tagConfirmCallback }}</span>
         <i class="el-icon-edit"></i>
       </a>
@@ -26,7 +31,7 @@
     <el-form-item label="删除回调">
 <!--      <el-input v-model="optionModel.tagDeleteCallback" clearable></el-input>-->
       <a href="javascript:void(0);" class="a-link link-oneLind"
-         @click="editEventHandler('tagDeleteCallback', [])">
+         @click="editEventHandler('tagDeleteCallback', ['dataId', 'formCode'])">
         <span>{{ optionModel.tagDeleteCallback }}</span>
         <i class="el-icon-edit"></i>
       </a>
@@ -42,6 +47,80 @@
         <i class="el-icon-edit"></i>
       </a>
     </el-form-item>-->
+    <el-dialog
+      custom-class="dialog-style list-dialog"
+      title="数据回填"
+      :visible.sync="showDialog"
+      :modal="false"
+      :show-close="!0"
+      :close-on-click-modal="!1"
+      :close-on-press-escape="!1"
+      :destroy-on-close="!0"
+      top="5vh"
+      width="500px"
+      v-dialog-drag
+    >
+      <div class="cont">
+        <el-table
+          ref="singleTable"
+          width="100%"
+          height="500"
+          :data="tableData"
+          border=""
+          stripe=""
+          default-expand-all
+        >
+          <el-table-column label="目标字段" width="150" prop="targetField">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.targetField"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column label="来源字段" width="150" prop="sourceField">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.sourceField"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" min-width="50" fixed="right">
+            <template #header="{ row, $index }">
+              <el-tooltip
+                :hide-after="500"
+                class="item"
+                effect="dark"
+                content="添加"
+                placement="top"
+              >
+                <el-button
+                  size="mini" type="" circle=""
+                  icon="el-icon-plus"
+                  @click="tableData.push({})"
+                />
+              </el-tooltip>
+            </template>
+            <template #default="{ row, $index }">
+              <el-tooltip
+                effect="dark"
+                content="删除"
+                placement="top"
+              >
+                <el-button
+                  size="mini" type="" circle=""
+                  icon="el-icon-delete"
+                  @click="tableData.splice($index,1)"
+                />
+              </el-tooltip>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="showDialog=false" class="button-sty" icon="el-icon-close">
+          {{ i18nt('designer.hint.cancel') }}
+        </el-button>
+        <el-button type="primary" @click="confirmDialog" class="button-sty" icon="el-icon-check">
+          {{ i18nt('designer.hint.confirm') }}
+        </el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -51,7 +130,7 @@ import eventMixin
   from "../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin"
 
 export default {
-  name: "formScriptEnabled-editor",
+  name: "project-tag-editor",
   mixins: [i18n, eventMixin],
   props: {
     designer: Object,
@@ -60,12 +139,22 @@ export default {
   },
   data() {
     return {
-      formScriptEnabledTypes: ['select', 'checkbox', 'radio', 'census']
+      formScriptEnabledTypes: ['select', 'checkbox', 'radio', 'census'],
+      showDialog: false,
+      tableData: [],
     }
   },
   methods: {
     getIsShow() {
       return this.selectedWidget.type !== 'data-table';
+    },
+    openDialog() {
+      this.tableData = this.$baseLodash.cloneDeep(this.optionModel.tagFillConfig);
+      this.showDialog = true;
+    },
+    confirmDialog() {
+      this.optionModel.tagFillConfig = this.$baseLodash.cloneDeep(this.tableData);
+      this.showDialog = false;
     }
   }
 }

package/src/components/xform/mixins/defaultHandle.js

@@ -73,15 +73,11 @@ modules = {
       let scriptCode = formConfig.saveScriptCode || "saveUpdate"
       let config = option?.config;
       // formRef.clearValidate();
-      formRef.$forceUpdate();
-      let formDataModel = formRef.formDataModel;
-      debugger
-      let inputWidget = this.getWidgetRef('input105254');
-      let rules = inputWidget.rules;
-      let options = inputWidget.options;
+      // formRef.$forceUpdate();
+      // let formDataModel = formRef.formDataModel;
+
       formRef.validate(valid => {
         if (valid) {
-          debugger
           let reqData = this.getReqFormData();
           this.formHttp({
             // url: "/" + reportTemplate.serviceName + "/form_ins/saveUpdate",