cloud-web-corejs 1.0.54-dev.688 → 1.0.54-dev.689

package/src/components/xform/form-designer/setting-panel/property-editor/container-table/table-dynamicField-editor.vue

@@ -1,11 +1,28 @@
 <template>
   <div class="table-dynamic-field-editor">
     <!-- 后台字段(动态生成)：字段定义本身由后台查询下发 -->
-    <el-divider class="custom-divider">后台字段（动态生成）</el-divider>
+    <el-divider class="custom-divider">
+      后台字段
+      <el-tooltip effect="light" placement="top">
+        <div slot="content" class="field-tip-content">
+          字段「显隐/必填/只读/禁用/取值」等动态规则请到「表单设置 -
+          动态字段规则」统一配置
+        </div>
+        <i class="el-icon-info label-tip-icon"></i>
+      </el-tooltip>
+    </el-divider>
 
-    <el-form-item label="启用后台字段">
+    <el-form-item>
+      <span slot="label">
+        启用后台字段
+        <el-tooltip effect="light" placement="top">
+          <div slot="content" class="field-tip-content">
+            字段由后台查询下发，无需在设计器预先配置
+          </div>
+          <i class="el-icon-info label-tip-icon"></i>
+        </el-tooltip>
+      </span>
       <el-switch v-model="optionModel.dynamicSchemaEnabled"></el-switch>
-      <div class="tip-text">字段由后台查询下发，无需在设计器预先配置</div>
     </el-form-item>
 
     <template v-if="optionModel.dynamicSchemaEnabled">
@@ -16,7 +33,17 @@
           placeholder="scriptCode 或 formCode/scriptCode"
         ></el-input>
       </el-form-item>
-      <el-form-item label="额外参数">
+      <el-form-item>
+        <span slot="label">
+          额外参数
+          <el-tooltip effect="light" placement="top">
+            <div slot="content" class="field-tip-content">
+              与数据表格动态列一致：return { bizType: this.formModel.type }，固定附带
+              formData
+            </div>
+            <i class="el-icon-info label-tip-icon"></i>
+          </el-tooltip>
+        </span>
         <a
           href="javascript:void(0);"
           class="a-link link-oneLind"
@@ -25,12 +52,18 @@
           <span>{{ optionModel.dynamicSchemaScriptParam }}</span>
           <i class="el-icon-edit"></i>
         </a>
-        <div class="tip-text">
-          格式： return { bizType:
-          formModel.type }
-        </div>
       </el-form-item>
-      <el-form-item label="转换脚本">
+      <el-form-item>
+        <span slot="label">
+          转换脚本
+          <el-tooltip effect="light" placement="top">
+            <div slot="content" class="field-tip-content">
+              可选。入参 res，返回标准定义数组或 { fields/columns: [...] }；不填时默认取
+              res.objx（数组）或 res.objx.fields / res.objx.columns
+            </div>
+            <i class="el-icon-info label-tip-icon"></i>
+          </el-tooltip>
+        </span>
         <a
           href="javascript:void(0);"
           class="a-link link-oneLind"
@@ -39,24 +72,35 @@
           <span>{{ optionModel.dynamicSchemaConvert }}</span>
           <i class="el-icon-edit"></i>
         </a>
-        <div class="tip-text">
-          可选。入参 res，返回标准字段定义数组；不填时默认取 res.objx（数组）或
-          res.objx.fields / res.objx.columns
-        </div>
       </el-form-item>
-      <el-form-item label="生成模式">
+      <el-form-item>
+        <span slot="label">
+          生成模式
+          <el-tooltip effect="light" placement="top">
+            <div slot="content" class="field-tip-content">
+              追加=保留已配字段并在其后生成；替换=清空已配行后全部由后台生成；锚点插入=插到设计期某占位行位置
+            </div>
+            <i class="el-icon-info label-tip-icon"></i>
+          </el-tooltip>
+        </span>
         <el-radio-group v-model="optionModel.dynamicSchemaMode" size="mini">
           <el-radio-button label="append">追加</el-radio-button>
           <el-radio-button label="replace">替换</el-radio-button>
           <el-radio-button label="anchor">锚点插入</el-radio-button>
         </el-radio-group>
-        <div class="tip-text">
-          追加=保留已配字段并在其后生成；替换=清空已配行后全部由后台生成；锚点插入=插到设计期某占位行位置
-        </div>
       </el-form-item>
 
       <template v-if="optionModel.dynamicSchemaMode === 'anchor'">
-        <el-form-item label="占位锚点行">
+        <el-form-item>
+          <span slot="label">
+            占位锚点行
+            <el-tooltip effect="light" placement="top">
+              <div slot="content" class="field-tip-content">
+                建议预留一个空行作为占位锚点
+              </div>
+              <i class="el-icon-info label-tip-icon"></i>
+            </el-tooltip>
+          </span>
           <el-select
             v-model="optionModel.dynamicSchemaAnchorRowId"
             size="mini"
@@ -70,7 +114,6 @@
               :value="r.value"
             ></el-option>
           </el-select>
-          <div class="tip-text">建议预留一个空行作为占位锚点</div>
         </el-form-item>
         <el-form-item label="插入位置">
           <el-radio-group
@@ -82,13 +125,19 @@
             <el-radio-button label="after">之后</el-radio-button>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="继承行布局">
