cloud-web-corejs 1.0.54-dev.365 → 1.0.54-dev.367

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

@@ -1,23 +1,42 @@
 <template>
-  <el-form-item :label="i18nt('暂存唯一编码')">
-    <el-input type="text" v-model="optionModel.tempStorageCode" placeholder="默认表单模板编码"></el-input>
-  </el-form-item>
+  <div>
+    <el-form-item :label="i18nt('暂存唯一编码')">
+      <el-input
+        type="text"
+        v-model="optionModel.tempStorageCode"
+        placeholder="默认表单模板编码"
+      ></el-input>
+    </el-form-item>
+    <el-form-item label="暂存回填完成回调" label-width="150px">
+      <a
+        href="javascript:void(0);"
+        class="a-link link-oneLind"
+        @click="editEventHandler('tempStorageConfirm', chooseConfirmParams)"
+      >
+        <span>{{ optionModel.tempStorageConfirm }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+  </div>
 </template>
 
 <script>
-  import i18n from "../../../../../components/xform/utils/i18n";
-
-  export default {
-    name: "tempStorage-editor",
-    mixins: [i18n],
-    props: {
-      designer: Object,
-      selectedWidget: Object,
-      optionModel: Object,
-    },
-  }
+import i18n from "../../../../../components/xform/utils/i18n";
+import eventMixin from "../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
+export default {
+  name: "tempStorage-editor",
+  mixins: [i18n, eventMixin],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+  data() {
+    return {
+      chooseConfirmParams: ["dataId", "formCode", "tempStorageData"],
+    };
+  },
+};
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

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

@@ -300,6 +300,7 @@ export const containers = [
       showRules: [],
       hideGridCheckBox: false,
       isNotQueryAllPage: false,
+      isNotShowQueryButton: false,
     },
   },
   /*{
@@ -902,6 +903,7 @@ const projectTagConfig = {
   tagConfirmCallback: null,
   tagDeleteCallback: null,
   tabDeleteEnabled: true,
+  tagWidth: ""
 };
 
 const httpConfig = {
@@ -3060,6 +3062,7 @@ export const advancedFields = [
       enabledImportPreHandle: false,
       tableRef: "",
       onSuccessImport: "",
+      hideCancelButton:false,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -3106,6 +3109,7 @@ export const advancedFields = [
       onConfirmImportEnabled: false,
       onConfirmImport: "",
       onSuccessImport: "",
+      hideCancelButton:false,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -3686,6 +3690,7 @@ export const businessFields = [
 
       tempStorageFlag:1,
       tempStorageCode:null,
+      tempStorageConfirm:null,
 
       customClass: "",
       onCreated: "",

package/src/components/xform/form-render/container-item/data-table-item.vue

@@ -14,101 +14,6 @@
     v-on="eventConfig"
   >
     <template #form>
-      <!--            <div v-if="widget.options.showSearchArea" class="clearfix screen-btns">
-                    <div class="fl">
-                      &lt;!&ndash;              <vxe-button status="primary" class="button-sty" icon="el-icon-upload2"
-                                          @click="$excelExport({ title: '导出', targetRef: 'grid' + widget.id })"
-                                          v-if="widget.options.showExportBtn!==false">导出
-                              </vxe-button>&ndash;&gt;
-
-                      <template v-if="!!widget.buttons && widget.buttons.length > 0">
-                        <template v-for="(subWidget, swIdx) in widget.buttons">
-                          <template v-if="'container' === subWidget.category">
-                            <component
-                              :is="subWidget.type + '-item'"
-                              :widget="subWidget"
-                              :key="swIdx"
-                              :parent-list="widget.buttons"
-                              :index-of-parent-list="swIdx"
-                              :parent-widget="widget"
-                            >
-                              &lt;!&ndash; 递归传递插槽！！！ &ndash;&gt;
-                              <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
-                                <slot :name="slot" v-bind="scope"/>
-                              </template>
-                            </component>
-                          </template>
-                          <template v-else>
-                            <component
-                              :is="subWidget.type + '-widget'"
-                              :field="subWidget"
-                              :designer="null"
-                              :key="swIdx"
-                              :parent-list="widget.buttons"
-                              :index-of-parent-list="swIdx"
-                              :parent-widget="widget"
-                            >
-                              &lt;!&ndash; 递归传递插槽！！！ &ndash;&gt;
-                              <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
-                                <slot :name="slot" v-bind="scope"/>
-                              </template>
-                            </component>
-                          </template>
-                        </template>
-                      </template>
-
-                    </div>
-                    <div class="fr">
-                      &lt;!&ndash; <vxe-button icon="el-icon-view" class="button-sty" @click="searchEvent">显示总记录数</vxe-button> &ndash;&gt;
-                      <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                                  plain>重置
-                      </vxe-button>
-
-                      <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">搜索
-                      </vxe-button>
-                    </div>
-                  </div>
-                  <div v-if="widget.options.showSearchArea && widget.widgetList.length != 0" ref="searchForm"
-                       class="screen-box vxe-form" title-width="92px" title-align="right">
-                    <template v-if="!!widget.widgetList && widget.widgetList.length > 0">
-                      <template v-for="(subWidget, swIdx) in widget.widgetList">
-                        <template v-if="'container' === subWidget.category">
-                          <component
-                            :is="subWidget.type + '-item'"
-                            :widget="subWidget"
-                            :key="swIdx"
-                            :parent-list="widget.widgetList"
-                            :index-of-parent-list="swIdx"
-                            :parent-widget="widget"
-                            formItemType="vxe-form-item"
-                          >
-                            &lt;!&ndash; 递归传递插槽！！！ &ndash;&gt;
-                            <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
-                              <slot :name="slot" v-bind="scope"/>
-                            </template>
-                          </component>
-                        </template>
-                        <template v-else>
-                          <component
-                            :is="subWidget.type + '-widget'"
-                            :field="subWidget"
-                            :designer="null"
-                            :key="swIdx"
-                            :parent-list="widget.widgetList"
-                            :index-of-parent-list="swIdx"
-                            :parent-widget="widget"
-                            formItemType="vxe-form-item"
-                          >
-                            &lt;!&ndash; 递归传递插槽！！！ &ndash;&gt;
-                            <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
-                              <slot :name="slot" v-bind="scope"/>
-                            </template>
-                          </component>
-                        </template>
-                      </template>
-                    </template>
-                  </div>-->
-
       <tableForm
         v-if="widget.options.isQueryTable"
         :formData.sync="formModel"
@@ -225,24 +130,6 @@
         @confirm="confirmTreeMoveDialog"
       ></treeMoveDialog>
     </template>
-    <!--    <template v-for="fieldWidget in widgets" v-slot:[fieldWidget.id]="obj">
-          <component
-            :is="getColumnWidgetName(fieldWidget)"
-            :field="fieldWidget"
-            :form-model="globalModel.formModel"
-            :designer="null"
-            :key="fieldWidget.id+'-'+obj.rowIndex"
-            :parent-widget="widget"
-            :columnConfig="obj.column.params.columnConfig"
-            :subFormRowIndex="obj.rowIndex"
-            :formItemProp="getColumnProp(widget,obj)"
-            :tableParam="obj"
-          >
-            <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
-              <slot :name="slot" v-bind="scope"/>
-            </template>
-          </component>
-        </template>-->
     <template #widget="obj">
       <template v-if="!!getTableColumnWidget(obj)">
         <template v-if="obj.column.params.widget.type == 'status'">
@@ -400,30 +287,6 @@
         </template>
       </div>
     </template>
-    <!--    <template #editDelete="obj">
-          <a
-            href="javascript:void(0);"
-            class="a-link"
-            @click="deleteRow(obj.row,obj.rowIndex)"
-            :key="obj.rowIndex+'-editDelete'"
-            v-show="!hasWf"
-          >
-            <el-tooltip :enterable="false" effect="dark" content="删除" placement="top" popper-class="tooltip-skin">
-              <i class="el-icon-delete"/>
-            </el-tooltip>
-          </a>
-        </template>
-        <template #editButton="obj">
-          <a
-            href="javascript:void(0);"
-            class="a-link"
-            @click="openEditDialog(obj.row)"
-          >
-            <el-tooltip :enterable="false" effect="dark" content="查看" placement="top" popper-class="tooltip-skin">
-              <i class="el-icon-edit"/>
-            </el-tooltip>
-          </a>
-        </template>-->
   </vxe-grid>
 </template>
 

package/src/components/xform/form-render/container-item/tab-item.vue

@@ -3,7 +3,7 @@
     :widget="widget"
     :class="widget.options.isFullscreen ? 'full-height' : ''"
   >
-    <div :key="widget.id" class="tab-container" v-show="!widget.options.hidden">
+    <div :key="widget.id" class="tab-container mHeight" v-show="!widget.options.hidden">
       <el-tabs
         v-model="activeTabName"
         :type="widget.displayType"
@@ -120,4 +120,6 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+  ::v-deep .mHeight .el-tabs .el-tabs__content{min-height:312px}
+</style>

package/src/views/bd/setting/config_manage/list.vue

@@ -3,13 +3,23 @@
     <div class="flex">
       <div class="tab-box-vertical">
         <div class="list-scroll">
-          <div class="item" v-for="(item,index) in typeTabs" :key="item.name" :class="{on:item.name==activeName}"
-               @click="chooseTab(item)">{{ item.label }}
+          <div
+            class="item"
+            v-for="(item, index) in typeTabs"
+            :key="item.name"
+            :class="{ on: item.name == activeName }"
+            @click="chooseTab(item)"
+          >
+            {{ item.label }}
           </div>
         </div>
       </div>
       <div class="flex-tabboxWidth">
-        <div v-for="(item,index) in typeTabs" :key="item.name" v-show="item.name==activeName">
+        <div
+          v-for="(item, index) in typeTabs"
+          :key="item.name"
+          v-show="item.name == activeName"
+        >
           <component :is="item.name" :containtId="false" v-if="item.inited"></component>
         </div>
       </div>
@@ -25,7 +35,6 @@ import logic_param_list from "@base/views/bd/setting/logic_param/list.vue";
 import logic_param_list1 from "@base/views/bd/setting/logic_param/list1.vue";
 import logic_param_list2 from "@base/views/bd/setting/logic_param/list2.vue";
 
-
 export default {
   name: "list",
   components: {
@@ -41,26 +50,27 @@ export default {
     return {
       activeName: "bd_attach_setting_list",
       typeTabs: [
-        {label: this.$t1("导入模板"), name: "bd_attach_setting_list", inited: true},
-        {label: this.$t1("同步调用接口"), name: "request_setting_list", inited: false},
-        {label: this.$t1("异步推送数据"), name: "request_async_setting_list", inited: false},
-        {label: this.$t1("组织环境设置"), name: "bd_company_env_list", inited: false},
-        {label: this.$t1("逻辑参数"), name: "logic_param_list", inited: false},
-        {label: this.$t1("操作日志编码"), name: "logic_param_list1", inited: false},
-        {label: this.$t1("上传文件服务"), name: "logic_param_list2", inited: false},
-      ]
-    }
+        { label: this.$t1("导入模板"), name: "bd_attach_setting_list", inited: true },
+        { label: this.$t1("同步调用接口"), name: "request_setting_list", inited: false },
+        {
+          label: this.$t1("异步推送数据"),
+          name: "request_async_setting_list",
+          inited: false,
+        },
+        { label: this.$t1("组织环境设置"), name: "bd_company_env_list", inited: false },
+        { label: this.$t1("逻辑参数"), name: "logic_param_list", inited: false },
+        // {label: this.$t1("操作日志编码"), name: "logic_param_list1", inited: false},
+        { label: this.$t1("上传文件服务"), name: "logic_param_list2", inited: false },
+      ],
+    };
   },
   methods: {
     chooseTab(item) {
       this.activeName = item.name;
       item.inited = true;
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
-
-<style scoped>
-
-</style>
+<style scoped></style>