cloud-web-corejs 1.0.54-dev.78 → 1.0.54-dev.781

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

@@ -1,11 +1,11 @@
 <template>
   <div>
-    <el-form-item :label="i18nt('启用流程')">
-      <el-switch v-model="optionModel.wfEnabled"></el-switch>
-    </el-form-item>
     <el-form-item label-width="0">
       <el-divider class="custom-divider">{{ i18nt('designer.setting.columnSetting') }}</el-divider>
     </el-form-item>
+    <el-form-item :label="i18nt('隐藏导航')">
+      <el-switch v-model="optionModel.hideNav"></el-switch>
+    </el-form-item>
     <el-form-item :label="i18nt('designer.setting.colsOfGrid')"></el-form-item>
     <el-form-item label-width="0">
       <draggable tag="ul" class="draggable-box" :list="selectedWidget.panes"

package/src/components/xform/form-designer/setting-panel/property-editor/container-detail-pane/detail-pane-editor.vue

@@ -1,8 +1,8 @@
 <template>
   <div>
-<!--    <el-form-item :label="i18nt('绑定数据列表key')">
-      <el-input v-model="optionModel.tableRef"></el-input>
-    </el-form-item>-->
+    <el-form-item :label="i18nt('内容默认收起')">
+      <el-switch v-model="optionModel.defaultCollapse"></el-switch>
+    </el-form-item>
   </div>
 </template>
 

package/src/components/xform/form-designer/setting-panel/property-editor/container-grid-col/grid-col-offset-editor.vue

@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.colOffsetTitle')">
-    <el-input-number v-model.number="optionModel.offset" :min="0" :max="24"
+    <el-input-number v-model.number="optionModel.offset" :max="24"
                      style="width: 100%"></el-input-number>
   </el-form-item>
 </template>

package/src/components/xform/form-designer/setting-panel/property-editor/container-grid-col/grid-col-pull-editor.vue

@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.colPullTitle')">
-    <el-input-number v-model.number="optionModel.pull" :min="0" :max="24"
+    <el-input-number v-model.number="optionModel.pull" :max="24"
                      style="width: 100%"></el-input-number>
   </el-form-item>
 </template>

package/src/components/xform/form-designer/setting-panel/property-editor/container-grid-col/grid-col-push-editor.vue

@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.colPushTitle')">
-    <el-input-number v-model.number="optionModel.push" :min="0" :max="24"
+    <el-input-number v-model.number="optionModel.push" :max="24"
                      style="width: 100%"></el-input-number>
   </el-form-item>
 </template>

package/src/components/xform/form-designer/setting-panel/property-editor/container-list-h5/list-h5-editor.vue

