cloud-web-corejs 1.0.54-dev.24 → 1.0.54-dev.240

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

@@ -11,14 +11,50 @@
             <el-input type="text" v-model="formConfig.saveScriptCode" placeholder="默认saveUpdatge"></el-input>
           </el-form-item>
           <el-form-item :label="i18nt('启用流程')">
-            <el-switch v-model="formConfig.wfEnabled"></el-switch>
+            <el-switch v-model="formConfig.wfEnabled"
+                       @change="changeWfEnabled"></el-switch>
           </el-form-item>
-          <el-form-item label="流程单据定义">
-            <a href="javascript:void(0);" class="a-link link-oneLind" @click="openWfObjConfigDialog">
-              <span>{{ wfObjConfigs.length ? '已维护' : null}}</span>
+          <el-form-item :label="i18nt('流程启动时自动保存表单数据')">
+            <el-switch v-model="formConfig.wfStartBindSave"></el-switch>
+          </el-form-item>
+
+          <el-form-item :label="i18nt('流程通过时自动保存表单数据')">
+            <el-switch v-model="formConfig.wfAgreenBindSave"></el-switch>
+          </el-form-item>
+          <el-form-item :label="i18nt('流程通过时自动保存表单数据的节点配置')">
+            <a href="javascript:void(0);" class="a-link link-oneLind" @click="openWfConfigDataDialog2">
+              <span>{{ formConfig.wfAgreeConfigData && formConfig.wfAgreeConfigData.length ? "已维护" : "" }}</span>
+              <i class="el-icon-edit"></i>
+            </a>
+          </el-form-item>
+          <el-form-item :label="i18nt('启用流程节点可编辑表单')">
+            <el-switch v-model="formConfig.wfConfigDataEnabled"></el-switch>
+          </el-form-item>
+          <el-form-item :label="i18nt('流程节点可编辑表单配置')">
+            <a href="javascript:void(0);" class="a-link link-oneLind" @click="openWfConfigDataDialog">
+              <span>{{ formConfig.wfConfigData && formConfig.wfConfigData.length ? "已维护" : "" }}</span>
+              <i class="el-icon-edit"></i>
+            </a>
+          </el-form-item>
+
+          <el-form-item :label="i18nt('默认流程单据类型名称')">
+            <el-input type="text" v-model="designer.vueInstance.reportTemplate.objTypeName"></el-input>
+          </el-form-item>
+          <el-form-item :label="i18nt('引用流程的表单编码')">
+            <el-input type="text" v-model="designer.vueInstance.reportTemplate.fromWfFormCode"></el-input>
+          </el-form-item>
+          <el-form-item :label="i18nt('流程自定义配置')">
+            <a href="javascript:void(0);" class="a-link link-oneLind" @click="editFormEventHandler('wfConfig')">
+              <span>{{ formConfig.wfConfig }}</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="openWfObjConfigDialog">
+                        <span>{{ wfObjConfigs.length ? '已维护' : null}}</span>
+                        <i class="el-icon-edit"></i>
+                      </a>
+                    </el-form-item>-->
           <el-form-item :label="i18nt('加载详情数据')">
             <el-switch v-model="formConfig.isLoadEntity"></el-switch>
           </el-form-item>
@@ -43,45 +79,19 @@
               <i class="el-icon-edit"></i>
             </a>
           </el-form-item>