+        <el-form-item>
+          <span slot="label">
+            继承行布局
+            <el-tooltip effect="light" placement="top">
+              <div slot="content" class="field-tip-content">
+                开启后生成行沿用占位行的单元格数量/宽度/跨列，否则按"每行列数"平铺
+              </div>
+              <i class="el-icon-info label-tip-icon"></i>
+            </el-tooltip>
+          </span>
           <el-switch
             v-model="optionModel.dynamicSchemaInheritLayout"
           ></el-switch>
-          <div class="tip-text">
-            开启后生成行沿用占位行的单元格数量/宽度/跨列，否则按"每行列数"平铺
-          </div>
         </el-form-item>
       </template>
 
@@ -108,11 +157,6 @@
       </el-form-item>
     </template>
 
-    <div class="tip-text scope-tip">
-      字段「显隐/必填/只读/禁用/取值」等动态规则请到「表单设置 -
-      动态字段规则」统一配置
-    </div>
-
     <el-dialog
       title="额外参数"
       :visible.sync="scriptParamDialogVisible"
@@ -293,14 +337,16 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.tip-text {
-  font-size: 12px;
+.label-tip-icon {
+  margin-left: 4px;
   color: #909399;
-  line-height: 1.4;
-  margin-top: 2px;
+  cursor: pointer;
+  font-size: 14px;
+  vertical-align: middle;
 }
 
-.scope-tip {
-  margin-top: 10px;
+.field-tip-content {
+  line-height: 1.4;
+  max-width: 320px;
 }
 </style>

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

@@ -0,0 +1,54 @@
+<template>
+  <div>
+    <el-form-item label="编辑器语言">
+      <el-select v-model="optionModel.editorMode">
+        <el-option value="javascript" label="JavaScript"></el-option>
+        <el-option value="java" label="Java"></el-option>
+        <el-option value="json" label="JSON"></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="编辑器高度">
+      <el-input
+        v-model="optionModel.editorHeight"
+        placeholder="如 200px"
+      ></el-input>
+    </el-form-item>
+    <el-form-item label="最小行数">
+      <el-input-number
+        v-model="optionModel.editorMinLines"
+        :min="3"
+        :max="100"
+        controls-position="right"
+        style="width: 100%"
+      ></el-input-number>
+    </el-form-item>
+    <el-form-item label="最大行数">
+      <el-input-number
+        v-model="optionModel.editorMaxLines"
+        :min="3"
+        :max="200"
+        controls-position="right"
+        style="width: 100%"
+      ></el-input-number>
+    </el-form-item>
+    <el-form-item label="语法检查">
+      <el-switch v-model="optionModel.userWorker"></el-switch>
+    </el-form-item>
+  </div>
+</template>
+
+<script>
+import i18n from "../../../../utils/i18n";
+
+export default {
+  name: "script-input-editor",
+  mixins: [i18n],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+};
+</script>
+
+<style scoped></style>

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

@@ -127,6 +127,7 @@ const COMMON_PROPERTIES = {
 
   oplogFlag: "oplogFlag-editor",
   vuePageFlag: "vue-page-editor",
+  scriptInputFlag: "script-input-editor",
   ganttConfig: "gantt-editor",
 
   //弹框

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

@@ -176,6 +176,8 @@ export const containers = [
       label: "data-table",
       submitFlag: true,
       formField: "",
+      required: !1,
+      requiredHint: "",
       hidden: !1,
       rowSpacing: 8,
       tableHeight: "",
@@ -257,7 +259,7 @@ export const containers = [
       dynamicColumnMode: "append",
       dynamicColumnScriptCode: null,
       dynamicColumnScriptParam: null,
-      onDynamicColumnsConvert: null,
+      dynamicSchemaConvert: null,
       dynamicColumnLoadScript: null,
       accessType: "1",
       accessUrl: null,
@@ -1121,6 +1123,59 @@ export const basicFields = [
       ...defaultTextFlagConfig,
     },
   },
+  {
+    type: "script-input",
+    icon: "textarea-field",
+    commonFlag: !0,
+    formItemFlag: !0,
+    columnFlag: true,
+    tableField: null,
+    options: {
+      name: "",
+      keyNameEnabled: !1,
+      keyName: "",
+      label: "",
+      labelColor: "",
+      submitFlag: true,
+      labelAlign: "",
+      defaultValue: "",
+      placeholder: "",
+      columnWidth: "200px",
+      size: "",
+      labelWidth: null,
+      labelHidden: !1,
+      readonly: !1,
+      disabled: !1,
+      hidden: !1,
+      required: !1,
+      requiredHint: "",
+      validation: "",
+      validationHint: "",
+      customClass: "",
+      labelIconClass: null,
+      labelIconPosition: "rear",
+      labelTooltip: null,
+      scriptInputFlag: 1,
+      editorMode: "java",
+      editorHeight: "200px",
+      editorMinLines: 8,
+      editorMaxLines: 30,
+      userWorker: !1,
+      onCreated: "",
+      onMounted: "",
+      onInput: "",
+      onChange: "",
+      onFocus: "",
+      onBlur: "",
+      onValidate: "",
+      accessType: "1",
+      ...defaultWfConfig,
+      showRuleFlag: 1,
+      showRuleEnabled: 1,
+      showRules: [],
+      ...defaultTextFlagConfig,
+    },
+  },
   {
     type: "number",
     icon: "number-field",