cloud-web-corejs 1.0.54-dev.801 → 1.0.54-dev.803

package/src/components/xform/form-designer/setting-panel/property-editor/field-time-range/time-range-defaultValue-editor.vue

@@ -1,26 +1,43 @@
 <template>
-  <el-form-item :label="i18nt('designer.setting.defaultValue')" class="form-item-label-top">
-    <el-time-picker v-model="optionModel.defaultValue" is-range @change="emitDefaultValueChange"
-                    :format="optionModel.format" value-format="HH:mm:ss" style="width: 100%">
-    </el-time-picker>
+  <el-form-item
+    :label="i18nt('designer.setting.defaultValue')"
+    class="form-item-label-top"
+  >
+    <relative-default-block
+      :option-model="optionModel"
+      widget-type="time-range"
+      @change="emitDefaultValueChange"
+    >
+      <el-time-picker
+        v-model="optionModel.defaultValue"
+        is-range
+        @change="emitDefaultValueChange"
+        :format="optionModel.format"
+        value-format="HH:mm:ss"
+        style="width: 100%"
+      >
+      </el-time-picker>
+    </relative-default-block>
   </el-form-item>
 </template>
 
 <script>
-  import i18n from "../../../../../../components/xform/utils/i18n"
-  import propertyMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/propertyMixin"
+import i18n from "../../../../../../components/xform/utils/i18n";
+import propertyMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/propertyMixin";
+import RelativeDefaultBlock from "../../../../../../components/xform/form-designer/setting-panel/property-editor/relative-default-block";
 
-  export default {
-    name: "time-range-defaultValue-editor",
-    mixins: [i18n, propertyMixin],
-    props: {
-      designer: Object,
-      selectedWidget: Object,
-      optionModel: Object,
-    },
-  }
+export default {
+  name: "time-range-defaultValue-editor",
+  mixins: [i18n, propertyMixin],
+  components: {
+    RelativeDefaultBlock,
+  },
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+};
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

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

@@ -0,0 +1,39 @@
+<template>
+  <!-- 只在数据表格查询区显示：这个开关在别处（主表单字段、表格列）没有任何作用 -->
+  <el-form-item v-if="showEditor" :label="i18nt('designer.setting.fixedQuery')">
+    <el-tooltip
+      :enterable="false"
+      effect="dark"
+      :content="i18nt('designer.setting.fixedQueryHelp')"
+      placement="top"
+      popper-class="tooltip-skin"
+    >
+      <el-switch v-model="optionModel.fixedQuery"></el-switch>
+    </el-tooltip>
+  </el-form-item>
+</template>
+
+<script>
+import i18n from "../../../../../components/xform/utils/i18n";
+import { isQueryAreaWidget } from "../../../../../components/xform/utils/fixedQueryUtil";
+
+export default {
+  name: "fixedQuery-editor",
+  mixins: [i18n],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+  computed: {
+    showEditor() {
+      return isQueryAreaWidget(
+        this.designer && this.designer.widgetList,
+        this.selectedWidget
+      );
+    },
+  },
+};
+</script>
+
+<style scoped></style>

package/src/components/xform/form-designer/setting-panel/property-editor/relative-default-block.vue

