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

package/src/components/xform/form-designer/setting-panel/option-items-setting.vue

@@ -1,7 +1,10 @@
 <template>
   <div class="option-items-pane">
     <el-form-item label="选项值类型">
-      <el-radio-group v-model="optionModel.optionItemValueType" @change="changeValueType">
+      <el-radio-group
+        v-model="optionModel.optionItemValueType"
+        @change="changeValueType"
+      >
         <el-radio :label="0">文本</el-radio>
         <el-radio :label="1">数值</el-radio>
         <el-radio :label="2">布尔值</el-radio>
@@ -54,7 +57,9 @@
         type="text"
         v-model="optionModel.labelKey"
         placeholder="默认label"
-        :disabled="optionModel.commonAttributeEnabled || !optionModel.formScriptEnabled"
+        :disabled="
+          optionModel.commonAttributeEnabled || !optionModel.formScriptEnabled
+        "
       ></el-input>
     </el-form-item>
     <el-form-item :label="i18nt('关联字段')">
@@ -62,11 +67,21 @@
         type="text"
         v-model="optionModel.valueKey"
         placeholder="默认value"
-        :disabled="optionModel.commonAttributeEnabled || !optionModel.formScriptEnabled"
+        :disabled="
+          optionModel.commonAttributeEnabled || !optionModel.formScriptEnabled
+        "
       ></el-input>
     </el-form-item>
+    <el-form-item
+      v-if="hasConfig('childrenKey')"
+      :label="i18nt('designer.setting.childrenKeyName')"
+    >
+      <el-input v-model="optionModel.childrenKey"></el-input>
+    </el-form-item>
     <template
-      v-if="!optionModel.commonAttributeEnabled && !optionModel.formScriptEnabled"
+      v-if="
+        !optionModel.commonAttributeEnabled && !optionModel.formScriptEnabled
+      "
     >
       <el-radio-group
         v-if="
@@ -80,7 +95,11 @@
           tag="ul"
           class="draggable-box"
           :list="optionModel.optionItems"
-          v-bind="{ group: 'optionsGroup', ghostClass: 'ghost', handle: '.drag-option' }"
+          v-bind="{
+            group: 'optionsGroup',
+            ghostClass: 'ghost',
+            handle: '.drag-option',
+          }"
         >
           <li v-for="(option, idx) in optionModel.optionItems" :key="idx">
             <el-radio :label="option.value">
@@ -136,7 +155,11 @@
           tag="ul"
           class="draggable-box"
           :list="optionModel.optionItems"
-          v-bind="{ group: 'optionsGroup', ghostClass: 'ghost', handle: '.drag-option' }"
+          v-bind="{
+            group: 'optionsGroup',
+            ghostClass: 'ghost',
+            handle: '.drag-option',
+          }"
         >
           <li v-for="(option, idx) in optionModel.optionItems" :key="idx">
             <el-checkbox :label="option.value">
@@ -185,7 +208,8 @@
         @change="emitDefaultValueChange"
         :placeholder="i18nt('render.hint.selectPlaceholder')"
         style="width: 100%"
