cloud-web-corejs 1.0.163 → 1.0.164

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

@@ -3,12 +3,18 @@
     <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.tagWidth" clearable></el-input>
+    </el-form-item>
     <el-form-item label="弹框表单编码">
       <el-input v-model="optionModel.tagFormCode" clearable></el-input>
     </el-form-item>
     <el-form-item label="弹框查询参数">
-      <a href="javascript:void(0);" class="a-link link-oneLind"
-         @click="editEventHandler('tagFormParam', ['dataId', 'formCode'])">
+      <a
+        href="javascript:void(0);"
+        class="a-link link-oneLind"
+        @click="editEventHandler('tagFormParam', ['dataId', 'formCode'])"
+      >
         <span>{{ optionModel.tagFormParam }}</span>
         <i class="el-icon-edit"></i>
       </a>
@@ -27,24 +33,29 @@
     </el-form-item>
 
     <el-form-item label="明细字段回填">
-      <a href="javascript:void(0);" class="a-link link-oneLind"
-         @click="openDialog">
+      <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', ['dataId', 'formCode','rows'])">
+      <a
+        href="javascript:void(0);"
+        class="a-link link-oneLind"
+        @click="editEventHandler('tagConfirmCallback', ['dataId', 'formCode', 'rows'])"
+      >
         <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', ['dataId', 'formCode'])">
+      <a
+        href="javascript:void(0);"
+        class="a-link link-oneLind"
+        @click="editEventHandler('tagDeleteCallback', ['dataId', 'formCode'])"
+      >
         <span>{{ optionModel.tagDeleteCallback }}</span>
         <i class="el-icon-edit"></i>
       </a>
@@ -103,22 +114,22 @@
                 placement="top"
               >
                 <el-button
-                  size="mini" type="" circle=""
+                  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-tooltip effect="dark" content="删除" placement="top">
                 <el-button
-                  size="mini" type="" circle=""
+                  size="mini"
+                  type=""
+                  circle=""
                   icon="el-icon-delete"
-                  @click="tableData.splice($index,1)"
+                  @click="tableData.splice($index, 1)"
                 />
               </el-tooltip>
             </template>
@@ -126,11 +137,16 @@
         </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 @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
+          type="primary"
+          @click="confirmDialog"
+          class="button-sty"
+          icon="el-icon-check"
+        >
+          {{ i18nt("designer.hint.confirm") }}
         </el-button>
       </div>
     </el-dialog>
@@ -150,7 +166,7 @@
       v-dialog-drag
       :fullscreen="true"
     >
-      <div class="cont" style="padding-bottom: 8px;">
+      <div class="cont" style="padding-bottom: 8px">
         <el-table
           ref="singleTable"
           width="100%"
@@ -159,11 +175,11 @@
           border=""
           row-key="columnId"
           stripe=""
-          style="margin-bottom: 0px;"
+          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}">
+            <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>
@@ -173,27 +189,31 @@
             </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 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}">
+            <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}">
+            <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}">
+            <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}">
+            <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>
@@ -219,11 +239,21 @@
                         </el-checkbox-group>
                       </template>
                     </el-table-column>-->
-          <el-table-column :label="i18nt('designer.setting.actionColumn')" width="100" align="center">
+          <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>
+              <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
@@ -232,19 +262,23 @@
                 type=""
                 circle=""
                 icon="el-icon-minus"
-                @click="tableData.splice(scope.$index,1)"
+                @click="tableData.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') }}
+          {{ i18nt("designer.hint.cancel") }}
         </el-button>
-        <el-button type="primary" @click="colSubmit" class="button-sty" icon="el-icon-check">
-          {{ i18nt('designer.hint.confirm') }}
+        <el-button
+          type="primary"
+          @click="colSubmit"
+          class="button-sty"
+          icon="el-icon-check"
+        >
+          {{ i18nt("designer.hint.confirm") }}
         </el-button>
       </div>
     </el-dialog>
@@ -252,9 +286,8 @@
 </template>
 
 <script>
