cloud-web-corejs 1.0.116 → 1.0.118

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

@@ -29,6 +29,20 @@
               @change="changeWfEnabled"
             ></el-switch>
           </el-form-item>
+          <el-form-item>
+            <span slot="label">流程主题
+            <el-tooltip effect="light">
+              <i class="el-icon-info"></i>
+              <div slot="content" style="white-space: pre-wrap;">
+                {{tip1}}
+              </div>
+
+            </el-tooltip>
+          </span>
+          </el-form-item>
+          <div>
+            <el-input style="word-break: break-word" type="textarea" :rows="3" v-model="formConfig.wfTheme" clearable></el-input>
+          </div>
           <el-form-item :label="i18nt('流程启动时自动保存表单数据')">
             <el-switch v-model="formConfig.wfStartBindSave"></el-switch>
           </el-form-item>
@@ -160,8 +174,9 @@
             ></el-input>
           </el-form-item>
         </el-collapse-item>
+
         <el-collapse-item name="3" title="详情表单信息">
-          <el-form-item :label="i18nt('表单编码')">
+          <el-form-item :label="i18nt('查看页面表单编码')">
             <el-input
               class="search-input"
               max="200"
@@ -176,13 +191,36 @@
               <i
                 slot="suffix"
                 class="el-input__icon el-icon-search"
-                @click="showFormTemplateDialog = true"
+                @click="openFormTemplate(2)"
               ></i>
             </el-input>
           </el-form-item>
-          <el-form-item :label="i18nt('表单名称')">
+          <el-form-item :label="i18nt('查看页面表单名称')">
             {{ formConfig.editFormName }}
           </el-form-item>
+          <el-form-item :label="i18nt('新增页面表单编码')">
+            <el-input
+              class="search-input"
+              max="200"
+              v-model="formConfig.addFormCode"
+              @clear="
+                formConfig.addFormCode = null;
+                $forceUpdate();
+              "
+              v-el-readonly
+              clearable
+              placeholder="默认使用查看表单编码"
+            >
+              <i
+                slot="suffix"
+                class="el-input__icon el-icon-search"
+                @click="openFormTemplate(1)"
+              ></i>
+            </el-input>
+          </el-form-item>
+          <el-form-item :label="i18nt('新增页面表单名称')">
+            {{ formConfig.addFormName }}
+          </el-form-item>
         </el-collapse-item>
         <el-collapse-item name="4" title="查询弹框展示信息">
           <el-form-item :label="i18nt('展示字段')">