@@ -0,0 +1,369 @@
+<template>
+  <div class="relative-default-block">
+    <div class="relative-default-block__head">
+      <el-checkbox v-model="relativeMode">相对当前</el-checkbox>
+      <el-button
+        v-if="relativeMode"
+        type="text"
+        size="mini"
+        style="margin-left: 10px; padding: 0"
+        @click="openDialog"
+        >配置</el-button
+      >
+    </div>
+    <!-- 未勾选时由各组件自己的固定值控件占位 -->
+    <slot v-if="!relativeMode"></slot>
+    <template v-else>
+      <div class="relative-default-block__summary">{{ ruleText }}</div>
+      <div class="relative-default-block__summary">取值：{{ valueText }}</div>
+    </template>
+
+    <el-dialog
+      v-if="dialogVisible"
+      title="相对默认值"
+      :visible.sync="dialogVisible"
+      width="520px"
+      append-to-body
+      :close-on-click-modal="false"
+      :destroy-on-close="true"
+    >
+      <!-- 宽度打在自己的 span 上：全局 body .el-input{width:148px !important}
+           会撑破 el-select，箭头被裁掉、两个下拉也会贴在一起 -->
+      <div v-for="part in parts" :key="part.key" class="relative-default-part">
+        <div v-if="part.label" class="relative-default-part__title">
+          {{ part.label }}
+        </div>
+        <div class="relative-default-part__row">
+          <span class="relative-default-part__prefix">当前</span>
+          <span class="relative-default-part__control relative-default-part__offset">
+            <el-input
+              :value="part.item.offsetText"
+              size="mini"
+              placeholder="0"
+              @input="handleOffsetInput(part.item, $event)"
+            ></el-input>
+          </span>
+          <span class="relative-default-part__control relative-default-part__unit">
+            <el-select v-model="part.item.unit" size="mini">
+              <el-option
+                v-for="item in unitOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+          </span>
+          <span class="relative-default-part__control relative-default-part__align">
+            <el-select v-model="part.item.align" size="mini">
+              <el-option
+                v-for="item in alignOptionsOf(part.item)"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+          </span>
+        </div>
+        <div class="relative-default-part__preview">
+          取值：{{ previewOf(part) }}
+        </div>
+      </div>
+      <div class="relative-default-tip">
+        对齐指先按偏移量平移，再落到该单位的起点或终点，如「1月前·月初」为上月1号。
+      </div>
+      <span slot="footer">
+        <el-button size="mini" @click="dialogVisible = false">取消</el-button>
+        <el-button size="mini" type="primary" @click="confirmDialog"
+          >确定</el-button
+        >
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  DATE_UNITS,
+  DEFAULT_VALUE_TYPE_RELATIVE,
+  KIND_TIME,
+  TIME_UNITS,
+  describeRelativeDescriptor,
+  getRelativeKind,
+  getUnitLabel,
+  hasTimePart,
+  isRangeWidgetType,
+  isRelativeDefaultType,
+  normalizeRelativeDescriptor,
+  normalizeRelativeRangeDescriptor,
+  resolveDefaultValueFromOptions,
+  resolveRelativeValue,
+  toPreviewText,
+} from "../../../../../components/xform/form-designer/form-widget/field-widget/mixins/relativeDateUtil";
+
+/**
+ * 日期/时间组件「相对默认值」的配置入口：属性面板上只占一行（勾选 + 配置按钮 + 摘要），
+ * 具体的偏移量/单位/对齐放进弹框里横排——属性面板只有 200px 宽，塞不下三个控件。
+ *
+ * 弹框里编辑的是本地草稿，点确定才写回 options：一来老表单不会被打开即改脏，
+ * 二来避免边输入边回写触发的重渲染回环。
+ */
+export default {
+  name: "relative-default-block",
+  props: {
+    optionModel: {
+      type: Object,
+      required: true,
+    },
+    widgetType: {
+      type: String,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      draft: null,
+    };
+  },
+  computed: {
+    kind() {
+      return getRelativeKind(this.widgetType);
+    },
+    isRange() {
+      return isRangeWidgetType(this.widgetType);
+    },
+    relativeMode: {
+      get() {
+        return isRelativeDefaultType(this.optionModel.defaultValueType);
+      },
+      set(checked) {
+        /* 老表单的 options 没有这些属性，一律 $set 保证响应式 */
+        this.$set(
+          this.optionModel,
+          "defaultValueType",
+          checked ? DEFAULT_VALUE_TYPE_RELATIVE : ""
+        );
+        if (checked) {
+          //相对模式下静态默认值不再参与取值，清掉避免两处配置打架
+          this.$set(this.optionModel, "defaultValue", null);
+        }
+        this.$emit("change");
+      },
+    },
+    descriptor() {
+      return this.isRange
+        ? normalizeRelativeRangeDescriptor(
+            this.optionModel.defaultValueRelative,
+            this.kind
+          )
+        : normalizeRelativeDescriptor(
+            this.optionModel.defaultValueRelative,
+            this.kind
+          );
+    },
+    ruleText() {
+      if (!this.isRange) {
+        return describeRelativeDescriptor(this.descriptor, this.kind);
+      }
+      return `${describeRelativeDescriptor(
+        this.descriptor.start,
+        this.kind
+      )} ~ ${describeRelativeDescriptor(this.descriptor.end, this.kind)}`;
+    },
+    valueText() {
+      return toPreviewText(
+        resolveDefaultValueFromOptions(this.optionModel, this.widgetType)
+      );
+    },
+    /* 时分秒单位只在时间类组件、或带时分秒的日期组件上给出 */
+    unitOptions() {
+      let units = [];
+      if (this.kind === KIND_TIME) {
+        units = [...TIME_UNITS];
+      } else if (
+        hasTimePart(this.optionModel.type, this.optionModel.valueFormat)
+      ) {
+        units = [...DATE_UNITS, ...TIME_UNITS];
+      } else {
+        units = [...DATE_UNITS];
+      }
+      return units.map((item) => ({ value: item, label: getUnitLabel(item) }));
+    },
+    parts() {
+      if (!this.draft) {
+        return [];
+      }
+      if (!this.isRange) {
+        return [
+          {
+            key: "single",
+            label: "",
+            item: this.draft,
+            defaultTime: this.getDefaultTimeAt(0),
+          },
+        ];
+      }
+      return [
+        {
+          key: "start",
+          label: "起始",
+          item: this.draft.start,
+          defaultTime: this.getDefaultTimeAt(0),
+        },
+        {
+          key: "end",
+          label: "截止",
+          item: this.draft.end,
+          defaultTime: this.getDefaultTimeAt(1),
+        },
+      ];
+    },
+  },
+  methods: {
+    getDefaultTimeAt(index) {
+      let defaultTime = this.optionModel.defaultTime;
+      return Array.isArray(defaultTime) ? defaultTime[index] || "" : "";
+    },
+    /* 草稿里额外挂一个 offsetText，输入过程中允许出现 "-" 这类中间态 */
+    toDraftItem(source) {
+      let item = normalizeRelativeDescriptor(source, this.kind);
+      return { ...item, offsetText: String(item.offset) };
+    },
+    openDialog() {
+      this.draft = this.isRange
+        ? {
+            start: this.toDraftItem(this.descriptor.start),
+            end: this.toDraftItem(this.descriptor.end),
+          }
+        : this.toDraftItem(this.descriptor);
+      this.dialogVisible = true;
+    },
+    /* 只留数字和一个前导负号 */
+    handleOffsetInput(item, text) {
+      let offsetText = String(text)
+        .replace(/[^\d-]/g, "")
+        .replace(/(?!^)-/g, "");
+      item.offsetText = offsetText;
+      let parsed = parseInt(offsetText, 10);
+      item.offset = Number.isFinite(parsed) ? parsed : 0;
+    },
+    alignOptionsOf(item) {
+      let unitLabel = getUnitLabel(item.unit);
+      return [
+        { value: "none", label: "不对齐" },
+        { value: "start", label: `对齐到${unitLabel}初` },
+        { value: "end", label: `对齐到${unitLabel}末` },
+      ];
+    },
+    previewOf(part) {
+      try {
+        return toPreviewText(
+          resolveRelativeValue(part.item, {
+            kind: this.kind,
+            type: this.optionModel.type,
+            valueFormat: this.optionModel.valueFormat,
+            defaultTime: part.defaultTime,
+          })
+        );
+      } catch (error) {
+        return "";
+      }
+    },
+    stripDraftItem(item) {
+      return { offset: item.offset, unit: item.unit, align: item.align };
+    },
+    confirmDialog() {
+      let value = this.isRange
+        ? {
+            start: this.stripDraftItem(this.draft.start),
+            end: this.stripDraftItem(this.draft.end),
+          }
+        : this.stripDraftItem(this.draft);
+      this.$set(this.optionModel, "defaultValueRelative", value);
+      this.$set(
+        this.optionModel,
+        "defaultValueType",
+        DEFAULT_VALUE_TYPE_RELATIVE
+      );
+      this.dialogVisible = false;
+      this.$emit("change");
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.relative-default-block__head {
+  display: flex;
+  align-items: center;
+}
+
+.relative-default-block__config {
+  margin-left: 8px;
+  padding: 0;
+}
+
+.relative-default-block__summary {
+  color: #909399;
+  line-height: 18px;
+  word-break: break-all;
+}
+
+.relative-default-part + .relative-default-part {
+  margin-top: 16px;
+}
+
+.relative-default-part__title {
+  margin-bottom: 6px;
+  color: #606266;
+}
+
+.relative-default-part__row {
+  display: flex;
+  flex-wrap: nowrap;
+  align-items: center;
+  gap: 10px;
+}
+
+.relative-default-part__prefix {
+  flex: none;
+  color: #606266;
+}
+
+.relative-default-part__control {
+  flex: none;
+  display: inline-block;
+}
+
+.relative-default-part__offset {
+  width: 80px;
+}
+
+.relative-default-part__unit {
+  width: 100px;
+}
+
+.relative-default-part__align {
+  width: 158px;
+}
+
+/* 压过 body .el-input{width:148px !important}，让框体和内层同宽，箭头才能露出来 */
+.relative-default-part__control ::v-deep .el-select,
+.relative-default-part__control ::v-deep .el-input,
+.relative-default-part__control ::v-deep .el-input__inner {
+  width: 100% !important;
+}
+
+.relative-default-part__preview {
+  margin-top: 2px;
+  color: #909399;
+  line-height: 18px;
+  word-break: break-all;
+}
+
+.relative-default-tip {
+  margin-top: 12px;
+  color: #909399;
+  line-height: 18px;
+}
+</style>

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

@@ -35,6 +35,7 @@ const COMMON_PROPERTIES = {
   readonly: "readonly-editor",
   disabled: "disabled-editor",
   hidden: "hidden-editor",
+  fixedQuery: "fixedQuery-editor",
   clearable: "clearable-editor",
   editable: "editable-editor",
   showPassword: "showPassword-editor",

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

@@ -903,6 +903,16 @@ export const defaultLabelIconConfig = {
   labelTooltip: null,
 };
 
+/**
+ * 「固定查询条件」开关。只在数据表格查询区生效（属性编辑器也只在查询区显示）：
+ * 打开后该字段的值不再被刷新按钮、「查询条件设置」的还原/确定清空，
+ * 且在设置弹框里只读（不能拖顺序、不能切常用、不能改默认值）。
+ * 值本身仍由脚本/树点选等业务通道注入，本开关只管「不被清掉」。
+ */
+export const defaultFixedQueryConfig = {
+  fixedQuery: !1,
+};
+
 const vabsearchConfig = {
   name: "",
   keyNameEnabled: !1,
@@ -919,6 +929,7 @@ const vabsearchConfig = {
   labelWidth: null,
   labelHidden: !1,
   ...defaultLabelIconConfig,
+  ...defaultFixedQueryConfig,
   readonly: true,
   /*formCode: null,
   formName: null,
@@ -969,6 +980,7 @@ const autocompleteConfig = {
   labelWidth: null,
   labelHidden: !1,
   ...defaultLabelIconConfig,
+  ...defaultFixedQueryConfig,
   readonly: false,
   size: "",
   widgetWidth: null,
@@ -1023,6 +1035,7 @@ const projectTagConfig = {
   labelWidth: null,
   labelHidden: !1,
   ...defaultLabelIconConfig,
+  ...defaultFixedQueryConfig,
   onCreated: "if(dataId)this.loadDataDefaultHandle();",
   onMounted: "",
   onClick: "",
@@ -1096,6 +1109,7 @@ export const basicFields = [
       readonly: !1,
       disabled: !1,
       hidden: !1,
+      ...defaultFixedQueryConfig,
       clearable: !0,
       showPassword: !1,
       required: !1,
@@ -1159,6 +1173,7 @@ export const basicFields = [
       readonly: !1,
       disabled: !1,
       hidden: !1,
+      ...defaultFixedQueryConfig,
       clearable: !0,
       showPassword: !1,
       required: !1,
@@ -1210,6 +1225,7 @@ export const basicFields = [
       readonly: !1,
       disabled: !1,
       hidden: !1,
+      ...defaultFixedQueryConfig,
       required: !1,
       requiredHint: "",
       validation: "",
@@ -1316,6 +1332,7 @@ export const basicFields = [
       labelHidden: !1,
       disabled: !1,
       hidden: !1,
+      ...defaultFixedQueryConfig,
       required: !1,
       requiredHint: "",
       validation: "",
@@ -1374,6 +1391,7 @@ export const basicFields = [
       labelHidden: !1,
       disabled: !1,
       hidden: !1,
+      ...defaultFixedQueryConfig,
       dsEnabled: !1,
       dsName: "",
       labelKey: "label",
@@ -1446,6 +1464,7 @@ export const basicFields = [
       labelHidden: !1,
       disabled: !1,
       hidden: !1,
+      ...defaultFixedQueryConfig,
       dsEnabled: !1,
       dsName: "",
       labelKey: "label",
@@ -1518,6 +1537,7 @@ export const basicFields = [
       labelHidden: !1,
       disabled: !1,
       hidden: !1,
+      ...defaultFixedQueryConfig,
       clearable: !0,
       filterable: !1,
       allowCreate: !1,
@@ -1607,6 +1627,7 @@ export const basicFields = [
       readonly: !1,
       disabled: !1,
       hidden: !1,
+      ...defaultFixedQueryConfig,
       clearable: !0,
       required: !1,
       requiredHint: "",
@@ -1652,7 +1673,8 @@ export const basicFields = [
       formField: "",
       labelAlign: "",
       defaultValue: null,
-      defaultValueType: "", //默认值类型：空为固定时间，now为当前时间
+      defaultValueType: "", //默认值类型：空为固定时间，now为当前时间，relative为相对当前
+      defaultValueRelative: null, //相对默认值：{offset,unit,align}，defaultValueType=relative时生效
       placeholder: "",
       columnWidth: "200px",
       size: "",
@@ -1661,6 +1683,7 @@ export const basicFields = [
       readonly: !1,
       disabled: !1,
       hidden: !1,
+      ...defaultFixedQueryConfig,
       clearable: !0,
       editable: !0,
       format: "HH:mm:ss",
@@ -1709,6 +1732,8 @@ export const basicFields = [
       formField: "",
       labelAlign: "",
       defaultValue: null,
+      defaultValueType: "", //默认值类型：空为固定区间，relative为相对当前
+      defaultValueRelative: null, //相对默认值：{start:{offset,unit,align},end:{...}}
       startPlaceholder: "",
       endPlaceholder: "",
       columnWidth: "200px",
@@ -1718,6 +1743,7 @@ export const basicFields = [
       readonly: !1,
       disabled: !1,
       hidden: !1,
+      ...defaultFixedQueryConfig,
       clearable: !0,
       editable: !0,
       format: "HH:mm:ss",
@@ -1763,7 +1789,8 @@ export const basicFields = [
       labelAlign: "",
       type: "date",
       defaultValue: null,
-      defaultValueType: "", //默认值类型：空为固定日期，now为当前时间
+      defaultValueType: "", //默认值类型：空为固定日期，now为当前时间，relative为相对当前
+      defaultValueRelative: null, //相对默认值：{offset,unit,align}，defaultValueType=relative时生效
       placeholder: "",
       columnWidth: "200px",
       size: "",
@@ -1772,6 +1799,7 @@ export const basicFields = [
       readonly: !1,
       disabled: !1,
       hidden: !1,
+      ...defaultFixedQueryConfig,
       clearable: !0,
       editable: !0,
       format: "yyyy-MM-dd",
@@ -1825,6 +1853,8 @@ export const basicFields = [
       labelAlign: "",
       type: "daterange",
       defaultValue: null,
+      defaultValueType: "", //默认值类型：空为固定区间，relative为相对当前
+      defaultValueRelative: null, //相对默认值：{start:{offset,unit,align},end:{...}}
       startPlaceholder: "",
       endPlaceholder: "",
       columnWidth: "200px",
@@ -1834,6 +1864,7 @@ export const basicFields = [
       readonly: !1,
       disabled: !1,
       hidden: !1,
+      ...defaultFixedQueryConfig,
       clearable: !0,
       editable: !0,
       format: "yyyy-MM-dd",
@@ -3835,6 +3866,7 @@ export const advancedFields = [
       columnWidth: "200px",
       disabled: false,
       hidden: false,
+      ...defaultFixedQueryConfig,
       clearable: true,
       filterable: false,
       multiple: false,