-import i18n from "../../../../../components/xform/utils/i18n"
-import eventMixin
-  from "../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin"
+import i18n from "../../../../../components/xform/utils/i18n";
+import eventMixin from "../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
 
 export default {
   name: "project-tag-editor",
@@ -262,21 +295,21 @@ export default {
   props: {
     designer: Object,
     selectedWidget: Object,
-    optionModel: Object
+    optionModel: Object,
   },
   data() {
     return {
-      formScriptEnabledTypes: ['select', 'checkbox', 'radio', 'census'],
+      formScriptEnabledTypes: ["select", "checkbox", "radio", "census"],
       showDialog: false,
       tableData: [],
 
       dialogVisible: false,
       wfConfigData: [],
-    }
+    };
   },
   methods: {
     getIsShow() {
-      return this.selectedWidget.type !== 'data-table';
+      return this.selectedWidget.type !== "data-table";
     },
     openDialog() {
       this.tableData = this.$baseLodash.cloneDeep(this.optionModel.tagFillConfig);
@@ -292,7 +325,7 @@ export default {
       let objTypeCode = reportTemplate.objTypeCode;
       let wfConfigData = this.optionModel.wfConfigData || [];
       this.dialogVisible = true;
-      this.tableData = this.$baseLodash.cloneDeep(wfConfigData)
+      this.tableData = this.$baseLodash.cloneDeep(wfConfigData);
     },
     addItem() {
       let newItem = {
@@ -301,18 +334,16 @@ export default {
         serveName: null,
         modelKey: null,
         taskSteps: null,
-        companyCodes: null
-      }
+        companyCodes: null,
+      };
       this.tableData.push(newItem);
     },
     colSubmit() {
       this.dialogVisible = !1;
       this.optionModel.wfConfigData = this.tableData;
     },
-  }
-}
+  },
+};
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

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

@@ -7,21 +7,12 @@
       <el-switch v-model="optionModel.hiddenByWf" @change="changeHiddenByWf"></el-switch>
     </el-form-item>-->
     <el-form-item :label="i18nt('特定流程节点设置')">
-      <el-switch
-        v-model="optionModel.wfEdit"
-        @change="changeWfEdit"
-      ></el-switch>
+      <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"
-      >
+      <a href="javascript:void(0);" class="a-link link-oneLind" @click="openDialog">
         <span>{{
-          optionModel.wfConfigData && optionModel.wfConfigData.length
-            ? "已维护"
-            : ""
+          optionModel.wfConfigData && optionModel.wfConfigData.length ? "已维护" : ""
         }}</span>
         <i class="el-icon-edit"></i>
       </a>
@@ -30,14 +21,9 @@
       <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"
-      >
+      <a href="javascript:void(0);" class="a-link link-oneLind" @click="openDialog2">
         <span>{{
-          optionModel.wfModifyDataConfig &&
-          optionModel.wfModifyDataConfig.length
+          optionModel.wfModifyDataConfig && optionModel.wfModifyDataConfig.length
             ? "已维护"
             : ""
         }}</span>
@@ -71,11 +57,7 @@
           stripe=""
           style="margin-bottom: 0px"
         >
-          <el-table-column
-            type="index"
-            width="35"
-            fixed="left"
-          ></el-table-column>
+          <el-table-column type="index" width="35" fixed="left"></el-table-column>
           <el-table-column :label="i18nt('组织编码')" width="250">
             <template slot-scope="{ row, $index }">
               <el-input
@@ -109,10 +91,7 @@
               <base-input-number v-model="row.modelOrders" clearable></base-input-number>
             </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>
@@ -156,11 +135,7 @@
         </el-table>
       </div>
       <div class="dialog-footer" slot="footer">
-        <el-button
-          @click="dialogVisible = false"
-          class="button-sty"
-          icon="el-icon-close"
-        >
+        <el-button @click="dialogVisible = false" class="button-sty" icon="el-icon-close">
           {{ i18nt("designer.hint.cancel") }}
         </el-button>
         <el-button
@@ -199,17 +174,14 @@
           stripe=""
           style="margin-bottom: 0px"
         >
-          <el-table-column
-            type="index"
-            width="35"
-            fixed="left"
-          ></el-table-column>
+          <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-select v-model="row.action" @change="row.toValue = null">
                 <el-option value="start" label="流程启动"></el-option>
                 <el-option value="interrupt" label="流程中断"></el-option>
                 <el-option value="end" label="流程完成"></el-option>
+                <el-option value="specificAction" label="流程特定"></el-option>
               </el-select>
             </template>
           </el-table-column>
@@ -224,7 +196,26 @@
                     </el-table-column>-->
           <el-table-column :label="i18nt('设置的值')" width="650">
             <template slot-scope="{ row }">
-              <el-input v-model="row.toValue" clearable></el-input>
+              <el-select
+                v-model="row.toValue"
+                clearable
+                style="width: 100%"
+                v-if="row.action === 'specificAction'"
+              >
+                <el-option value="wfCreateDate" label="流程创建(启动)时间"></el-option>
+                <el-option value="wfModifyDate" label="流程更新时间"></el-option>
+                <el-option value="wfInterruptDate" label="流程中断时间"></el-option>
+                <el-option value="wfEndDate" label="流程完成时间"></el-option>
+                <el-option value="wfStarterName" label="启动人姓名"></el-option>
+                <el-option value="wfName" label="流程模板名称"></el-option>
+                <el-option value="wfUuid" label="流程实例uuid"></el-option>
+                <el-option value="objTypeCode" label="流程单据类型编码"></el-option>
+                <el-option value="wfCandidateNames" label="当前审批人名"></el-option>
+                <el-option value="wfTaskName" label="当前审批节点名"></el-option>
+                <el-option value="wfStat" label="流程状态"></el-option>
+                <el-option value="wfSubjectName" label="流程主题名称"></el-option>
+              </el-select>
+              <el-input v-model="row.toValue" clearable v-else></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">
@@ -403,20 +394,20 @@ export default {
             type: "error",
             message: "服务名称不能为空",
           });
