cloud-web-corejs 1.1.0-dev.19 → 1.1.0-dev.21

package/src/views/user/home/default.vue

@@ -737,15 +737,18 @@ body #app .index-home {
       .time {
         color: #b9b9b9;
         font-size: 12px;
-        right: 12px;
+        right: 12px;
+        background: #FFF;
+        padding-left: 8px;
       }
 
       &:hover {
         color: $baseColor;
-        background-color: transparentize($baseColor, 0.97);
+        background-color: #F8FAFC;
 
         .time {
-          color: $baseColor;
+          color: $baseColor;
+          background-color: #F8FAFC;
         }
       }
 

package/src/views/user/home/wjl/content.vue

@@ -483,7 +483,8 @@ export default {
           let userInfo = res.objx;
           this.headPhotoUrl = userInfo.headPhotoUrl
             ? userInfo.headPhotoUrl
-            : (require("@/resources/images/default-header.png").default || require("@/resources/images/default-header.png"));
+            : require("@/resources/images/default-header.png").default ||
+              require("@/resources/images/default-header.png");
 
           this.userInfo = userInfo;
           this.initServiceProviderRole();
@@ -709,7 +710,7 @@ export default {
       this.showDealDialog = true;
     },
     openOrderView(row) {
-      let dataId = row.id;
+      let dataId = row.order_id;
       if (dataId == null) {
         this.$message.warning(this.$t1("未找到工单"));
         return;

package/src/components/xform/form-render/container-item/dynamicFieldEngine.js

@@ -1,285 +0,0 @@
-/**
- * 动态字段规则引擎(纯逻辑，无 Vue 上下文)。
- *
- * 供「表单级动态规则(form-setting)」与「容器级动态字段(container-item)」共用：
- *  - 目标收集：字段 + 命名容器，建立 目标key -> { widget, refKey, isContainer } 映射与设计基线
- *  - 规则计算：本地条件/逻辑求值，输出每个目标的最终状态
- *  - 状态落地：通过 getWidgetRef 应用到运行时组件，无 ref 时回退改 schema
- */
-import {
-  traverseFieldWidgets,
-  traverseContainerWidgets,
-  traverseFieldWidgetsOfContainer,
-} from "../../../../components/xform/utils/util";
-
-// 布局内格容器，不作为可控目标
-const EXCLUDED_CONTAINER_TYPES = ["grid-col", "table-cell", "h5-table-cell"];
-
-export function getModelKey(w) {
-  return (w.options.keyNameEnabled && w.options.keyName) || w.options.name;
-}
-
-function addFieldTo(map, baseline, w) {
-  if (!w || !w.options) return;
-  const key = getModelKey(w);
-  if (!key) return;
-  map[key] = { widget: w, refKey: w.options.name, isContainer: false };
-  baseline[key] = {
-    visible: !w.options.hidden,
-    required: !!w.options.required,
-    readonly: !!w.options.readonly,
-    disabled: !!w.options.disabled,
-  };
-}
-
-function addContainerTo(map, baseline, w) {
-  if (!w || !w.options || !w.options.name) return;
-  if (EXCLUDED_CONTAINER_TYPES.indexOf(w.type) > -1) return;
-  const key = w.options.name;
-  if (map[key]) return;
-  map[key] = { widget: w, refKey: key, isContainer: true };
-  baseline[key] = { visible: !w.options.hidden };
-}
-
-// 整个表单范围：字段 + 命名容器(跳过弹窗/抽屉内部)
-export function buildFormTargetMap(widgetList) {
-  const map = {};
-  const baseline = {};
-  traverseFieldWidgets(widgetList || [], (w) => addFieldTo(map, baseline, w));
-  traverseContainerWidgets(
-    widgetList || [],
-    (w) => addContainerTo(map, baseline, w),
-    true
-  );
-  return { map, baseline };
-}
-
-// 单个容器范围：容器内字段 + 命名子容器
-export function buildContainerTargetMap(container) {
-  const map = {};
-  const baseline = {};
-  traverseFieldWidgetsOfContainer(container, (w) => addFieldTo(map, baseline, w));
-  collectNamedContainersInContainer(container).forEach((w) =>
-    addContainerTo(map, baseline, w)
-  );
-  return { map, baseline };
-}
-
-// 递归收集指定容器内「命名的子容器」
-export function collectNamedContainersInContainer(root) {
-  const out = [];
-  const walk = (w, isRoot) => {
-    if (!w || w.category !== "container") return;
-    if (
-      !isRoot
-      && w.options
-      && w.options.name
-      && EXCLUDED_CONTAINER_TYPES.indexOf(w.type) === -1
-    ) {
-      out.push(w);
-    }
-    if (Array.isArray(w.rows)) {
-      w.rows.forEach((row) => {
-        (row.cols || []).forEach((cell) => walk(cell, false));
-      });
-    }
-    ["cols", "tabs", "widgetList", "panes", "buttonWidgetList"].forEach((k) => {
-      if (Array.isArray(w[k])) w[k].forEach((c) => walk(c, false));
-    });
-  };
-  walk(root, true);
-  return out;
-}
-
-/* ------------------- 层级下拉选项(供设计器) ------------------- */
-// 构建带层级的目标候选(字段 + 容器)，按表单树 DFS 顺序输出，附带 depth。
-// 布局内格(grid-col/table-cell 等)不单独成节点，仅作为透明层向下展开。
-function makeTreeBuilder() {
-  const nodes = [];
-  const visitList = (list, depth) => {
-    (list || []).forEach((w) => visit(w, depth));
-  };
-  const visitChildren = (w, depth) => {
-    if (Array.isArray(w.rows)) {
-      w.rows.forEach((row) => visitList((row && row.cols) || [], depth));
-    }
-    ["cols", "tabs", "widgetList", "panes", "buttonWidgetList"].forEach((k) => {
-      if (Array.isArray(w[k])) visitList(w[k], depth);
-    });
-  };
-  const visit = (w, depth) => {
-    if (!w) return;
-    if (w.category === "container") {
-      // 布局内格：透明展开，深度不变
-      if (EXCLUDED_CONTAINER_TYPES.indexOf(w.type) > -1) {
-        visitChildren(w, depth);
-        return;
-      }
-      const name = w.options && w.options.name;
-      nodes.push({
-        value: name || "__c_" + w.id,
-        baseLabel: (w.options && (w.options.label || name)) || w.type,
-        depth,
-        isContainer: true,
-        hasName: !!name,
-        type: w.type,
-      });
-      visitChildren(w, depth + 1);
-    } else if (w.formItemFlag) {
-      const key = getModelKey(w);
-      if (!key) return;
-      nodes.push({
-        value: key,
-        baseLabel: (w.options.label || key) + " (" + key + ")",
-        depth,
-        isContainer: false,
-        hasName: true,
-        type: w.type,
-      });
-    }
-  };
-  return { nodes, visitList, visitChildren };
-}
-
-// 整个表单范围的层级候选
-export function buildWidgetTreeOptions(rootList) {
-  const b = makeTreeBuilder();
-  b.visitList(rootList || [], 0);
-  return b.nodes;
-}
-
-// 单个容器范围的层级候选(不含容器自身，从其子级开始)
-export function buildContainerTreeOptions(container) {
-  const b = makeTreeBuilder();
-  if (container) b.visitChildren(container, 0);
-  return b.nodes;
-}
-
-/* ------------------- 规则计算 ------------------- */
-export function computeLocalStates(rules, baseline, formModel) {
-  const list = rules || [];
-  const states = {};
-  const ensure = (key) => {
-    if (!states[key]) {
-      const base = baseline[key] || { visible: true };
-      states[key] = Object.assign({}, base);
-    }
-    return states[key];
-  };
-  // 先把所有规则涉及的目标置为基线，未命中时即还原
-  list.forEach((rule) => {
-    (rule.targets || []).forEach((t) => t.field && ensure(t.field));
-  });
-  list.forEach((rule) => {
-    if (!evalRule(rule, formModel)) return;
-    (rule.targets || []).forEach((t) => {
-      if (!t.field) return;
-      const s = ensure(t.field);
-      if (t.visible !== undefined && t.visible !== null) s.visible = !!t.visible;
-      if (t.required !== undefined && t.required !== null) {
-        s.required = !!t.required;
-      }
-      if (t.readonly !== undefined && t.readonly !== null) {
-        s.readonly = !!t.readonly;
-      }
-      if (t.disabled !== undefined && t.disabled !== null) {
-        s.disabled = !!t.disabled;
-      }
-    });
-  });
-  return states;
-}
-
-export function evalRule(rule, model) {
-  const conds = (rule && rule.conditions) || [];
-  if (!conds.length) return true;
-  if (rule.logic === "or") {
-    return conds.some((c) => evalCondition(c, model));
-  }
-  return conds.every((c) => evalCondition(c, model));
-}
-
-export function evalCondition(cond, model) {
-  if (!cond || !cond.field) return false;
-  const actual = model ? model[cond.field] : undefined;
-  const expected = cond.value;
-  const isEmpty = (v) =>
-    v === undefined
-    || v === null
-    || v === ""
-    || (Array.isArray(v) && v.length === 0);
-  const toList = (v) =>
-    String(v == null ? "" : v)
-      .split(",")
-      .map((s) => s.trim())
-      .filter((s) => s !== "");
-  switch (cond.operator) {
-    case "eq":
-      return String(actual) === String(expected);
-    case "ne":
-      return String(actual) !== String(expected);
-    case "gt":
-      return Number(actual) > Number(expected);
-    case "lt":
-      return Number(actual) < Number(expected);
-    case "ge":
-      return Number(actual) >= Number(expected);
-    case "le":
-      return Number(actual) <= Number(expected);
-    case "in":
-      return toList(expected).includes(String(actual));
-    case "nin":
-      return !toList(expected).includes(String(actual));
-    case "includes":
-      return Array.isArray(actual)
-        ? actual.map(String).includes(String(expected))
-        : String(actual == null ? "" : actual).indexOf(String(expected)) > -1;
-    case "empty":
-      return isEmpty(actual);
-    case "notEmpty":
-      return !isEmpty(actual);
-    default:
-      return false;
-  }
-}
-
-/* ------------------- 状态落地 ------------------- */
-// entry: { widget, refKey, isContainer }；getWidgetRef: (name) => 运行时组件ref
-export function applyTargetState(entry, state, getWidgetRef) {
-  if (!entry || !state) return;
-  const widget = entry.widget;
-  const isContainer = entry.isContainer;
-  const ref = getWidgetRef ? getWidgetRef(entry.refKey) : null;
-  const hasVisible = state.visible !== undefined && state.visible !== null;
-  if (ref) {
-    if (hasVisible && ref.setHidden) ref.setHidden(!state.visible);
-    if (isContainer) return;
-    if (state.required !== undefined && state.required !== null && ref.setRequired) {
-      ref.setRequired(!!state.required);
-    }
-    if (state.readonly !== undefined && state.readonly !== null && ref.setReadonly) {
-      ref.setReadonly(!!state.readonly);
-    }
-    if (state.disabled !== undefined && state.disabled !== null && ref.setDisabled) {
-      ref.setDisabled(!!state.disabled);
-    }
-    if (state.options !== undefined && state.options !== null && ref.setOptions) {
-      ref.setOptions(state.options);
-    }
-    if (state.value !== undefined && ref.setValue) {
-      ref.setValue(state.value);
-    }
-  } else {
-    if (hasVisible) widget.options.hidden = !state.visible;
-    if (isContainer) return;
-    if (state.required !== undefined && state.required !== null) {
-      widget.options.required = !!state.required;
-    }
-    if (state.readonly !== undefined && state.readonly !== null) {
-      widget.options.readonly = !!state.readonly;
-    }
-    if (state.disabled !== undefined && state.disabled !== null) {
-      widget.options.disabled = !!state.disabled;
-    }
-  }
-}

package/src/components/xform/form-render/formDynamicFieldMixin.js

@@ -1,131 +0,0 @@
-/**
- * 表单级「动态字段规则」运行时混入(挂载于 VFormRender 根组件)。
- *
- * 配置来源：formConfig.dynamicFieldEnabled / dynamicFieldSourceType / dynamicFieldRules /
- *           dynamicFieldScriptCode / dynamicFieldScriptParam(额外参数) / dynamicFieldTriggerFields
- * 作用范围：整个表单内任意字段 / 命名容器的 显隐/必填/只读/禁用/取值。
- *
- * 依赖根组件(indexMixin)已提供：formConfig、widgetList、formModel、getWidgetRef、formHttp。
- */
-import {
-  buildFormTargetMap,
-  computeLocalStates,
-  applyTargetState,
-} from "./container-item/dynamicFieldEngine";
-
-export default {
-  created() {
-    // 目标key -> { widget, refKey, isContainer }
-    this._fdfMap = {};
-    // 设计期基线，未命中规则时还原
-    this._fdfBaseline = {};
-    this._fdfWatcher = null;
-    this._fdfTimer = null;
-    this._fdfInited = false;
-  },
-  watch: {
-    showFormContent(val) {
-      // 表单内容渲染(字段ref注册)完成后再初始化
-      if (val && !this._fdfInited) {
-        this.$nextTick(() => this.initFormDynamicFields());
-      }
-    },
-  },
-  beforeDestroy() {
-    if (this._fdfWatcher) {
-      this._fdfWatcher();
-      this._fdfWatcher = null;
-    }
-    if (this._fdfTimer) {
-      clearTimeout(this._fdfTimer);
-      this._fdfTimer = null;
-    }
-  },
-  methods: {
-    initFormDynamicFields() {
-      const cfg = this.formConfig || {};
-      if (!cfg.dynamicFieldEnabled) return;
-      this._fdfInited = true;
-      const { map, baseline } = buildFormTargetMap(this.widgetList);
-      this._fdfMap = map;
-      this._fdfBaseline = baseline;
-      this.applyFormDynamicFields();
-      this.setupFormDynamicWatcher();
-    },
-
-    applyFormDynamicFields() {
-      const cfg = this.formConfig || {};
-      if (!cfg.dynamicFieldEnabled) return;
-      if (cfg.dynamicFieldSourceType === "script") {
-        this.applyFormScriptStates();
-      } else {
-        const states = computeLocalStates(
-          cfg.dynamicFieldRules || [],
-          this._fdfBaseline,
-          this.formModel
-        );
-        Object.keys(states).forEach((key) =>
-          this.applyFormFieldState(key, states[key])
-        );
-      }
-    },
-
-    applyFormFieldState(targetKey, state) {
-      const entry = this._fdfMap[targetKey];
-      if (!entry) return;
-      applyTargetState(entry, state, (name) => this.getWidgetRef(name));
-    },
-
-    setupFormDynamicWatcher() {
-      const cfg = this.formConfig || {};
-      if (cfg.dynamicFieldSourceType === "script") {
-        const triggers = cfg.dynamicFieldTriggerFields || [];
-        if (!triggers.length) return;
-        this._fdfWatcher = this.$watch(
-          () =>
-            triggers
-              .map((f) => this.formModel && this.formModel[f])
-              .join("\u0001"),
-          () => this.debouncedFormApply()
-        );
-      } else {
-        this._fdfWatcher = this.$watch(
-          () => this.formModel,
-          () => this.debouncedFormApply(),
-          { deep: true }
-        );
-      }
-    },
-
-    debouncedFormApply() {
-      if (this._fdfTimer) clearTimeout(this._fdfTimer);
-      this._fdfTimer = setTimeout(() => this.applyFormDynamicFields(), 120);
-    },
-
-    applyFormScriptStates() {
-      const cfg = this.formConfig || {};
-      if (!cfg.dynamicFieldScriptCode) return;
-      const extra = this.handleCustomEvent(cfg.dynamicFieldScriptParam) || {};
-      this.formHttp({
-        scriptCode: cfg.dynamicFieldScriptCode,
-        isLoading: false,
-        data: {
-          formData: this.formModel,
-          ...extra,
-        },
-        success: (res) => {
-          const result = (res && res.objx) || {};
-          const fieldStates = result.fieldStates || {};
-          Object.keys(this._fdfBaseline).forEach((key) => {
-            if (!fieldStates[key]) {
-              this.applyFormFieldState(key, this._fdfBaseline[key]);
-            }
-          });
-          Object.keys(fieldStates).forEach((key) =>
-            this.applyFormFieldState(key, fieldStates[key])
-          );
-        },
-      });
-    },
-  },
-};