cloud-web-corejs 1.0.72 → 1.0.74

package/src/components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin.js

@@ -10,12 +10,12 @@ export default {
       if(funStr) name = "已维护"
       return name;
     },
-    editEventHandler(eventName, eventParams, isFormSetting) {
+    editEventHandler(eventName, eventParams, option) {
       this.dispatch(
         "SettingPanel",
         "editEventHandler",
         [eventName, [...eventParams]],
-        isFormSetting
+        option
       );
     },
   },

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

@@ -40,6 +40,13 @@
         }}
       </el-button>
     </el-form-item>
+    <el-form-item label="确认回调">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('confirmCallback', ['dataId', 'formCode','rows'], option1)">
+        <span>{{ eventConfig.confirmCallback }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
 
     <el-dialog
       custom-class="dialog-style list-dialog"
@@ -120,9 +127,12 @@
 
 <script>
 import i18n from "../../../../../../components/xform/utils/i18n"
+import eventMixin
+  from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin"
+
 
 export default {
-  mixins: [i18n],
+  mixins: [i18n, eventMixin],
   props: {
     designer: Object,
     selectedWidget: Object,
@@ -133,6 +143,15 @@ export default {
     return {
       showDialog: false,
       tableData: [],
+      option1:{
+        customCode:()=>{
+          return this.eventConfig.confirmCallback;
+        },
+        callback:(code)=>{
+          this.eventConfig.confirmCallback = code;
+          this.$forceUpdate()
+        }
+      }
     }
   },
   computed: {

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

@@ -0,0 +1,76 @@
+<template>
+  <div>
+    <el-form-item label-width="0">
+      <el-divider class="custom-divider-margin-top">请求访问设置</el-divider>
+    </el-form-item>
+    <el-form-item label="表单编码">
+      <el-input v-model="optionModel.tagFormCode" clearable></el-input>
+    </el-form-item>
+    <el-form-item label="展示字段">
+      <el-input v-model="optionModel.tagLabelField" clearable></el-input>
+    </el-form-item>
+    <el-form-item label="唯一关键字段">
+      <el-input v-model="optionModel.tagUniqueField" clearable></el-input>
+    </el-form-item>
+    <el-form-item label="明细字段回填">
+      <el-input v-model="optionModel.tagFillConfig" clearable></el-input>
+    </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', [])">
+        <span>{{ optionModel.tagConfirmCallback }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+    <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', [])">
+        <span>{{ optionModel.tagDeleteCallback }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+    <el-form-item label="是否可以删除">
+      <el-switch v-model="optionModel.tabDeleteEnabled" clearable></el-switch>
+    </el-form-item>
+
+<!--    <el-form-item label="查询参数">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('formScriptParam', ['dataId', 'formCode'])">
+        <span>{{ optionModel.formScriptParam }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>-->
+  </div>
+</template>
+
+<script>
+import i18n from "../../../../../components/xform/utils/i18n"
+import eventMixin
+  from "../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin"
+
+export default {
+  name: "formScriptEnabled-editor",
+  mixins: [i18n, eventMixin],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object
+  },
+  data() {
+    return {
+      formScriptEnabledTypes: ['select', 'checkbox', 'radio', 'census']
+    }
+  },
+  methods: {
+    getIsShow() {
+      return this.selectedWidget.type !== 'data-table';
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

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

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div v-show="false">
     <el-form-item label-width="0">
       <el-divider class="custom-divider-margin-top">文本显示设置</el-divider>
     </el-form-item>

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

@@ -6,7 +6,7 @@
     <el-form-item :label="i18nt('有流程隐藏')">
       <el-switch v-model="optionModel.hiddenByWf" @change="changeHiddenByWf"></el-switch>
     </el-form-item>
-    <el-form-item :label="i18nt('特定流程节点可编辑')">
+    <el-form-item :label="i18nt('特定流程节点设置')">
       <el-switch v-model="optionModel.wfEdit" @change="changeWfEdit"></el-switch>
     </el-form-item>
     <el-form-item :label="i18nt('流程节点信息')">
@@ -15,13 +15,32 @@
         <i class="el-icon-edit"></i>
       </a>
     </el-form-item>
+    <el-form-item :label="i18nt('过程更改业务数据')">
+      <el-switch v-model="optionModel.wfModifyDataEnabled"></el-switch>
+    </el-form-item>
+    <el-form-item :label="i18nt('更改业务数据信息')">
+      <a href="javascript:void(0);" class="a-link link-oneLind" @click="openDialog2">
+        <span>{{ optionModel.wfModifyDataConfig && optionModel.wfModifyDataConfig.length ? "已维护" : "" }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+
+    <!--    <el-form-item :label="i18nt('特定流程节点显隐')">
+          <el-switch v-model="optionModel.wfEdit" @change="changeWfEdit"></el-switch>
+        </el-form-item>
+        <el-form-item :label="i18nt('流程节点信息')">
+          <a href="javascript:void(0);" class="a-link link-oneLind" @click="openDialog">
+            <span>{{ optionModel.wfConfigData && optionModel.wfConfigData.length ? "已维护" : "" }}</span>
+            <i class="el-icon-edit"></i>
+          </a>
+        </el-form-item>-->
     <el-dialog
       v-if="dialogVisible"
       custom-class="dialog-style list-dialog"
       :title="i18nt('流程节点信息')"
       :visible.sync="dialogVisible"
       :show-close="!0"
-      :append-to-body="false"
+      :append-to-body="true"
       :modal="false"
       :close-on-click-modal="!1"
       :close-on-press-escape="!1"
@@ -29,16 +48,18 @@
       width="1220px"
       top="5vh"
       v-dialog-drag
+      :fullscreen="true"
     >
-      <div class="cont">
+      <div class="cont" style="padding-bottom: 8px;">
         <el-table
           ref="singleTable"
           width="100%"
           :data="tableData"
-          height="500"
+          height="100%"
           border=""
           row-key="columnId"
           stripe=""
+          style="margin-bottom: 0px;"
         >
           <el-table-column type="index" width="35" fixed="left"></el-table-column>
           <el-table-column :label="i18nt('服务')" width="150">
@@ -56,33 +77,30 @@
               <el-input v-model="row.serveName" clearable :disabled="row.serveType!==4"></el-input>
             </template>
           </el-table-column>
-          <el-table-column :label="i18nt('组织')" width="250">
+          <el-table-column :label="i18nt('组织编码')" width="250">
             <template slot-scope="{row,$index}">
-              <el-input
-                class="search-input"
-                :value="getCompanyNames(row)"
-                clearable
-                @clear="
-                  row.companyInfos = [];
-                "
-                v-el-readonly
-              >
-                <i slot="suffix" class="el-input__icon el-icon-search"
-                   @click="openCompanyDialog(row, $index)"></i>
-              </el-input>
+              <el-input v-model="row.companyCodes" clearable></el-input>
             </template>
           </el-table-column>
-          <el-table-column :label="i18nt('流程模板')" width="150">
+          <el-table-column :label="i18nt('流程模板编码')" width="150">
             <template slot-scope="{row}">
               <el-input v-model="row.modelKey" clearable></el-input>
             </template>
           </el-table-column>
-          <el-table-column :label="i18nt('节点')" width="250">
+          <el-table-column :label="i18nt('节点步骤')" width="250">
             <template slot-scope="{row}">
               <el-input v-model="row.taskSteps" clearable></el-input>
             </template>
           </el-table-column>
-
+          <el-table-column :label="i18nt('设置')" width="150">
+            <template slot-scope="{row}">
+              <el-select v-model="row.type" clearable>
+                <el-option :value="1" label="可编辑"></el-option>
+                <el-option :value="2" label="仅显示"></el-option>
+                <el-option :value="3" label="隐藏"></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
           <!--          <el-table-column :label="i18nt('流程模板')" width="250" prop="label">
                       <template slot-scope="scope">
                         <el-select v-model="scope.row.modelId" @change="changeModelId">
@@ -130,6 +148,92 @@
         </el-button>
       </div>
     </el-dialog>
+    <el-dialog
+      v-if="dialogVisible2"
+      custom-class="dialog-style list-dialog"
+      :title="i18nt('过程更改业务数据')"
+      :visible.sync="dialogVisible2"
+      :show-close="!0"
+      :append-to-body="true"
+      :modal="false"
+      :close-on-click-modal="!1"
+      :close-on-press-escape="!1"
+      :destroy-on-close="!0"
+      width="1220px"
+      top="5vh"
+      v-dialog-drag
+    >
+      <div class="cont" style="padding-bottom: 8px;">
+        <el-table
+          ref="singleTable"
+          width="100%"
+          :data="tableData2"
+          height="500px"
+          border=""
+          row-key="columnId"
+          stripe=""
+          style="margin-bottom: 0px;"
+        >
+          <el-table-column type="index" width="35" fixed="left"></el-table-column>
+          <el-table-column :label="i18nt('流程动作')" width="150">
+            <template slot-scope="{row}">
+              <el-select v-model="row.action">
+                <el-option value="start" label="流程启动"></el-option>
+                <el-option value="interrupt" label="流程中断"></el-option>
+                <el-option value="end" label="流程完成"></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <!--          <el-table-column :label="i18nt('值类型')" width="250">
+                      <template slot-scope="{row}">
+                        <el-select v-model="row.valueType" @change="changeValueType">
+                          <el-option :value="1" label="文本"></el-option>
+                          <el-option :value="2" label="数值"></el-option>
+                          <el-option :value="3" label="布尔值"></el-option>
+                        </el-select>
+                      </template>
+                    </el-table-column>-->
+          <el-table-column :label="i18nt('设置的值')" width="650">
+            <template slot-scope="{row}">
+              <el-input v-model="row.toValue" clearable></el-input>
+              <!--              <el-input v-model="row.toValue" clearable v-if="row.valueType==1"></el-input>
+                            <base-input-number v-model="row.toValue" clearable v-else-if="row.valueType==2"></base-input-number>
+                            <el-radio-group v-model="row.toValue" v-else-if="row.valueType==3">
+                              <el-radio :label="true">true</el-radio>
+                              <el-radio :label="false">false</el-radio>
+                            </el-radio-group>-->
+
+            </template>
+          </el-table-column>
+          <el-table-column :label="i18nt('designer.setting.actionColumn')" width="100" align="center">
+            <template #header>
+              <span>{{ i18nt('designer.setting.actionColumn') }}</span>
+              <el-button :title="i18nt('designer.setting.addTableColumn')" size="mini" type="" circle=""
+                         icon="el-icon-plus" @click="addItem2"></el-button>
+            </template>
+            <template slot-scope="scope">
+              <el-button
+                :title="i18nt('designer.setting.deleteTableColumn')"
+                size="mini"
+                type=""
+                circle=""
+                icon="el-icon-minus"
+                @click="tableData2.splice(scope.$index,1)"
+              ></el-button>
+            </template>
+          </el-table-column>
+
+        </el-table>
+      </div>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="dialogVisible2 = false" class="button-sty" icon="el-icon-close">
+          {{ i18nt('designer.hint.cancel') }}
+        </el-button>
+        <el-button type="primary" @click="colSubmit2" class="button-sty" icon="el-icon-check">
+          {{ i18nt('designer.hint.confirm') }}
+        </el-button>
+      </div>
+    </el-dialog>
     <companyInfoDialog v-if="showCompanyInfoDialog" :visiable.sync="showCompanyInfoDialog"
                        @confirm="confirmCompanyDialog" :multi="true" :allCompany="true" :rows="currentCompanyInfos"
                        fieldKey="companyCode"/>
@@ -159,8 +263,10 @@ export default {
 
       currentCompanyInfos: [],
       operateIndex: 0,
-      showCompanyInfoDialog: false
+      showCompanyInfoDialog: false,
 
+      dialogVisible2: false,
+      tableData2: [],
     }
   },
   computed: {
@@ -174,11 +280,13 @@ export default {
       let reportTemplate = this.getReportTemplate();
       let objTypeCode = reportTemplate.objTypeCode;
       let wfConfigData = this.optionModel.wfConfigData || [];
-      wfConfigData.forEach(item => {
+      this.dialogVisible = true;
+      this.tableData = this.$baseLodash.cloneDeep(wfConfigData)
+      /*wfConfigData.forEach(item => {
         this.getWfObjConfigItem(item.modelId)
-      })
+      })*/
 
-      this.$http({
+      /*this.$http({
         url: this.current_prefix + "/wf_obj_config_item/list",
         data: {
           objTypeCode: objTypeCode,
@@ -191,7 +299,7 @@ export default {
           this.dialogVisible = true;
           this.tableData = this.$baseLodash.cloneDeep(wfConfigData)
         },
-      });
+      });*/
     },
     getWfObjConfigItem(modelId) {
       let reportTemplate = this.getReportTemplate();
@@ -213,11 +321,12 @@ export default {
     },
     addItem() {
       let newItem = {
+        type: null,
         serveType: null,
         serveName: null,
         modelKey: null,
         taskSteps: null,
-        companyInfos: []
+        companyCodes: null
       }
       this.tableData.push(newItem);
     },
@@ -233,7 +342,7 @@ export default {
     changeEnabledByWf(val) {
       if (val) {
         this.optionModel.hiddenByWf = false;
-        this.optionModel.wfEdit = false;
+        // this.optionModel.wfEdit = false;
       }
     },
     changeHiddenByWf(val) {
@@ -250,7 +359,7 @@ export default {
       // modelKey
       let map = {
         1: "prod",
-        2: "at",
+        2: "uat",
         3: "dev"
       }
       let serveName = null;
@@ -260,20 +369,41 @@ export default {
       }
       row.serveName = serveName;
     },
-    openCompanyDialog(row, rowIndex) {
-      this.operateIndex = rowIndex;
-      this.currentCompanyInfos = row.companyInfos || [];
-      this.showCompanyInfoDialog = true;
-
+    openDialog2() {
+      this.tableData2 = this.$baseLodash.cloneDeep(this.optionModel.wfModifyDataConfig || []);
+      this.dialogVisible2 = true;
     },
-    confirmCompanyDialog(rows) {
-      if (rows.length) {
-        let item = this.tableData[this.operateIndex];
-        item.companyInfos = rows;
+    addItem2() {
+      let newItem = {
+        action: 'start',
+        // valueType: 1,
+        toValue: null
+      }
+      this.tableData2.push(newItem);
+    },
+    colSubmit2() {
+      let isError = false;
+      let map = {}
+      this.tableData2.forEach(item => {
+        let count = map[item.action] || 0;
+        map[item.action] = count + 1;
+        if (map[item.action] > 1) {
+          isError = true;
+        }
+      })
+      if (isError) {
+        this.$message({
+          message: "流程动作不能重复",
+          type: 'error',
+          duration: 2000,
+        })
+        return
       }
+      this.dialogVisible2 = !1;
+      this.$set(this.optionModel, 'wfModifyDataConfig', this.tableData2)
     },
-    getCompanyNames(item) {
-      return item.companyInfos.map(item => item.companyName).join(',');
+    changeValueType(row) {
+      row.toValue = null;
     }
   }
 }