-          <!--
-                    <el-form-item :label="i18nt('designer.setting.formSize')">
-                      <el-select v-model="formConfig.size"><el-option v-for="item in formSizes" :key="item.value" :label="item.label" :value="item.value"></el-option></el-select>
-                    </el-form-item>
-                    <el-form-item :label="i18nt('designer.setting.labelPosition')">
-                      <el-radio-group v-model="formConfig.labelPosition" class="radio-group-custom">
-                        <el-radio-button label="left">{{ i18nt('designer.setting.leftPosition') }}</el-radio-button>
-                        <el-radio-button label="top">{{ i18nt('designer.setting.topPosition') }}</el-radio-button>
-                      </el-radio-group>
-                    </el-form-item>
-                    <el-form-item :label="i18nt('designer.setting.labelAlign')">
-                      <el-radio-group v-model="formConfig.labelAlign" class="radio-group-custom">
-                        <el-radio-button label="label-left-align">{{ i18nt('designer.setting.leftAlign') }}</el-radio-button>
-                        <el-radio-button label="label-center-align">{{ i18nt('designer.setting.centerAlign') }}</el-radio-button>
-                        <el-radio-button label="label-right-align">{{ i18nt('designer.setting.rightAlign') }}</el-radio-button>
-                      </el-radio-group>
-                    </el-form-item>
-                    <el-form-item :label="i18nt('designer.setting.labelWidth')">
-                      <el-input-number v-model="formConfig.labelWidth" :min="0" style="width: 100%"></el-input-number>
-                    </el-form-item>-->
-                    <el-form-item :label="i18nt('designer.setting.formCss')">
-                      <el-button type="info" icon="el-icon-edit" plain round @click="editFormCss">{{ i18nt('designer.setting.addCss') }}</el-button>
-                    </el-form-item>
-                    <!--
-                    <el-form-item :label="i18nt('designer.setting.customClass')">
-                      <el-select v-model="formConfig.customClass" multiple filterable allow-create default-first-option>
-                        <el-option v-for="(item, idx) in cssClassList" :key="idx" :label="item" :value="item"></el-option>
-                      </el-select>
-                    </el-form-item>
-                    <el-form-item :label="i18nt('designer.setting.globalFunctions')">
-                      <el-button type="info" icon="el-icon-edit" plain round @click="editGlobalFunctions">{{ i18nt('designer.setting.addEventHandler') }}</el-button>
-                    </el-form-item>
-                    <el-form-item label-width="0">
-                      <el-divider class="custom-divider">{{ i18nt('designer.setting.formSFCSetting') }}</el-divider>
-                    </el-form-item>
-                    <el-form-item :label="i18nt('designer.setting.formModelName')"><el-input type="text" v-model="formConfig.modelName"></el-input></el-form-item>
-                    <el-form-item :label="i18nt('designer.setting.formRefName')"><el-input type="text" v-model="formConfig.refName"></el-input></el-form-item>
-                    <el-form-item :label="i18nt('designer.setting.formRulesName')"><el-input type="text" v-model="formConfig.rulesName"></el-input></el-form-item>
-                  -->
+          <el-form-item :label="i18nt('designer.setting.formCss')">
+            <el-button type="info" icon="el-icon-edit" plain round @click="editFormCss">
+              {{ i18nt('designer.setting.addCss') }}
+            </el-button>
+          </el-form-item>
+        </el-collapse-item>
+        <el-collapse-item name="2" title="列表标签页信息">
+          <el-form-item :label="i18nt('列表启用多标签')">
+            <el-switch v-model="formConfig.multiTabEnabled"></el-switch>
+          </el-form-item>
+          <el-form-item :label="i18nt('标签名称字段')">
+            <el-input type="text" v-model="formConfig.multiTabLabelField"></el-input>
+          </el-form-item>
         </el-collapse-item>
         <el-collapse-item name="3" title="详情表单信息">
           <el-form-item :label="i18nt('表单编码')">
@@ -293,6 +303,199 @@
         </el-button>
       </div>
     </el-dialog>
