cloud-web-corejs 1.0.54-dev.124 → 1.0.54-dev.126

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

@@ -3,14 +3,14 @@
     <el-form-item label-width="0">
       <el-divider class="custom-divider-margin-top">请求访问设置</el-divider>
     </el-form-item>
-    <el-form-item label="启用表单脚本" v-if="formScriptEnabledTypes.includes(selectedWidget.type)">
+    <el-form-item label="启用请求后台脚本" v-if="formScriptEnabledTypes.includes(selectedWidget.type)">
       <el-switch v-model="optionModel.formScriptEnabled" @change="changeFormScriptEnabled"></el-switch>
     </el-form-item>
     <template>
-      <el-form-item label="表单脚本编码">
+      <el-form-item label="表单脚本编码" v-if="optionModel.formScriptEnabled">
         <el-input v-model="optionModel.formScriptCode" clearable></el-input>
       </el-form-item>
-      <el-form-item label="查询参数">
+      <el-form-item label="查询参数" v-if="optionModel.formScriptEnabled">
         <a href="javascript:void(0);" class="a-link link-oneLind"
            @click="editEventHandler('formScriptParam', ['dataId', 'formCode'])">
           <span>{{ optionModel.formScriptParam }}</span>
@@ -19,16 +19,16 @@
       </el-form-item>
     </template>
     <template  v-if="formScriptEnabledTypes.includes(selectedWidget.type)">
-      <el-form-item :label="i18nt('启用词汇查询')">
+      <el-form-item :label="i18nt('启用系统词汇')">
         <el-switch v-model="optionModel.commonAttributeEnabled" @change="changeCommonAttributeEnabled"></el-switch>
       </el-form-item>
-      <el-form-item :label="i18nt('词汇编码')">
+      <el-form-item :label="i18nt('词汇编码')" v-if="optionModel.commonAttributeEnabled">
         <el-input type="text" v-model="optionModel.commonAttributeCode"></el-input>
       </el-form-item>
-      <el-form-item :label="i18nt('显示字段')">
+      <el-form-item :label="i18nt('显示字段')" v-if="optionModel.formScriptEnabled">
         <el-input type="text" v-model="optionModel.labelKey"></el-input>
       </el-form-item>
-      <el-form-item :label="i18nt('关联字段')">
+      <el-form-item :label="i18nt('关联字段')" v-if="optionModel.formScriptEnabled">
         <el-input type="text" v-model="optionModel.valueKey"></el-input>
       </el-form-item>
     </template>

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

@@ -506,10 +506,10 @@ modules = {
 
         let getDateItem = (widget) => {
           let options = widget.options;
-          
+
           let dateConfig = {
             format: options.format,
-            valueFormat: options.valueFormat,
+            valueFormat: options.valueFormat ?? null,
           };
           let typeMap = {
             input: { type: "input" },
@@ -520,15 +520,25 @@ modules = {
               widgetType: options.type,
               widgetConfig: dateConfig,
             },
-            time: { type: "time", widgetConfig: dateConfig },
+            time: {
+              type: "time",
+              widgetConfig: {
+                ...dateConfig,
+                valueFormat: "HH:mm:ss",
+              },
+            },
             "date-range": {
               type: "date",
               widgetType: "daterange",
-              widgetConfig: { ...dateConfig, isRange: true }
+              widgetConfig: { ...dateConfig, isRange: true },
             },
             "time-range": {
               type: "time",
-              widgetConfig: { ...dateConfig, isRange: true }
+              widgetConfig: {
+                ...dateConfig,
+                isRange: true,
+                valueFormat: "HH:mm:ss",
+              },
             },
           };
           let item = typeMap[widget.type] || {};

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

@@ -96,7 +96,7 @@ export default {
       status: "状态",
       "a-link": "超链接按钮",
       "a-text": "超链接文本",
-      'project-tag': '项目标签'
+      'project-tag': '标签'
     },
     hint: {
       formulaSetting: "公式设置",

package/src/layout/components/extractedCode/createDialog.vue

@@ -16,8 +16,8 @@
       <el-form ref="editCategoryForm" :model="formData" label-width="102px" class="adSearchForm" style="min-height: 150px; width: auto;">
         <el-form-item :label="$t1('类型')">
           <el-select v-model="formData.objType" class="all-width">
-            <el-option value="FormTemplate" :label="$t1('表单')"></el-option>
-            <el-option value="FormScript" :label="$t1('表单脚本')"></el-option>
+            <el-option value="FormTemplate" :label="$t1('表单模板')"></el-option>
+            <el-option value="FormScript" :label="$t1('逻辑脚本')"></el-option>
             <el-option value="TableTemplate" :label="$t1('数据表')"></el-option>
           </el-select>
         </el-form-item>

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

@@ -44,20 +44,22 @@
             </tr>
             <tr>
               <th>
-                <em class="f-red">*</em>
                 {{ $t1('导入时间') }}
               </th>
               <td>
                 {{ formImportLog.impDate }}
               </td>
               <th>
-                <em class="f-red">*</em>
                 {{ $t1('结果') }}
               </th>
-              <td colspan="3">
-                {{ formImportLog.impReturnType }} - {{ formImportLog.impReturnMsg }}
+              <td>
+                {{ impReturnTypeMap[formImportLog.impReturnType] }}
               </td>
             </tr>
+            <tr>
+              <th>{{ $t1('失败描述') }}</th>
+              <td colspan="7">{{ formImportLog.impReturnMsg }}</td>
+            </tr>
             <tr>
               <th>{{ $t1('创建人') }}</th>
               <td>{{ formImportLog._createBy }}</td>
@@ -88,7 +90,11 @@ export default {
       isEdit: false,
       tabIndex: 'first',
       dataId: '',
-      formImportLog: {}
+      formImportLog: {},
+      impReturnTypeMap: {
+        success: this.$t1('成功'),
+        fail: this.$t1('失败')
+      }
     };
   },
   created() {

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

@@ -112,6 +112,10 @@ export default {
     },
     initTableList() {
       let that = this;
+      let impReturnTypeMap = {
+        success: this.$t1('成功'),
+        fail: this.$t1('失败')
+      }
       let tableOption = {
         vue: this,
         tableRef: 'table-m1',
@@ -144,15 +148,20 @@ export default {
             }
           },
           {
-            field: 'impReturnMsg',
+            field: 'impReturnType',
             title: this.$t1('结果'),
-            width: 350,
+            width: 150,
             slots: {
               default: ({row}) => {
-                return `${row.impReturnType} - ${row.impReturnMsg}`;
+                return impReturnTypeMap[row.impReturnType];
               }
             }
           },
+          {
+            field: 'impReturnMsg',
+            title: this.$t1('失败描述'),
+            width: 250
+          },
           {
             field: 'impDate',
             title: this.$t1('导入时间'),