-      ></el-cascader>
+      >
+      </el-cascader>
       <div v-if="selectedWidget.type === 'cascader'">
         <el-button type="text" @click="importCascaderOptions">{{
           i18nt("designer.setting.importOptions")
@@ -248,22 +272,29 @@
       v-if="showImportCascaderDialogFlag"
       :show-close="true"
       class="small-padding-dialog"
+      append-to-body
       :close-on-click-modal="false"
       :close-on-press-escape="false"
       :destroy-on-close="true"
-      :append-to-body="true"
-      :modal-append-to-body="true"
     >
-      <code-editor v-model="cascaderOptions" mode="json" :readonly="false"></code-editor>
+      <code-editor
+        v-model="cascaderOptions"
+        mode="json"
+        :readonly="false"
+      ></code-editor>
       <div slot="footer" class="dialog-footer">
         <el-button size="large" type="primary" @click="saveCascaderOptions">{{
           i18nt("designer.hint.confirm")
         }}</el-button>
-        <el-button size="large" type="" @click="showImportCascaderDialogFlag = false">{{
-          i18nt("designer.hint.cancel")
-        }}</el-button>
+        <el-button
+          size="large"
+          type=""
+          @click="showImportCascaderDialogFlag = false"
+          >{{ i18nt("designer.hint.cancel") }}</el-button
+        >
       </div>
     </el-dialog>
+
     <el-dialog
       v-if="dataDialogVisible"
       custom-class="dialog-style list-dialog"
@@ -297,7 +328,11 @@
           </el-button>
         </div>
       </template>
-      <code-editor mode="json" :readonly="!1" v-model="tableDataOptions"></code-editor>
+      <code-editor
+        mode="json"
+        :readonly="!1"
+        v-model="tableDataOptions"
+      ></code-editor>
     </el-dialog>
   </div>
 </template>
@@ -305,11 +340,12 @@
 <script>
 import Draggable from "vuedraggable";
 import i18n from "../../../../components/xform/utils/i18n";
+import propertyMixin from "../../../../components/xform/form-designer/setting-panel/property-editor/propertyMixin";
 
 export default {
   name: "OptionItemsSetting",
   componentName: "PropertyEditor",
-  mixins: [i18n],
+  mixins: [i18n, propertyMixin],
   components: {
     Draggable,
   },
@@ -406,13 +442,16 @@ export default {
       let lineArray = this.optionLines.split("\n");
       //console.log('test', lineArray)
       if (lineArray.length > 0) {
-        let isNumericOptionItemValue = this.optionModel.optionItemValueType === 1;
+        let isNumericOptionItemValue =
+          this.optionModel.optionItemValueType === 1;
         this.optionModel.optionItems = [];
         lineArray.forEach((optLine) => {
           if (!!optLine && !!optLine.trim()) {
             if (optLine.indexOf(this.separator) !== -1) {
               let valueStr = optLine.split(this.separator)[0];
-              let value = isNumericOptionItemValue ? Number(valueStr) : valueStr;
+              let value = isNumericOptionItemValue
+                ? Number(valueStr)
+                : valueStr;
               this.optionModel.optionItems.push({
                 value: value,
                 label: optLine.split(this.separator)[1],
@@ -436,7 +475,8 @@ export default {
     resetDefault() {
       if (
         this.selectedWidget.type === "checkbox" ||
-        (this.selectedWidget.type === "select" && this.selectedWidget.options.multiple)
+        (this.selectedWidget.type === "select" &&
+          this.selectedWidget.options.multiple)
       ) {
         this.optionModel.defaultValue = [];
       } else {
@@ -447,7 +487,11 @@ export default {
     },
 
     importCascaderOptions() {
-      this.cascaderOptions = JSON.stringify(this.optionModel.optionItems, null, "  ");
+      this.cascaderOptions = JSON.stringify(
+        this.optionModel.optionItems,
+        null,
+        "  "
+      );
       this.showImportCascaderDialogFlag = true;
     },
 
@@ -459,7 +503,9 @@ export default {
 
         this.showImportCascaderDialogFlag = false;
       } catch (ex) {
-        this.$message.error(this.i18nt("designer.hint.invalidOptionsData") + ex.message);
+        this.$message.error(
+          this.i18nt("designer.hint.invalidOptionsData") + ex.message
+        );
       }
     },
     changeValueType(val) {
@@ -496,7 +542,9 @@ export default {
         (this.optionModel.defaultValue = JSON.parse(this.tableDataOptions)),
           (this.dataDialogVisible = !1);
       } catch (e) {
-        this.$message.error(this.i18nt("designer.hint.invalidOptionsData") + e.message);
+        this.$message.error(
+          this.i18nt("designer.hint.invalidOptionsData") + e.message
+        );
       }
     },
     getDefaultValue() {

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

@@ -1,5 +1,21 @@
 <template>
   <div>
+    <!-- <el-form-item label-width="0">
+      <el-divider class="custom-divider-margin-top">数据集</el-divider>
+    </el-form-item>
+    <el-form-item :label="i18nt('designer.setting.required')">
+      <el-switch v-model="optionModel.required"></el-switch>
+    </el-form-item>
+    <el-form-item :label="i18nt('designer.setting.requiredHint')">
+      <el-input
+        v-model="optionModel.requiredHint"
+        clearable
+        placeholder="留空则使用默认提示"
+      ></el-input>
+    </el-form-item> -->
+    <el-form-item label-width="0">
+      <el-divider class="custom-divider-margin-top">表格布局</el-divider>
+    </el-form-item>
     <el-form-item :label="i18nt('designer.setting.tableWidth')">
       <el-input v-model="optionModel.tableWidth"></el-input>
     </el-form-item>
@@ -135,9 +151,19 @@
         <el-radio label="api">接口动态列</el-radio>
       </el-radio-group>
     </el-form-item>
-    <div v-if="optionModel.dynamicColumnSourceType === 'script'" class="dynamic-column-block">
-      <div class="form-section-label">前端列脚本</div>
-      <div class="form-section-desc">不调接口，脚本直接 return 列配置</div>
+    <div
+      v-if="optionModel.dynamicColumnSourceType === 'script'"
+      class="dynamic-column-block"
+    >
+      <div class="form-section-label">
+        前端列脚本
+        <el-tooltip effect="light" placement="top">
+          <div slot="content" class="field-tip-content">
+            不调接口，脚本直接 return 列配置
+          </div>
+          <i class="el-icon-info label-tip-icon"></i>
+        </el-tooltip>
+      </div>
       <div class="data-table-editor-subsection">
         <el-form-item label="列脚本">
           <a
@@ -153,18 +179,38 @@
         </el-form-item>
       </div>
     </div>
-    <div v-if="optionModel.dynamicColumnSourceType === 'api'" class="dynamic-column-block">
-      <div class="form-section-label">接口动态列</div>
-      <div class="form-section-desc">打开表单时请求后端脚本，返回列配置</div>
+    <div
+      v-if="optionModel.dynamicColumnSourceType === 'api'"
+      class="dynamic-column-block"
+    >
+      <div class="form-section-label">
+        接口动态列
+        <el-tooltip effect="light" placement="top">
+          <div slot="content" class="field-tip-content">
+            打开表单时请求后台脚本，返回字段/列定义（格式与「表头后台字段」一致，详见
+            docs/数据表格动态列 JSON 说明.md）
+          </div>
+          <i class="el-icon-info label-tip-icon"></i>
+        </el-tooltip>
+      </div>
       <div class="data-table-editor-subsection">
         <el-form-item label="脚本编码">
           <el-input
             v-model="optionModel.dynamicColumnScriptCode"
             clearable
-            placeholder="如 getDynamicColumns"
+            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 }
+              </div>
+              <i class="el-icon-info label-tip-icon"></i>
+            </el-tooltip>
+          </span>
           <a
             href="javascript:void(0);"
             class="a-link link-oneLind"
@@ -178,37 +224,40 @@
         </el-form-item>
         <el-form-item>
           <span slot="label">
-            响应转换
+            转换脚本
             <el-tooltip effect="light" placement="top">
-              <div slot="content" style="line-height: 1.4; max-width: 320px">
-                将接口返回的
-                <code>res</code> 转为列数组；不配置则按平台默认结构解析。
+              <div slot="content" class="field-tip-content">
+                可选。入参 res，返回标准定义数组；不填时默认取
+                res.objx（数组）或 res.objx.fields / res.objx.columns
               </div>
-              <i class="el-icon-info"></i>
+              <i class="el-icon-info label-tip-icon"></i>
             </el-tooltip>
           </span>
           <a
             href="javascript:void(0);"
             class="a-link link-oneLind"
-            @click="editEventHandler('onDynamicColumnsConvert', ['res'])"
+            @click="editDynamicSchemaConvert"
           >
-            <span>{{ optionModel.onDynamicColumnsConvert }}</span>
+            <span>{{ dynamicSchemaConvertDisplay }}</span>
             <i class="el-icon-edit"></i>
           </a>
         </el-form-item>
       </div>
     </div>
-    <div v-if="optionModel.dynamicColumnSourceType !== 'none'" class="dynamic-column-block">
+    <div
+      v-if="optionModel.dynamicColumnSourceType !== 'none'"
+      class="dynamic-column-block"
+    >
       <div class="data-table-editor-subsection">
         <el-form-item>
           <span slot="label">
             加载条件
             <el-tooltip effect="light" placement="top">
-              <div slot="content" style="line-height: 1.4; max-width: 320px">
+              <div slot="content" class="field-tip-content">
                 表格初始化加载动态列前执行。<br />
                 <code>return false</code> 时不加载；不配置则默认加载。
               </div>
-              <i class="el-icon-info"></i>
+              <i class="el-icon-info label-tip-icon"></i>
             </el-tooltip>
           </span>
           <a
@@ -224,15 +273,15 @@
         </el-form-item>
       </div>
     </div>
-    <el-form-item v-if="optionModel.dynamicColumnSourceType !== 'none'" label="动态列模式">
+    <el-form-item v-if="optionModel.dynamicColumnSourceType !== 'none'">
       <span slot="label">
         动态列模式
         <el-tooltip effect="light" placement="top">
-          <div slot="content" style="line-height: 1.4; max-width: 320px">
+          <div slot="content" class="field-tip-content">
             对<strong>生效的动态列</strong>与静态列的合并方式：<br />
             追加 — 静态列 + 动态列；替换 — 仅动态列。
           </div>
-          <i class="el-icon-info"></i>
+          <i class="el-icon-info label-tip-icon"></i>
         </el-tooltip>
       </span>
       <el-select v-model="optionModel.dynamicColumnMode" style="width: 100%">
@@ -700,6 +749,9 @@ export default {
         this.optionModel.isNotShowQueryButton = !val;
       },
     },
+    dynamicSchemaConvertDisplay() {
+      return this.optionModel.dynamicSchemaConvert || "";
+    },
   },
   created: function () {
     // this.reportTemplate = this.getReportTemplate();
@@ -724,6 +776,9 @@ export default {
     }
   },
   methods: {
+    editDynamicSchemaConvert() {
+      this.editEventHandler("dynamicSchemaConvert", ["res"]);
+    },
     dragSort: function () {
       var e = this.$refs.singleTable.$el.querySelectorAll(
           ".el-table__body-wrapper > table > tbody"
@@ -1063,13 +1118,20 @@ export default {
   font-weight: 500;
   color: #303133;
   line-height: 22px;
+  margin-bottom: 8px;
 }
 
-.form-section-desc {
-  font-size: 12px;
+.label-tip-icon {
+  margin-left: 4px;
   color: #909399;
-  line-height: 18px;
-  margin: 2px 0 8px 8px;
+  cursor: pointer;
+  font-size: 14px;
+  vertical-align: middle;
+}
+
+.field-tip-content {
+  line-height: 1.4;
+  max-width: 320px;
 }
 
 .dynamic-column-hint {

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

@@ -771,6 +771,10 @@ export default {
               value: "textarea",
               label: "多行文本输入框",
             },
+            {
+              value: "editScriptInput",
+              label: "脚本输入框",
+            },
             {
               value: "editSelect",
               label: "下拉框",
@@ -1590,6 +1594,7 @@ export default {
           row.prop = null;
           row.label = null;
           row.sortable = false;
+          row.filterable = false;
         } else {
           let tmpId = "column" + generateId();
           if (!row.width || row.width == 47) row.width = 150;

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

@@ -5,19 +5,17 @@
 </template>
 
 <script>
-  import i18n from "../../../../../../components/xform/utils/i18n"
+import i18n from "../../../../../../components/xform/utils/i18n";
 
-  export default {
-    name: "checkStrictly-editor",
-    mixins: [i18n],
-    props: {
-      designer: Object,
-      selectedWidget: Object,
-      optionModel: Object,
-    },
-  }
+export default {
+  name: "checkStrictly-editor",
+  mixins: [i18n],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+};
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

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

@@ -0,0 +1,21 @@
+<template>
+  <el-form-item :label="i18nt('designer.setting.showAllLevels')">
+    <el-switch v-model="optionModel.showAllLevels"></el-switch>
+  </el-form-item>
+</template>
+
+<script>
+import i18n from "../../../../../../components/xform/utils/i18n";
+
+export default {
+  name: "showAllLevels-editor",
+  mixins: [i18n],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+};
+</script>
+
+<style scoped></style>