+    <el-dialog
+      v-if="dialogVisible"
+      custom-class="dialog-style list-dialog"
+      :title="i18nt('流程节点可编辑表单配置')"
+      :visible.sync="dialogVisible"
+      :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
+      :fullscreen="true"
+    >
+      <div class="cont" style="padding-bottom: 8px;">
+        <el-table
+          ref="singleTable"
+          width="100%"
+          :data="wfConfigData"
+          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">
+            <template slot-scope="{row}">
+              <el-select v-model="row.serveType" @change="changeServeType(row)">
+                <el-option :value="1" label="正式"></el-option>
+                <el-option :value="2" label="UAT"></el-option>
+                <el-option :value="3" label="测试"></el-option>
+                <el-option :value="4" label="自定义"></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column :label="i18nt('自定义服务')" width="150">
+            <template slot-scope="{row}">
+              <el-input v-model="row.serveName" clearable :disabled="row.serveType!==4"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column :label="i18nt('组织编码')" width="250">
+            <template slot-scope="{row,$index}">
+              <el-input v-model="row.companyCodes" clearable></el-input>
+            </template>
+          </el-table-column>
+          <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">
+            <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('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="addItem"></el-button>
+            </template>
+            <template slot-scope="scope">
+              <el-button
+                :title="i18nt('designer.setting.deleteTableColumn')"
+                size="mini"
+                type=""
+                circle=""
+                icon="el-icon-minus"
+                @click="wfConfigData.splice(scope.$index,1)"
+              ></el-button>
+            </template>
+          </el-table-column>
+
+        </el-table>
+      </div>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="dialogVisible = false" class="button-sty" icon="el-icon-close">
+          {{ i18nt('designer.hint.cancel') }}
+        </el-button>
+        <el-button type="primary" @click="confirmWfConfigDataDialog" class="button-sty" icon="el-icon-check">
+          {{ i18nt('designer.hint.confirm') }}
+        </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
+      :fullscreen="true"
+    >
+      <div class="cont" style="padding-bottom: 8px;">
+        <el-table
+          ref="singleTable"
+          width="100%"
+          :data="wfAgreeConfigData"
+          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">
+            <template slot-scope="{row}">
+              <el-select v-model="row.serveType" @change="changeServeType(row)">
+                <el-option :value="1" label="正式"></el-option>
+                <el-option :value="2" label="UAT"></el-option>
+                <el-option :value="3" label="测试"></el-option>
+                <el-option :value="4" label="自定义"></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column :label="i18nt('自定义服务')" width="150">
+            <template slot-scope="{row}">
+              <el-input v-model="row.serveName" clearable :disabled="row.serveType!==4"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column :label="i18nt('组织编码')" width="250">
+            <template slot-scope="{row,$index}">
+              <el-input v-model="row.companyCodes" clearable></el-input>
+            </template>
+          </el-table-column>
+          <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">
+            <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('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="wfAgreeConfigData.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="confirmWfConfigDataDialog2" class="button-sty" icon="el-icon-check">
+          {{ i18nt('designer.hint.confirm') }}
+        </el-button>
+      </div>
+    </el-dialog>
 
     <formTemplateDialog v-if="showFormTemplateDialog" :visiable.sync="showFormTemplateDialog"
                         @confirm="confirmFormTemplate" multi="false"/>
@@ -349,26 +552,33 @@ export default {
         onBeforeCreated: 'onBeforeCreated(dataId,formCode,done) {',
         onFormCreated: 'onFormCreated(dataId,formCode) {',
         onFormMounted: 'onFormMounted(dataId,formCode) {',
-        onFormDataChange: 'onFormDataChange(fieldName, newValue, oldValue, formModel, subFormName, subFormRowIndex) {'
+        onFormDataChange: 'onFormDataChange(fieldName, newValue, oldValue, formModel, subFormName, subFormRowIndex) {',
+        wfConfig: 'wfConfig(dataId, formCode, formData) {',
         //'onFormValidate':     'onFormValidate() {',
       },
       showVabsearchConfigDialog: false,
       vabsearchConfigType: 1,
       showFormTemplateDialog: false,
 
-      formScriptParam:null,
+      formScriptParam: null,
       showFormScriptParamDialog: false,
-      formScriptSuccess:null,
+      formScriptSuccess: null,
       showFormScriptSuccessDialog: false,
-      wfObjConfigs:[],
-      showWfObjConfigDialog:false
+      wfObjConfigs: [],
+      showWfObjConfigDialog: false,
+
+      dialogVisible: false,
+      wfConfigData: [],
+
+      dialogVisible2: false,
+      wfAgreeConfigData: []
     };
   },
   created() {
     //导入表单JSON后需要重新加载自定义CSS样式！！！
     this.designer.handleEvent('form-json-imported', () => {
       this.formCssCode = this.formConfig.cssCode;
-      insertCustomCssToHead(this.formCssCode);
+      insertCustomCssToHead(this.formCssCcssCodeode);
       this.extractCssClass();
       this.designer.emitEvent('form-css-updated', deepClone(this.cssClassList));
     });
@@ -454,7 +664,7 @@ export default {
       this.functionsCode = this.designer.formConfig.functions;
       this.showEditFunctionsDialogFlag = true;
     },
-    editFormScriptParam(){
+    editFormScriptParam() {
       this.formScriptParam = this.designer.formConfig.formScriptParam;
       this.showFormScriptParamDialog = true;
     },
@@ -536,7 +746,7 @@ export default {
       this.designer.formConfig.formScriptParam = this.formScriptParam;
       this.showFormScriptParamDialog = false;
     },
-    editFormScriptSuccess(){
+    editFormScriptSuccess() {
       this.formScriptSuccess = this.designer.formConfig.formScriptSuccess;
       this.showFormScriptSuccessDialog = true;
     },
@@ -559,19 +769,19 @@ export default {
       this.designer.formConfig.formScriptSuccess = this.formScriptSuccess;
       this.showFormScriptSuccessDialog = false;
     },
-    openWfObjConfigDialog(){
+    openWfObjConfigDialog() {
       this.showWfObjConfigDialog = true;
     },
-    confirmWfObjConfigDialog(rows){
+    confirmWfObjConfigDialog(rows) {
       this.wfObjConfigs = rows || [];
     },
-    getListByObjTypeCode(){
+    getListByObjTypeCode() {
       let reportTemplate = this.designer.vueInstance.reportTemplate
       this.$http({
         url: `/${reportTemplate.serviceName}/wf_obj_config/listByObjTypeCode`,
         method: `post`,
-        data:{
-          stringOne:reportTemplate.objTypeCode
+        data: {
+          stringOne: reportTemplate.objTypeCode
         },
         isLoading: true,
         success: res => {
@@ -579,6 +789,52 @@ export default {
         }
       });
     },
+    changeWfEnabled(val) {
+      this.designer.vueInstance.reportTemplate.objTypeName = null;
+      this.designer.vueInstance.reportTemplate.fromWfFormCode = null;
+    },
+    openWfConfigDataDialog() {
+      let wfConfigData = this.formConfig.wfConfigData || [];
+      this.dialogVisible = true;
+      this.wfConfigData = this.$baseLodash.cloneDeep(wfConfigData)
+    },
+    addItem() {
+      let newItem = {
+        type: null,
+        serveType: null,
+        serveName: null,
+        modelKey: null,
+        taskSteps: null,
+        companyCodes: null
+      }
+      this.wfConfigData.push(newItem);
+    },
+    confirmWfConfigDataDialog() {
+      this.dialogVisible = !1;
+      this.formConfig.wfConfigData = this.wfConfigData;
+    },
+
+    openWfConfigDataDialog2() {
+      let wfAgreeConfigData = this.formConfig.wfAgreeConfigData || [];
+      this.dialogVisible2 = true;
+      this.wfAgreeConfigData = this.$baseLodash.cloneDeep(wfAgreeConfigData)
+    },
+    addItem2() {
+      let newItem = {
+        type: null,
+        serveType: null,
+        serveName: null,
+        modelKey: null,
+        taskSteps: null,
+        companyCodes: null
+      }
+      this.wfAgreeConfigData.push(newItem);
+    },
+    confirmWfConfigDataDialog2() {
+      this.dialogVisible2 = !1;
+      this.formConfig.wfAgreeConfigData = this.wfAgreeConfigData;
+    },
+
   }
 };
 </script>

package/src/components/xform/form-designer/setting-panel/index.vue

@@ -166,6 +166,7 @@
                     :designer="designer"
                     :selected-widget="columnSelectedWidget"
                     :option-model="columnSelectedWidget.options"
+                    :tableColumns="tableColumns"
                     :key="propName"
                   ></component>
                 </template>
@@ -180,6 +181,7 @@
                     :designer="designer"
                     :selected-widget="columnSelectedWidget"
                     :option-model="columnSelectedWidget.options"
+                    :tableColumns="tableColumns"
                     :key="propName"
                   ></component>
                 </template>
@@ -193,6 +195,7 @@
                     :designer="designer"
                     :selected-widget="columnSelectedWidget"
                     :option-model="columnSelectedWidget.options"
+                    :tableColumns="tableColumns"
                     :key="propName"
                   ></component>
                 </template>
@@ -207,6 +210,7 @@
                     :designer="designer"
                     :selected-widget="columnSelectedWidget"
                     :option-model="columnSelectedWidget.options"
+                    :tableColumns="tableColumns"
                     :key="propName"
                   ></component>
                 </template>