cloud-web-corejs 1.0.54-dev.342 → 1.0.54-dev.344

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

@@ -0,0 +1,62 @@
+<template>
+  <div>
+    <el-form-item label="上传信息获取脚本"></el-form-item>
+    <el-form-item label-width="0">
+      <el-input
+        v-model="optionModel.vabupload2_scriptCode"
+        placeholder="默认/intf/getHxFileUploadConfig"
+      ></el-input>
+    </el-form-item>
+    <el-form-item label="上传参数定义" label-width="150px">
+      <a
+        href="javascript:void(0);"
+        class="a-link link-oneLind"
+        @click="editEventHandler('vabupload2_uploadParam', params)"
+      >
+        <span>{{ optionModel.vabupload2_uploadParam }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+    <el-form-item label="删除参数定义" label-width="150px">
+      <a
+        href="javascript:void(0);"
+        class="a-link link-oneLind"
+        @click="editEventHandler('vabupload2_deleteParam', params)"
+      >
+        <span>{{ optionModel.vabupload2_deleteParam }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+    <el-form-item label="获取文件参数定义" label-width="150px">
+      <a
+        href="javascript:void(0);"
+        class="a-link link-oneLind"
+        @click="editEventHandler('vabupload2_getFileParam', params)"
+      >
+        <span>{{ optionModel.vabupload2_getFileParam }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+  </div>
+</template>
+
+<script>
+import i18n from "../../../../utils/i18n";
+import eventMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
+export default {
+  name: "field-vabUpload2-editor",
+  mixins: [i18n, eventMixin],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+  data() {
+    return {
+      params: ["dataId", "formCode"],
+    };
+  },
+};
+</script>
+
+<style scoped></style>

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

@@ -157,6 +157,7 @@ const COMMON_PROPERTIES = {
   // searchDialogEventEnabled: "search-dialog-event-editor"
   clickBindEvent: "clickBindEvent-editor",
   vabUpload: "field-vabUpload-editor",
+  vabUpload2Flag: "field-vabUpload2-editor",
   "submitFlag": "submitFlag-editor",
   "aLinkFlag": "a-link-editor",
   "aTextFlag": "a-text-editor",

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

@@ -2760,6 +2760,11 @@ export const advancedFields = [
       showFileCreateBy: false,
       showFileCreateDate: false,
       widgetSize: 2,
+
+      customUploadEnabled: false,
+      uploadUrl: null,
+      uploadHeaders: {},
+      uploadRresponseAdapter: {},
     },
   },
   {
@@ -3709,6 +3714,60 @@ export const businessFields = [
 
     },
   },
+  {
+    type: "vabUpload2",
+    icon: "uploadbox",
+    commonFlag: !0,
+    formItemFlag: !0,
+    tableField: null,
+    options: {
+      name: "",
+      keyNameEnabled: !1,
+      keyName: "",
+      label: "",
+      labelColor: "",
+      submitFlag: true,
+      disabled: !1,
+      hidden: !1,
+      required: !1,
+      labelWidth: null,
+      labelHidden: !0,
+      limit: null,
+      accessType: "1",
+      entityTableCode: null,
+      entityTableDesc: null,
+      onCreated: "",
+      onMounted: "",
+      onAfterConfirmFile: "",
+      vabUpload2Flag: 1,
+
+      vabupload2_scriptCode: "/intf/getHxFileUploadConfig",
+      vabupload2_uploadParam: "return {\n  entityName: \"msdyn_workorder\",\n  entityId: dataId,\n  backendwriteback: \"10\",\n  fileCategory: \"工单\",\n}",
+      vabupload2_deleteParam: "return {\r\n  entityName: \"msdyn_workorder\",\r\n  entityId: dataId,\r\n  backendwriteback: \"10\",\r\n}",
+      // vabupload2_getFileParam:"",
+
+      // ...httpConfig,
+      // formScriptCode: "getList",
+
+      ...defaultWfConfig,
+
+      showRuleFlag: 1,
+      showRuleEnabled: 1,
+      showRules: [],
+
+      hiddenFileInfo: false,
+      hiddenFileName: false,
+      showFileSize: false,
+      showFileCreateBy: false,
+      showFileCreateDate: false,
+      widgetSize: 2,
+
+      customUploadEnabled: false,
+      uploadUrl: null,
+      uploadHeaders: {},
+      uploadRresponseAdapter: {},
+    },
+  },
 ];
 
 export const keyNamePrefixMap = {

package/src/components/xform/lang/zh-CN.js

@@ -61,6 +61,7 @@ export default {
       "picture-upload": "图片",
       "file-upload": "文件",
       "vabUpload": "凭证",
+      "vabUpload2": "凭证(海信)",
       "vabsearch": "搜索框",
       "search_button": "搜索按钮",
       "save_button": "保存按钮",

package/src/views/bd/setting/bd_company_env/edit.vue

@@ -3,64 +3,93 @@
     <el-form ref="editForm" :model="bdCompanyEnv">
       <div class="d-header clearfix">
         <div class="fl">
-          <i class="el-icon-info"/>
-          {{ dataId ? $t1('查看组织环境设置') : $t1('新增组织环境设置') }}
+          <i class="el-icon-info" />
+          {{ dataId ? $t1("查看组织环境设置") : $t1("新增组织环境设置") }}
         </div>
         <div class="fr">
-          <el-button type="primary" plain class="button-sty" @click="$baseReload()" icon="el-icon-refresh-right">
-            {{ $t1('重置') }}
+          <el-button
+            type="primary"
+            plain
+            class="button-sty"
+            @click="$baseReload()"
+            icon="el-icon-refresh-right"
+          >
+            {{ $t1("重置") }}
           </el-button>
-          <el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData">{{ $t1('保存') }}
+          <el-button
+            type="primary"
+            class="button-sty"
+            icon="el-icon-check"
+            @click="saveData"
+            >{{ $t1("保存") }}
           </el-button>
         </div>
       </div>
       <div class="d-cont">
         <div class="d-item">
-          <div class="title first"><b>{{ $t1('基本信息') }}</b></div>
+          <div class="title first">
+            <b>{{ $t1("基本信息") }}</b>
+          </div>
           <table class="table-detail">
             <tbody>
-            <tr>
-              <th>
-                <em class="f-red">*</em>
-                {{ $t1('服务') }}
-              </th>
-              <td>
-                <el-form-item prop="bdService" :rules="[{ required: true, trigger: 'blur' }]">
-                  <el-select v-model="bdCompanyEnv.bdService">
-                    <el-option value="dev" :label="$t1('测试')"></el-option>
-                    <el-option value="uat" :label="$t1('UAT')"></el-option>
-                    <el-option value="prod" :label="$t1('正式')"></el-option>
-                  </el-select>
-                </el-form-item>
-              </td>
-              <th>
-                <em class="f-red">*</em>
-                {{ $t1('组织编码') }}
-              </th>
-              <td>
-                <el-form-item prop="bdCompanyCode" :rules="[{ required: true, trigger: 'blur' }]">
-                  <el-input type="text" autocomplete="off" v-model="bdCompanyEnv.bdCompanyCode" clearable/>
-                </el-form-item>
-              </td>
-            </tr>
-            <tr>
-              <th>{{ $t1('组织备注') }}</th>
-              <td colspan="5">
-                <el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small"
-                          v-model="bdCompanyEnv.bdCompanyRemark"
-                          clearable></el-input>
-              </td>
-            </tr>
-            <tr>
-              <th>{{ $t1('创建人') }}</th>
-              <td>{{ bdCompanyEnv.createBy }}</td>
-              <th>{{ $t1('创建时间') }}</th>
-              <td>{{ bdCompanyEnv.createDate }}</td>
-              <th>{{ $t1('更新人') }}</th>
-              <td>{{ bdCompanyEnv.modifyBy }}</td>
-              <th>{{ $t1('更新时间') }}</th>
-              <td>{{ bdCompanyEnv.modifyDate }}</td>
-            </tr>
+              <tr>
+                <th>
+                  <em class="f-red">*</em>
+                  {{ $t1("服务") }}
+                </th>
+                <td>
+                  <el-form-item
+                    prop="bdService"
+                    :rules="[{ required: true, trigger: 'blur' }]"
+                  >
+                    <el-select v-model="bdCompanyEnv.bdService">
+                      <el-option value="dev" :label="$t1('测试')"></el-option>
+                      <el-option value="uat" :label="$t1('UAT')"></el-option>
+                      <el-option value="prod" :label="$t1('正式')"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </td>
+                <th>
+                  <em class="f-red">*</em>
+                  {{ $t1("组织编码") }}
+                </th>
+                <td>
+                  <el-form-item
+                    prop="bdCompanyCode"
+                    :rules="[{ required: true, trigger: 'blur' }]"
+                  >
+                    <el-input
+                      type="text"
+                      autocomplete="off"
+                      v-model="bdCompanyEnv.bdCompanyCode"
+                      clearable
+                    />
+                  </el-form-item>
+                </td>
+              </tr>
+              <tr>
+                <th>{{ $t1("组织备注") }}</th>
+                <td colspan="5">
+                  <el-input
+                    type="textarea"
+                    :rows="2"
+                    :placeholder="$t1('请输入内容')"
+                    size="small"
+                    v-model="bdCompanyEnv.bdCompanyRemark"
+                    clearable
+                  ></el-input>
+                </td>
+              </tr>
+              <tr>
+                <th>{{ $t1("创建人") }}</th>
+                <td>{{ bdCompanyEnv.createBy }}</td>
+                <th>{{ $t1("创建时间") }}</th>
+                <td>{{ bdCompanyEnv.createDate }}</td>
+                <th>{{ $t1("更新人") }}</th>
+                <td>{{ bdCompanyEnv.modifyBy }}</td>
+                <th>{{ $t1("更新时间") }}</th>
+                <td>{{ bdCompanyEnv.modifyDate }}</td>
+              </tr>
             </tbody>
           </table>
         </div>
@@ -71,26 +100,26 @@
 
 <script>
 export default {
-  name: 'request_setttingEdit',
+  name: "bd_company_envEdit",
   props: {
     _dataId: [String, Number],
-    copyId: [String, Number]
+    copyId: [String, Number],
   },
   components: {},
   data() {
     return {
       isEdit: false,
-      tabIndex: 'first',
-      dataId: '',
+      tabIndex: "first",
+      dataId: "",
       bdCompanyEnv: {
         enabled: true,
         connectTimeout: 10000,
         readTimeout: 60000,
         preScript: null,
         postScript: null,
-        exeCompanyCode: null
+        exeCompanyCode: null,
       },
-      showCodeEditor: false
+      showCodeEditor: false,
     };
   },
   created() {
@@ -110,54 +139,55 @@ export default {
           url: USER_PREFIX + `/bd_company_env/get`,
           method: `post`,
           data: {
-            id: this.dataId
+            id: this.dataId,
           },
           isLoading: true,
           modalStrictly: true,
-          success: res => {
+          success: (res) => {
             this.bdCompanyEnv = res.objx || {};
             this.showCodeEditor = true;
-          }
+          },
         });
       } else {
         this.showCodeEditor = true;
       }
     },
     saveData() {
-      this.$refs.editForm.$baseValidate(valid => {
+      this.$refs.editForm.$baseValidate((valid) => {
         if (valid) {
-          this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
-            var url = USER_PREFIX + (this.isEdit ? `/bd_company_env/update` : `/bd_company_env/save`);
+          this.$baseConfirm(this.$t1("您确定要保存吗？")).then(() => {
+            var url =
+              USER_PREFIX +
+              (this.isEdit ? `/bd_company_env/update` : `/bd_company_env/save`);
             this.$http({
               url: url,
               method: `post`,
               data: this.bdCompanyEnv,
               isLoading: true,
-              success: res => {
+              success: (res) => {
                 this.$message({
                   message: res.content,
-                  type: 'success',
+                  type: "success",
                   duration: 500,
-                  onClose: t => {
+                  onClose: (t) => {
                     if (this.isEdit) {
                       this.$baseReload();
                     } else {
                       this.$baseReload({
                         updateParam: {
                           _dataId: res.objx,
-                          copyId: null
-                        }
+                          copyId: null,
+                        },
                       });
                     }
-                  }
+                  },
                 });
-              }
+              },
             });
           });
         }
       });
-    }
-  }
+    },
+  },
 };
-
 </script>

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

@@ -21,10 +21,22 @@ import bd_attach_setting_list from "@base/views/bd/setting/bd_attach_setting/lis
 import request_setting_list from "@base/views/bd/setting/request_setting/list.vue";
 import bd_company_env_list from "@base/views/bd/setting/bd_company_env/list.vue";
 import request_async_setting_list from "@base/views/bd/setting/request_async_setting/list.vue";
+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: {bd_attach_setting_list, request_setting_list, bd_company_env_list, request_async_setting_list},
+  components: {
+    bd_attach_setting_list,
+    request_setting_list,
+    bd_company_env_list,
+    request_async_setting_list,
+    logic_param_list,
+    logic_param_list1,
+    logic_param_list2,
+  },
   data() {
     return {
       activeName: "bd_attach_setting_list",
@@ -33,6 +45,9 @@ export default {
         {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},
       ]
     }
   },