-          return
+          return;
         }
         if (!item.companyCodes) {
           this.$message({
             type: "error",
             message: "组织编码不能为空",
           });
-          return
+          return;
         }
-        let modelOrders = item.modelOrders??"";
+        let modelOrders = item.modelOrders ?? "";
 
         let serveName = item.serveName;
         let companyCodes = item.companyCodes;
-        let key = serveName + "_" + companyCodes+ "_"+modelOrders;
+        let key = serveName + "_" + companyCodes + "_" + modelOrders;
         if (!map[key]) {
           map[key] = true;
         } else {

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

@@ -117,6 +117,7 @@ const COMMON_PROPERTIES = {
   'dropdownItemFlag': 'dropdown-item-editor',
 
   'oplogFlag': 'oplogFlag-editor',
+  'ganttConfig': 'gantt-editor',
 
   //弹框
   title: "title-editor",
@@ -165,6 +166,7 @@ const COMMON_PROPERTIES = {
   "autoValueEnabled": "autoValueEnabled-editor",
   // "commonAttributeEnabled": "commonAttributeEnabled-editor"
   "colorClass": "colorClass-editor",
+  "downloadButtonFlag": "downloadButtonFlag-editor"
 }
 
 const ADVANCED_PROPERTIES = {

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

@@ -2936,6 +2936,7 @@ export const advancedFields = [
       name: "",
       keyNameEnabled: !1,
       keyName: "",
+      disabled: !1,
       hidden: !1,
       customClass: "",
       exportFileName: "导出",
@@ -2963,6 +2964,7 @@ export const advancedFields = [
       name: "",
       keyNameEnabled: !1,
       keyName: "",
+      disabled: !1,
       hidden: !1,
       label: "明细导出",
       customClass: "",
@@ -3150,6 +3152,7 @@ export const advancedFields = [
       ...defaultWfConfig,
       ...defaultWidgetShowRuleConfig,
 
+      // customLabelEnabled: false,
       printButtonFlag:1,
       printTableRef: "",
       printItems: [],
@@ -3164,7 +3167,7 @@ export const advancedFields = [
     type: "print-detail-button",
     icon: "button",
     commonFlag: !0,
-    columnFlag: true,
+    columnFlag: false,
     formItemFlag: !1,
     options: {
       name: "",
@@ -3191,8 +3194,9 @@ export const advancedFields = [
       ...defaultWidgetShowRuleConfig,
 
       printDetailButtonFlag:1,
+      // customLabelEnabled: false,
       printItems: [],
-      printCustomCondition: "",
+      printCustomCondition: "return {\n  id:[dataId]\n}",
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -3312,6 +3316,7 @@ export const advancedFields = [
 
       onCreated: "",
       onMounted: "",
+      onClick: "",
       ...defaultWfConfig,
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -3403,7 +3408,67 @@ export const advancedFields = [
         tableData: {},
       },
     },
-  }
+  },
+  {
+    type: "gantt",
+    icon: "uploadbox",
+    commonFlag: !0,
+    formItemFlag: !1,
+    options: {
+      name: "",
+      // label: "操作日志",
+      // disabled: !1,
+      hidden: !1,
+
+      ...httpConfig,
+      formScriptEnabled: true,
+      formScriptCode: null,
+      ganttConfig: "",
+
+      customClass: "",
+      onCreated: "",
+      onMounted: "",
+
+    },
+  },
+
+  {
+    type: "download-button",
+    icon: "button",
+    commonFlag: !0,
+    columnFlag: true,
+    formItemFlag: !1,
+    options: {
+      name: "",
+      label: "附件下载",
+      columnWidth: "200px",
+      size: "",
+
+      // displayStyle: "block",
+      disabled: !1,
+      hidden: !1,
+      buttonTypeFlag: 1,
+      type: "",
+      /*plain: !1,
+      round: !1,
+      circle: !1,
+      icon: "el-icon-download",*/
+      customClass: "",
+      ...httpConfig,
+
+      downloadButtonFlag: 1,
+      dataTableName: null,
+      attachmentType: null,
+      fileName: null,
+
+      onCreated: "",
+      onMounted: "",
+      ...defaultWfConfig,
+      showRuleFlag: 1,
+      showRuleEnabled: 1,
+      showRules: [],
+    },
+  },
 ];
 
 export const businessFields = [