yvan-ext 发版

dist/yvan-ext.js

@@ -1950,7 +1950,7 @@ define(['exports', 'axios', 'qs', 'lodash', 'jquery', 'recast', 'lay-excel', 'xl
     })));
     });
 
-    var moment = createCommonjsModule(function (module, exports) {
+    var moment$1 = createCommonjsModule(function (module, exports) {
     (function (global, factory) {
          module.exports = factory() ;
     }(commonjsGlobal, (function () {
@@ -12727,6 +12727,17 @@ define(['exports', 'axios', 'qs', 'lodash', 'jquery', 'recast', 'lay-excel', 'xl
                 if (item.conditionFieldXtype === 'combo') {
                     vj.fix = ['system.' + getDictFnName + '("' + item.conditionFieldDict + '")'];
                 }
+                if (item.conditionFieldXtype === 'datetimefield') {
+                    //@ts-ignore
+                    _.set(model.data.query, item.conditionFieldBind, moment(window.getServerTime()).format('YYYY-MM-DD HH:mm:ss'));
+                }
+                else if (item.conditionFieldXtype === 'datefield') {
+                    //@ts-ignore
+                    _.set(model.data.query, item.conditionFieldBind, moment(window.getServerTime()).format('YYYY-MM-DD'));
+                }
+                else {
+                    model.data.query[item.conditionFieldBind] = '';
+                }
             }
             else {
                 // 没有组件类型，是个空占位符
@@ -12736,7 +12747,6 @@ define(['exports', 'axios', 'qs', 'lodash', 'jquery', 'recast', 'lay-excel', 'xl
                 vj.bind = {
                     value: '{query.' + item.conditionFieldBind + '}'
                 };
-                model.data.query[item.conditionFieldBind] = '';
             }
             if (item.conditionFieldFlex) {
                 vj.flex = item.conditionFieldFlex;
@@ -15487,7 +15497,7 @@ define(['exports', 'axios', 'qs', 'lodash', 'jquery', 'recast', 'lay-excel', 'xl
     exports.lookupFn = lookupFn;
     exports.lookupScope = lookupScope;
     exports.mergeViewModel = mergeViewModel;
-    exports.moment = moment;
+    exports.moment = moment$1;
     exports.msg = msg$1;
     exports.msgError = msgError;
     exports.normId = normId;