@@ -876,6 +914,42 @@ export default {
 
       showBdCompanyEnvDialog1: false,
       showBdCompanyEnvDialog2: false,
+
+      tip1:`流程主题表达式设置说明。
+
+1、可使用参数：
+wf：流程对象
+    name：流程名称
+    objTypeCode：单据类型编码
+    objId：对象id
+    procInstId：act流程实例id
+    procDefId：act流程定义id
+    modelId：act流程模板id
+    starterId：启动人ID
+    starterName：启动人姓名
+    uuid：流程实例唯一标识
+identityInfo：身份信息对象
+    id：用户ID
+    loginAccount：用户登录名
+    nickName：用户姓名
+    companyCode：企业编码
+    parentCompanyCode：集团企业编码
+nowDate：当前时间
+nowDateStr：当前时间字符串（yyyy-MM-dd HH:mm:ss）
+nowDayStr：当前天字符串（yyyy-MM-dd）
+tableName：数据库表名，取表单设计中维护的表名作为参数名称
+    tableField1：数据库表字段名1
+    tableField2：数据库表字段名2
+    tableField3：数据库表字段名3
+    ......
+
+2、可使用函数：
+func.orgName(orgId)：根据机构id获取机构名称
+func.convertDate(date, format)：时间转换，如当前时间转为当前天字符串，则$\{func.convertDate(nowDate, 'yyyy-MM-dd')\}，当前时间转为当前月字符串，则$\{func.convertDate(nowDate, 'yyyy-MM')\}
+
+3、配置示例
+比如表名为：pm_product_project，配置如下：
+$\{wf.starterName\}提交的$\{pm_product_project.product_code\}$\{pm_product_project.product_name\}$\{wf.name\}$\{pm_product_project.sn\}$\{func.orgName(pm_product_project.f_sale_org_id)\}$\{nowDayStr\}`
     };
   },
   created() {
@@ -1032,11 +1106,22 @@ export default {
       this.formConfig[this.curEventName] = this.formEventHandlerCode;
       this.showFormEventDialogFlag = false;
     },
+    openFormTemplate(flag){
+      this.formTemplateFlag = flag;
+      this.showFormTemplateDialog = true;
+    },
     confirmFormTemplate(rows) {
       if (rows.length) {
         let row = rows[0];
-        this.$set(this.formConfig, "editFormCode", row.formCode);
-        this.$set(this.formConfig, "editFormName", row.formName);
+        if(this.formTemplateFlag==1){
+          //新增
+          this.$set(this.formConfig, "addFormCode", row.formCode);
+          this.$set(this.formConfig, "addFormName", row.formName);
+        }else{
+          //查看
+          this.$set(this.formConfig, "editFormCode", row.formCode);
+          this.$set(this.formConfig, "editFormName", row.formName);
+        }
       }
     },
     getEventButtonName(funStr) {
@@ -1303,4 +1388,7 @@ export default {
     padding: 6px 15px 12px 15px;
   }
 }
+::v-deep .el-textarea .el-textarea__inner {
+  word-break: break-all;
+}
 </style>

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/setting-panel/property-editor/tempStorage-editor.vue

@@ -0,0 +1,23 @@
+<template>
+  <el-form-item :label="i18nt('暂存唯一编码')">
+    <el-input type="text" v-model="optionModel.tempStorageCode" placeholder="默认表单模板编码"></el-input>
+  </el-form-item>
+</template>
+
+<script>
+  import i18n from "../../../../../components/xform/utils/i18n";
+
+  export default {
+    name: "tempStorage-editor",
+    mixins: [i18n],
+    props: {
+      designer: Object,
+      selectedWidget: Object,
+      optionModel: Object,
+    },
+  }
+</script>
+
+<style scoped>
+
+</style>

package/src/components/xform/form-designer/setting-panel/propertyRegister.js

@@ -81,6 +81,7 @@ const COMMON_PROPERTIES = {
   'echarCategoryOption': 'echart-category-editor', //折线图
   'vabSearchName': 'vabSearchName-editor',
   'copyButton': 'copyButton-editor',
+  "tempStorageFlag": "tempStorage-editor",
 
   //容器
   'showBlankRow': 'showBlankRow-editor',

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 = {
@@ -1193,10 +1194,12 @@ export const basicFields = [
         {
           label: "radio 1",
           value: "1",
+          disabled: false
         },
         {
           label: "radio 2",
           value: "2",
+          disabled: false
         },
       ],
       required: !1,
@@ -1263,10 +1266,12 @@ export const basicFields = [
         {
           label: "check 1",
           value: "1",
+          disabled: false
         },
         {
           label: "check 2",
           value: "2",
+          disabled: false
         },
       ],
       required: !1,
@@ -1340,14 +1345,17 @@ export const basicFields = [
         {
           label: "select 1",
           value: "1",
+          disabled: false
         },
         {
           label: "select 2",
           value: "2",
+          disabled: false
         },
         {
           label: "select 3",
           value: "3",
+          disabled: false
         },
       ],
       required: !1,
@@ -3605,6 +3613,29 @@ export const businessFields = [
       showRules: [],
     },
   },
+  {
+    type: "tempStorage",
+    icon: "uploadbox",
+    commonFlag: !0,
+    columnFlag: true,
+    formItemFlag: !1,
+    options: {
+      name: "",
+      // label: "暂存",
+      columnWidth: "200px",
+      disabled: !1,
+      hidden: !1,
+
+      tempStorageFlag:1,
+      tempStorageCode:null,
+
+      customClass: "",
+      onCreated: "",
+      onMounted: "",
+
+      ...defaultWidgetShowRuleConfig,
+    },
+  },
 ];
 
 export const keyNamePrefixMap = {