@@ -668,13 +668,7 @@ export default {
       }
     },
     changeFormatS(row) {
-      let columnWidgetConfig = this.getColumnWidgetConfig(row, true);
-      let {columnSelectedWidget, columnEditFields} = columnWidgetConfig;
-      if (columnSelectedWidget) {
-        row.columnOption = columnSelectedWidget.options;
-      } else {
-        row.columnOption = {}
-      }
+      row.widget = this.designer.createColumnWidget(row, false) || null;
       if (row.formatS == 'editDelete' || row.formatS == 'editButton') {
         row.width = 47;
         row.prop = null;
@@ -689,32 +683,32 @@ export default {
       }
     },
     getColumnWidgetConfig(row, isChange) {
-      let formatS = row.formatS
       let columnSelectedWidget = null;
       let columnEditFields = null;
 
       let type = this.columnFormatMap[row.formatS];
-      /*if (type == 'date') {
-        columnEditFields = ['type', 'format', 'valueFormat']
-      } else if (type == 'select') {
-
-      }
-      if (type == 'vabsearch') {
-        columnEditFields = ['vabSearchField', 'formCode', 'formVersion', 'required', 'showFormField', 'onSearchConfirm', 'onSearchClear']
-      }*/
 
       if (type) {
-        columnSelectedWidget = this.$baseLodash.cloneDeep(this.designer.getFieldWidgetByType(type));
-        let tmpId = generateId();
-        let idVal = row.prop ? row.prop : (type + tmpId);
-        columnSelectedWidget.id = idVal;
-        columnSelectedWidget.options.name = idVal;
-        if (!isChange && row.columnOption && Object.keys(row.columnOption).length) {
-          row.columnOption.required = row.required || false;
-          columnSelectedWidget.options = row.columnOption;
+        if (!isChange) {
+          const sourceWidget = this.designer.getColumnWidget(row, false);
+          if (sourceWidget) {
+            columnSelectedWidget = this.$baseLodash.cloneDeep(sourceWidget);
+            columnSelectedWidget.options.required = row.required || false;
+          } else {
+            columnSelectedWidget = this.$baseLodash.cloneDeep(this.designer.getFieldWidgetByType(type));
+            let tmpId = generateId();
+            let idVal = row.prop ? row.prop : (type + tmpId);
+            columnSelectedWidget.id = idVal;
+            columnSelectedWidget.options.name = idVal;
+            columnSelectedWidget.options.required = row.required || false;
+          }
         } else {
+          columnSelectedWidget = this.$baseLodash.cloneDeep(this.designer.getFieldWidgetByType(type));
+          let tmpId = generateId();
+          let idVal = row.prop ? row.prop : (type + tmpId);
+          columnSelectedWidget.id = idVal;
+          columnSelectedWidget.options.name = idVal;
           columnSelectedWidget.options.required = row.required || false;
-          row.columnOption = columnSelectedWidget.options;
         }
         columnSelectedWidget.options.name = row.prop;
         columnSelectedWidget.options.label = row.label;
@@ -724,38 +718,32 @@ export default {
       return {columnSelectedWidget, columnEditFields};
     },
     openFormatConfigDialog(row, index) {
-      let option = row.columnOption;
-      let selectedWidget;
-      let columnWidgetConfig = this.getColumnWidgetConfig(row);
-      let {columnSelectedWidget, columnEditFields} = columnWidgetConfig;
-      if (columnSelectedWidget) {
-        option = columnSelectedWidget.options;
-        selectedWidget = columnSelectedWidget;
-      } else {
-        option = {}
-        selectedWidget = {};
+      const {columnSelectedWidget, columnEditFields} = this.getColumnWidgetConfig(row);
+      if (!columnSelectedWidget) {
+        return;
       }
-
-      let columnOption = this.$baseLodash.cloneDeep(option);
-      row.columnOption = columnOption;
+      columnSelectedWidget.options = this.$baseLodash.cloneDeep(
+        columnSelectedWidget.options
+      );
       this.operateIndex = index;
 
       this.openWidgetPropertyDialog({
         row: row,
-        columnSelectedWidget: selectedWidget,
+        columnSelectedWidget,
         index: index,
         columnEditFields: columnEditFields,
-        callback: (columnOption) => {
-          this.confirmFormatConfigDialog(columnOption);
+        callback: (confirmedWidget) => {
+          this.confirmFormatConfigDialog(confirmedWidget);
         }
       })
     },
-    confirmFormatConfigDialog(columnOption) {
+    confirmFormatConfigDialog(columnSelectedWidget) {
+      const options = columnSelectedWidget.options;
       let row = this.optionModel.tableColumns[this.operateIndex];
-      row.columnOption = columnOption;
-      row.prop = columnOption.name;
-      row.label = columnOption.label;
-      row.required = columnOption.required;
+      row.widget = columnSelectedWidget;
+      row.prop = options.name;
+      row.label = options.label;
+      row.required = options.required;
     },
     openFieldTreeDialog() {
       this.treeData = [{

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

@@ -0,0 +1,344 @@
+<template>
+  <div class="table-dynamic-field-editor">
+    <el-form-item label-width="0">
+      <el-divider class="custom-divider-margin-top">
+        动态字段
+        <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>
+    <el-form-item label="动态字段来源">
+      <el-radio-group v-model="optionModel.dynamicSchemaSourceType">
+        <el-radio label="none">无</el-radio>
+        <el-radio label="script">前端字段脚本</el-radio>
+        <el-radio label="api">接口动态字段</el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <div
+      v-if="optionModel.dynamicSchemaSourceType === 'script'"
+      class="dynamic-column-block"
+    >
+      <div class="form-section-label">
+        前端字段脚本
+        <el-tooltip effect="light" placement="top">
+          <div slot="content" class="field-tip-content">
+            不调接口，脚本直接 return 字段定义数组或 { fields: [...] }
+          </div>
+          <i class="el-icon-info label-tip-icon"></i>
+        </el-tooltip>
+      </div>
+      <div class="data-table-editor-subsection">
+        <el-form-item label="字段脚本">
+          <a
+            href="javascript:void(0);"
+            class="a-link link-oneLind"
+            @click="editEventHandler('dynamicSchemaScript', defaultEventParams)"
+          >
+            <span>{{ optionModel.dynamicSchemaScript }}</span>
+            <i class="el-icon-edit"></i>
+          </a>
+        </el-form-item>
+      </div>
+    </div>
+    <div
+      v-if="optionModel.dynamicSchemaSourceType === '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.dynamicSchemaScriptCode"
+            clearable
+            placeholder="scriptCode 或 formCode/scriptCode"
+          ></el-input>
+        </el-form-item>
+        <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"
+            @click="
+              editEventHandler('dynamicSchemaScriptParam', tableConfigParams)
+            "
+          >
+            <span>{{ optionModel.dynamicSchemaScriptParam }}</span>
+            <i class="el-icon-edit"></i>
+          </a>
+        </el-form-item>
+        <el-form-item>
+          <span slot="label">
+            转换脚本
+            <el-tooltip effect="light" placement="top">
+              <div slot="content" class="field-tip-content">
+                可选。入参 res，返回标准定义数组；不填时默认取
+                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"
+            @click="editDynamicSchemaConvert"
+          >
+            <span>{{ dynamicSchemaConvertDisplay }}</span>
+            <i class="el-icon-edit"></i>
+          </a>
+        </el-form-item>
+      </div>
+    </div>
+    <div
+      v-if="optionModel.dynamicSchemaSourceType !== '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" class="field-tip-content">
+                表单初始化加载动态字段前执行。<br />
+                <code>return false</code> 时不加载；不配置则默认加载。
+              </div>
+              <i class="el-icon-info label-tip-icon"></i>
+            </el-tooltip>
+          </span>
+          <a
+            href="javascript:void(0);"
+            class="a-link link-oneLind"
+            @click="
+              editEventHandler('dynamicSchemaLoadScript', tableConfigParams)
+            "
+          >
+            <span>{{ optionModel.dynamicSchemaLoadScript }}</span>
+            <i class="el-icon-edit"></i>
+          </a>
+        </el-form-item>
+      </div>
+    </div>
+    <el-form-item v-if="optionModel.dynamicSchemaSourceType !== 'none'">
+      <span slot="label">
+        生成模式
+        <el-tooltip effect="light" placement="top">
+          <div slot="content" class="field-tip-content">
+            对<strong>生效的动态字段</strong>与静态字段的合并方式：<br />
+            追加 — 静态字段 + 动态字段；替换 — 仅动态字段；锚点插入 —
+            插到占位行位置。
+          </div>
+          <i class="el-icon-info label-tip-icon"></i>
+        </el-tooltip>
+      </span>
+      <el-select v-model="optionModel.dynamicSchemaMode" style="width: 100%">
+        <el-option label="追加到静态字段" value="append"></el-option>
+        <el-option label="替换静态字段" value="replace"></el-option>
+        <el-option label="锚点插入" value="anchor"></el-option>
+      </el-select>
+    </el-form-item>
+    <template v-if="optionModel.dynamicSchemaSourceType !== 'none'">
+      <template v-if="optionModel.dynamicSchemaMode === 'anchor'">
+        <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"
+            style="width: 100%"
+            placeholder="选择设计期的占位行"
+          >
+            <el-option
+              v-for="r in rowOptions"
+              :key="r.value"
+              :label="r.label"
+              :value="r.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="插入位置">
+          <el-select
+            v-model="optionModel.dynamicSchemaAnchorPosition"
+            style="width: 100%"
+          >
+            <el-option label="替换占位行" value="replace"></el-option>
+            <el-option label="之前" value="before"></el-option>
+            <el-option label="之后" value="after"></el-option>
+          </el-select>
+        </el-form-item>
+        <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>
+        </el-form-item>
+      </template>
+      <el-form-item
+        v-if="
+          optionModel.dynamicSchemaMode !== 'anchor' ||
+          !optionModel.dynamicSchemaInheritLayout
+        "
+        label="每行列数"
+      >
+        <el-input-number
+          v-model="optionModel.dynamicSchemaColumns"
+          :min="1"
+          :max="12"
+          controls-position="right"
+          style="width: 100%"
+        ></el-input-number>
+      </el-form-item>
+    </template>
+  </div>
+</template>
+
+<script>
+import i18n from "../../../../../../components/xform/utils/i18n";
+import eventMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
+
+export default {
+  name: "table-dynamicField-editor",
+  mixins: [i18n, eventMixin],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+  data() {
+    return {
+      tableConfigParams: ["dataId", "formCode"],
+      defaultEventParams: ["dataId", "formCode"],
+    };
+  },
+  created() {
+    if (this.optionModel.dynamicSchemaSourceType === undefined) {
+      const legacyEnabled = this.optionModel.dynamicSchemaEnabled;
+      this.$set(
+        this.optionModel,
+        "dynamicSchemaSourceType",
+        legacyEnabled ? "api" : "none"
+      );
+    }
+    if (this.optionModel.dynamicSchemaScript === undefined) {
+      this.$set(this.optionModel, "dynamicSchemaScript", null);
+    }
+    if (this.optionModel.dynamicSchemaLoadScript === undefined) {
+      this.$set(this.optionModel, "dynamicSchemaLoadScript", null);
+    }
+  },
+  computed: {
+    dynamicSchemaConvertDisplay() {
+      return this.optionModel.dynamicSchemaConvert || "";
+    },
+    rowOptions() {
+      const rows = (this.selectedWidget && this.selectedWidget.rows) || [];
+      return rows.map((row, idx) => {
+        const fields = [];
+        (row.cols || []).forEach((cell) => {
+          this.collectFields(cell.widgetList || [], fields);
+        });
+        const names = fields
+          .map((w) => w.options.label || w.options.name)
+          .filter((n) => !!n);
+        const preview = names.length ? names.join("、") : "空行";
+        return { label: "第" + (idx + 1) + "行：" + preview, value: row.id };
+      });
+    },
+  },
+  methods: {
+    editDynamicSchemaConvert() {
+      this.editEventHandler("dynamicSchemaConvert", ["res"]);
+    },
+    collectFields(list, out) {
+      (list || []).forEach((w) => {
+        if (!w) return;
+        if (w.category === "container") {
+          if (Array.isArray(w.rows)) {
+            w.rows.forEach((row) =>
+              this.collectFields((row && row.cols) || [], out)
+            );
+          }
+          ["cols", "tabs", "widgetList", "panes", "buttonWidgetList"].forEach(
+            (k) => {
+              if (Array.isArray(w[k])) this.collectFields(w[k], out);
+            }
+          );
+        } else if (w.formItemFlag) {
+          out.push(w);
+        }
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.data-table-editor-subsection {
+  margin: 0 0 4px 8px;
+  padding-left: 12px;
+  border-left: 2px solid #ebeef5;
+}
+
+.form-section-label {
+  font-size: 13px;
+  font-weight: 500;
+  color: #303133;
+  line-height: 22px;
+  margin-bottom: 8px;
+}
+
+.label-tip-icon {
+  margin-left: 4px;
+  color: #909399;
+  cursor: pointer;
+  font-size: 14px;
+  vertical-align: middle;
+}
+
+.field-tip-content {
+  line-height: 1.4;
+  max-width: 320px;
+}
+
+.dynamic-column-block {
+  margin-bottom: 12px;
+}
+
+.dynamic-column-block .data-table-editor-subsection {
+  margin-top: 0;
+}
+</style>

package/src/components/xform/form-designer/setting-panel/property-editor/container-tree/tree-customClass-editor.vue

@@ -6,17 +6,46 @@
         <el-option v-for="(item, idx) in cssClassList" :key="idx" :label="item" :value="item"></el-option>
       </el-select>
     </el-form-item>
+    <el-form-item label="禁用本地筛选">
+      <el-switch v-model="optionModel.disLocalFilter"></el-switch>
+    </el-form-item>
+    <el-form-item label="筛选类型">
+      <el-select v-model="optionModel.treeFilterType">
+        <el-option :value="0" label="文本"></el-option>
+        <el-option :value="1" label="日期"></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="筛选图标点击事件">
+      <a
+        href="javascript:void(0);"
+        class="a-link link-oneLind"
+        @click="editEventHandler('onFilterIconClick', ['dataId', 'formCode','keyword'])"
+      >
+        <span>{{ optionModel.onFilterIconClick }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+    <el-form-item label="筛选内容值变化事件">
+      <a
+        href="javascript:void(0);"
+        class="a-link link-oneLind"
+        @click="editEventHandler('onFilterTextChange', ['dataId', 'formCode','keyword'])"
+      >
+        <span>{{ optionModel.onFilterTextChange }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
   </div>
 </template>
 <script>
 import i18n from "../../../../../../components/xform/utils/i18n"
 import {deepClone} from "../../../../../../components/xform/utils/util";
-
+import eventMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
 
 export default {
   name: "tree-customClass-editor",
   componentName: "PropertyEditor",
-  mixins: [i18n],
+  mixins: [i18n,eventMixin],
   props: {
     designer: Object,
     selectedWidget: Object,

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

@@ -0,0 +1,36 @@
+<template>
+  <div>
+    <el-form-item label="复制数据处理" label-width="150px">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('copyDataHandle', copyDataHandleParams)">
+        <span>{{ optionModel.copyDataHandle }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+  </div>
+</template>
+
+<script>
+  import i18n from "../../../../../components/xform/utils/i18n"
+  import eventMixin
+    from "../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
+
+  export default {
+    name: "copyButton-editor",
+    mixins: [i18n,eventMixin],
+    props: {
+      designer: Object,
+      selectedWidget: Object,
+      optionModel: Object,
+    },
+    data(){
+      return {
+        copyDataHandleParams: ["dataId", "formCode", "copyData", "done"]
+      }
+    },
+  }
+</script>
+
+<style scoped>
+
+</style>

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

@@ -0,0 +1,32 @@
+<template>
+  <div>
+    <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.dataTableName" clearable></el-input>
+    </el-form-item>
+    <el-form-item label="类型">
+      <el-input v-model="optionModel.attachmentType" clearable></el-input>
+    </el-form-item>
+    <el-form-item label="文件名">
+      <el-input v-model="optionModel.fileName" clearable></el-input>
+    </el-form-item>
+  </div>
+</template>
+
+<script>
+import i18n from "../../../../../components/xform/utils/i18n";
+
+export default {
+  name: "downloadButtonFlag-editor",
+  mixins: [i18n],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+};
+</script>
+
+<style scoped></style>