cloud-web-corejs 1.0.54-dev.655 → 1.0.54-dev.657

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.655",
+  "version": "1.0.54-dev.657",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/xform/form-designer/form-widget/field-widget/date-range-widget.vue

@@ -73,8 +73,7 @@ export default {
       if (!this.fieldModel || !this.fieldModel.length) {
         return '';
       }
-      const values = this.transformUtcToLocalValue(this.fieldModel);
-      return values[0] + ' - ' + values[1];
+      return this.fieldModel[0] + ' - ' + this.fieldModel[1];
     },
   },
   beforeCreate() {

package/src/components/xform/form-designer/form-widget/field-widget/date-widget.vue

@@ -75,7 +75,7 @@ export default {
       if (!this.fieldModel) {
         return '';
       }
-      return this.transformUtcToLocalValue(this.fieldModel);
+      return this.fieldModel;
     },
   },
   watch: {

package/src/components/xform/form-designer/form-widget/field-widget/mixins/utc-transform-mixin.js

@@ -1,4 +1,5 @@
-const DATE_FORMAT_TYPES = ["d1", "d2", "d3", "d4", "d5"];
+import { deepClone, isNilOrEmptyStr } from "../../../../utils/util";
+import fieldMixin from "../fieldMixin";
 
 export default {
   methods: {
@@ -6,7 +7,7 @@ export default {
       return !!this.field?.options?.utcTransformEnabled;
     },
     transformUtcToLocalValue(value) {
-      if (value == null || value === "" || !this.isUtcTransformEnabled()) {
+      if (isNilOrEmptyStr(value) || !this.isUtcTransformEnabled()) {
         return value;
       }
       if (Array.isArray(value)) {
@@ -15,7 +16,7 @@ export default {
       return this.transformUtcToLocalSingle(value);
     },
     transformUtcToLocalSingle(value) {
-      if (value == null || value === "") {
+      if (isNilOrEmptyStr(value)) {
         return value;
       }
       const localValue = this.$utcToLocal(value);
@@ -35,8 +36,8 @@ export default {
       const valueFormat = options.valueFormat || "";
       if (widgetType === "date" || widgetType === "date-range") {
         if (
-          dateType === "datetime" ||
-          (valueFormat && /[HhmSs]/.test(valueFormat))
+          dateType === "datetime"
+          || (valueFormat && /[HhmSs]/.test(valueFormat))
         ) {
           return localValue;
         }
@@ -44,16 +45,31 @@ export default {
       }
       return localValue;
     },
-    transformUtcForDateFormat(cellValue, formatType) {
-      if (
-        !cellValue ||
-        !this.field?.options?.utcTransformEnabled ||
-        !formatType ||
-        !DATE_FORMAT_TYPES.includes(formatType)
-      ) {
-        return cellValue;
-      }
-      return this.$utcToLocal(cellValue);
+    getUtcTransformedFieldValue() {
+      if (!this.isUtcTransformEnabled()) {
+        return this.fieldModel;
+      }
+      return this.transformUtcToLocalValue(this.fieldModel);
+    },
+    initFieldModel(flag) {
+      fieldMixin.methods.initFieldModel.call(this, flag);
+      // flag=true 来自 initValueWatchEvent；行数据已是本地时间，再转换会重复偏移并触发 watch 死循环
+      if (this.designState || !this.isUtcTransformEnabled() || flag) {
+        return;
+      }
+      const transformed = this.getUtcTransformedFieldValue();
+      if (transformed === this.fieldModel) {
+        return;
+      }
+      const currentData =
+        this.tableParam && this.tableParam.row
+          ? this.tableParam.row
+          : this.formModel;
+      this.fieldModel = transformed;
+      this.oldFieldValue = deepClone(transformed);
+      if (transformed !== currentData[this.fieldKeyName]) {
+        this.syncUpdateFormModel(transformed);
+      }
     },
   },
 };

package/src/components/xform/form-designer/form-widget/field-widget/text-widget.vue

@@ -11,7 +11,9 @@
     :sub-form-col-index="subFormColIndex"
     :sub-form-row-id="subFormRowId"
   >
-    <span class="text-area" :class="field.options.colorClass">{{ showVaule }}</span>
+    <span class="text-area" :class="field.options.colorClass">{{
+      showVaule
+    }}</span>
   </form-item-wrapper>
 </template>
 
@@ -98,11 +100,9 @@ export default {
   methods: {
     formatterValue() {
       let formatType = this.field.options.formatType;
-      let cellValue = this.transformUtcForDateFormat(
-        this.fieldModel,
-        formatType
-      );
-      if (formatType === null || formatType === undefined) return cellValue;
+      let cellValue = this.fieldModel;
+      if (formatType === null || formatType === undefined || formatType === "")
+        return cellValue;
       if (formatType)
         switch (formatType) {
           case "render":

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

@@ -178,7 +178,7 @@
             <el-switch v-model="scope.row.filterable"></el-switch>
           </template>
         </el-table-column>
-        <el-table-column label="UTC时差" width="90" align="center">
+        <el-table-column label="UTC时差转换" width="90" align="center">
           <template #default="scope">
             <el-switch
               v-if="isUtcTransformColumn(scope.row)"

package/src/components/xform/form-render/container-item/data-table-mixin.js

@@ -939,7 +939,11 @@ modules = {
           if (t.formatS === "render") {
             let r = t.render ? new Function("params", "h", t.render) : null;
             col.slots.default = (params, h) => {
-              return r ? r.call(this, params, h) : "";
+              let result = r ? r.call(this, params, h) : "";
+              if (this.getColumnUtcTransformEnabled(col)) {
+                result = this.$utcToLocal(result);
+              }
+              return result;
             };
           } else if (widget) {
             // col.slots.default = columnSelectedWidget.id;

package/src/components/xform/utils/util.js

@@ -11,6 +11,10 @@ export function isNull(value) {
   return value === null || value === undefined;
 }
 
+export function isNilOrEmptyStr(value) {
+  return value === null || value === undefined || value === "";
+}
+
 export function isNotNull(value) {
   return value !== null && value !== undefined;
 }
@@ -34,7 +38,7 @@ export const createUUID = function () {
   return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx"
     .replace(/[xy]/g, function (c) {
       var r = (Math.random() * 16) | 0,
-        v = c == "x" ? r : (r & 0x3) | 0x8;
+        v = c === "x" ? r : (r & 0x3) | 0x8;
       return v.toString(16);
     })
     .replaceAll("-", "");
@@ -303,7 +307,7 @@ export function traverseAllWidgetsNew(widgetList, callback) {
   loopHandleWidget(widgetList, (widget, parentWidget) => {
     if (callback) {
       callback(widget, parentWidget);
-      if (widget.type == "data-table") {
+      if (widget.type === "data-table") {
         for (let item of widget.options.tableColumns) {
           columnLoopDo(item, parentWidget);
         }
@@ -707,7 +711,7 @@ export function getFieldWidgetById(widgetList, fieldId, staticWidgetsIncluded) {
   let handlerFn = (widget) => {
     if (widget.id === fieldId) {
       foundWidget = widget;
-    } else if (widget.type == "data-table") {
+    } else if (widget.type === "data-table") {
       for (let column of widget.options.tableColumns) {
         if (column?.widget?.id + "" === fieldId) {
           foundWidget = column.widget;
@@ -788,7 +792,7 @@ export function getQueryParam(variable) {
   let vars = query.split("&");
   for (let i = 0; i < vars.length; i++) {
     let pair = vars[i].split("=");
-    if (pair[0] == variable) {
+    if (pair[0] === variable) {
       return pair[1];
     }
   }
@@ -933,20 +937,6 @@ export function assembleAxiosConfig(arrayObj, DSV, VFR) {
     });
   }
   return result;
-
-  /* return !arrayObj || arrayObj.length <= 0 || (arrayObj.map((function(ai) {
-         "String" === ai.type ? result[ai.name] = String(ai.value)
-         : "Number" === ai.type ? result[ai
-             .name] = Number(ai.value)
-         : "Boolean" === ai.type ? "false" === ai.value
-           .toLowerCase() || "0" === ai.value ? result[ai.name] = !1 : "true" === ai.value.toLowerCase() ||
-           "1" === ai.value ? result[ai.name] = !0 : result[ai.name] = null
-         : "Variable" === ai.type ? (result[ai.name] = eval(ai.value))
-         : "FormData" === ai.type &&  (result[ai.name] = VFR.formData[ai.value])
-       })),
-       console.log("test DSV: ", DSV),
-       console.log("test VFR: ", VFR)),
-     result */
 }
 
 export function buildRequestConfig(dataSource, DSV, VFR, isSandbox) {
@@ -969,25 +959,9 @@ export function buildRequestConfig(dataSource, DSV, VFR, isSandbox) {
   let doms = VFR.getWidgetRef(DSV.widgetName);
   let extraAccessData = doms.extraAccessData || {};
 
-  /* if(dataSource.requestaccessType == "SQL"){
-    data.conditions = conditions;
-    Object.assign(data.conditions,extraAccessData);
-  }else{
-    data = conditions;
-    Object.assign(data,extraAccessData);
-  } */
-
   data.accessCode = requestAccess.accessCode;
   data.conditions = conditions;
   Object.assign(data.conditions, extraAccessData);
-  /*
-  if(requestAccess.accessReturnType === 0){
-    data.conditions = conditions;
-    Object.assign(data.conditions,extraAccessData);
-  }else{
-    data = conditions;
-    Object.assign(data,extraAccessData);
-  } */
 
   config.data = data;
   var chFn = new Function(
@@ -1024,13 +998,6 @@ export function _runDataSourceRequest() {
         t.errorHandlerCode
       ));
 
-    /*
-     axios.request(l).then(() => {
-     	r.call(null, s, o, i, n)
-     }).catch((error) => {
-     	d.call(null, error, o, i, a, n)
-     }) */
-
     return new Promise((resolve, reject) => {
       request({
         ...l,
@@ -1043,44 +1010,8 @@ export function _runDataSourceRequest() {
         },
       });
     });
-
-    /* return s = e.sent,
-    r = new Function("result","isSandbox","DSV","VFR",t.dataHandlerCode),
-    e.abrupt("return", r.call(null, s, o, i, n));
-
-    d = new Function("error","isSandbox","DSV","$message","VFR",t.errorHandlerCode),
-    d.call(null, null, o, i, a, n), */
   };
   return _runDataSourceRequestN.apply(this, arguments);
-  /* return _runDataSourceRequest = Object(D_dev2021_variant_form_pro_node_modules_babel_runtime_helpers_esm_asyncToGenerator__WEBPACK_IMPORTED_MODULE_0__["a"])(regeneratorRuntime.mark((function e(t, i, n, o, a) {
-      var l, s, r, d;
-      return regeneratorRuntime.wrap((function(e) {
-          while (1)
-              switch (e.prev = e.next) {
-              case 0:
-                  return e.prev = 0,
-                  l = buildRequestConfig(t, i, n, o),
-                  e.next = 4,
-                  axios__WEBPACK_IMPORTED_MODULE_11___default.a.request(l);
-              case 4:
-                  return s = e.sent,
-                  r = new Function("result","isSandbox","DSV","VFR",t.dataHandlerCode),
-                  e.abrupt("return", r.call(null, s, o, i, n));
-              case 9:
-                  e.prev = 9,
-                  e.t0 = e["catch"](0),
-                  d = new Function("error","isSandbox","DSV","$message","VFR",t.errorHandlerCode),
-                  d.call(null, e.t0, o, i, a, n),
-                  console.error(e.t0);
-              case 14:
-              case "end":
-                  return e.stop()
-              }
-      }
-      ), e, null, [[0, 9]])
-  }
-  ))),
-  _runDataSourceRequest.apply(this, arguments) */
 }
 
 export function getDSByName(e, t) {