From e5033f0b6c6ed82b249f2abb923c458d4190c684 Mon Sep 17 00:00:00 2001
From: X_Rian <904416525@qq.com>
Date: Tue, 18 Jun 2024 21:37:39 +0800
Subject: [PATCH] =?UTF-8?q?flx=EF=BC=9A=E4=BF=AE=E5=A4=8D=E8=BD=A6?=
 =?UTF-8?q?=E8=BE=86=E6=90=9C=E7=B4=A2=E8=BE=93=E5=85=A5=E6=A1=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/form/SelectPlus.vue                |  2 +-
 .../dist/cache/.vite/deps/_metadata.json      | 17 ++++--
 unpackage/dist/dev/app-plus/app-service.js    | 53 +++++++++++++------
 unpackage/dist/dev/app-plus/app.css           | 10 ++--
 .../pages/instance/instancePreview.css        | 10 ++--
 .../app-plus/pages/submit/InitiateProcess.css | 10 ++--
 6 files changed, 68 insertions(+), 34 deletions(-)

diff --git a/components/form/SelectPlus.vue b/components/form/SelectPlus.vue
index 0f229a6..30a562a 100644
--- a/components/form/SelectPlus.vue
+++ b/components/form/SelectPlus.vue
@@ -318,7 +318,7 @@
 <style scoped>
 	.search {
 		position: fixed;
-		bottom: 395rpx;
+		bottom: 465rpx;
 		left: 50%;
 		transform: translateX(-50%);
 		z-index: 9999;
diff --git a/unpackage/dist/cache/.vite/deps/_metadata.json b/unpackage/dist/cache/.vite/deps/_metadata.json
index a276489..aae68a3 100644
--- a/unpackage/dist/cache/.vite/deps/_metadata.json
+++ b/unpackage/dist/cache/.vite/deps/_metadata.json
@@ -1,8 +1,15 @@
 {
-  "hash": "6ab18a53",
-  "configHash": "87e744e2",
-  "lockfileHash": "2ddd0eeb",
-  "browserHash": "9b038b87",
-  "optimized": {},
+  "hash": "0f0fbf16",
+  "configHash": "5bd87843",
+  "lockfileHash": "33a33614",
+  "browserHash": "ba16bf7f",
+  "optimized": {
+    "@icon-park/vue-next": {
+      "src": "../../../../../node_modules/@icon-park/vue-next/es/index.js",
+      "file": "@icon-park_vue-next.js",
+      "fileHash": "9de4363e",
+      "needsInterop": false
+    }
+  },
   "chunks": {}
 }
\ No newline at end of file
diff --git a/unpackage/dist/dev/app-plus/app-service.js b/unpackage/dist/dev/app-plus/app-service.js
index 649d4cd..49b2b92 100644
--- a/unpackage/dist/dev/app-plus/app-service.js
+++ b/unpackage/dist/dev/app-plus/app-service.js
@@ -17392,6 +17392,7 @@ ${i3}
     },
     emits: ["update:modelValue"],
     setup(__props, { emit: __emit }) {
+      const uniDateTime = vue.ref();
       const props2 = __props;
       const _value = vue.computed({
         get() {
@@ -17440,6 +17441,15 @@ ${i3}
         }
       });
       const emits2 = __emit;
+      const timeVal = vue.ref();
+      const changeTime = (e2) => {
+        setTimeout(function() {
+          formatAppLog("log", "at components/form/DateTime.vue:103", timeVal.value, 222333);
+          if (!props2.modelValue) {
+            uniDateTime.value.displayValue = "";
+          }
+        }, 100);
+      };
       function timeChange(e2) {
         const indexs = e2.detail.value;
         if (Array.isArray(indexs)) {
@@ -17448,6 +17458,11 @@ ${i3}
           _value.value = `${range.value[0][indexs]}`;
         }
       }
+      vue.watch(() => props2.modelValue, (newVal) => {
+        timeVal.value = newVal;
+      }, {
+        deep: true
+      });
       return (_ctx, _cache) => {
         const _component_uni_datetime_picker = resolveEasycom(vue.resolveDynamicComponent("uni-datetime-picker"), __easycom_0$2);
         const _component_uni_icons = resolveEasycom(vue.resolveDynamicComponent("uni-icons"), __easycom_3$2);
@@ -17460,6 +17475,10 @@ ${i3}
             vue.Fragment,
             { key: 0 },
             [
+              vue.createCommentVNode(` <uni-datetime-picker v-if="format === 'yyyy-mm-dd hh:mm'" class="w-form-input" :border="false"\r
+				type="datetime" :clear-icon="false" v-model="_value" ref="uniDateTime" @change="changeTime"/>\r
+			<uni-datetime-picker v-else class="w-form-input" :border="false" type="date" ref="uniDateTime"\r
+				:clear-icon="false" v-model="_value" @change="changeTime"/> `),
               format.value === "yyyy-mm-dd hh:mm" ? (vue.openBlock(), vue.createBlock(_component_uni_datetime_picker, {
                 key: 0,
                 class: "w-form-input",
@@ -17467,15 +17486,21 @@ ${i3}
                 type: "datetime",
                 "clear-icon": false,
                 modelValue: _value.value,
-                "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => _value.value = $event)
+                "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => _value.value = $event),
+                ref_key: "uniDateTime",
+                ref: uniDateTime,
+                onChange: changeTime
               }, null, 8, ["modelValue"])) : (vue.openBlock(), vue.createBlock(_component_uni_datetime_picker, {
                 key: 1,
                 class: "w-form-input",
                 border: false,
                 type: "date",
+                ref_key: "uniDateTime",
+                ref: uniDateTime,
                 "clear-icon": false,
                 modelValue: _value.value,
-                "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => _value.value = $event)
+                "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => _value.value = $event),
+                onChange: changeTime
               }, null, 8, ["modelValue"])),
               vue.createVNode(_component_uni_icons, {
                 type: "right",
@@ -18298,6 +18323,7 @@ ${i3}
             if (res.confirm) {
               this._value.splice(i2, 1);
               this._value = this._value;
+              this.resize();
               setTimeout(() => uni.$emit("showFp"), 500);
             }
           }
@@ -18774,7 +18800,6 @@ ${i3}
                     }, null, 8, ["value", "placeholder"])
                   ], 40, ["value", "range"])) : (vue.openBlock(), vue.createElementBlock("picker", {
                     key: 2,
-                    class: "picker",
                     onChange: ok,
                     mode: "selector",
                     value: index2.value,
@@ -32549,7 +32574,7 @@ ${i3}
         this.$refs["wflowForm"].validate().then((res) => {
           const dataList = Object.values(this.modelValue);
           const result = dataList[0][dataList[0].length - 1];
-          const flag = this.formFields[this.formFields.length - 1].props.columns.every((v2, i2) => {
+          const flag = this.formFields[this.formFields.length - 1].props.columns ? this.formFields[this.formFields.length - 1].props.columns.every((v2, i2) => {
             if (i2 == this.formFields[this.formFields.length - 1].props.columns.length - 1 && result[v2.id]) {
               if (result[v2.id][0].id) {
                 return true;
@@ -32560,11 +32585,13 @@ ${i3}
               }
             }
             return v2.props.required == false || v2.props.required == true && result[v2.id] != null;
-          });
+          }) : true;
+          formatAppLog("log", "at components/FormRender.vue:144", 3333333, flag);
           call(flag);
-          formatAppLog("log", "at components/FormRender.vue:145", "表单数据信息：", JSON.stringify(res));
+          formatAppLog("log", "at components/FormRender.vue:146", "表单数据信息：", JSON.stringify(res));
         }).catch((err) => {
-          formatAppLog("log", "at components/FormRender.vue:148", "表单错误信息：", err);
+          call(false);
+          formatAppLog("log", "at components/FormRender.vue:149", "表单错误信息：", err);
         });
       },
       loadFormItemMap(forms, map) {
@@ -32634,15 +32661,6 @@ ${i3}
         }
       },
       async analyseJsRules() {
-        if (!(this.execute instanceof Function)) {
-          this.execute = new Function(`${this.config.ruleJs || "function doChange(){}"}\r
- return doChange`);
-          this.execute = this.execute();
-        } else {
-          this.execute = new Function(`${this.config.ruleJs || "function doChange(){}"}\r
- return doChange`);
-          this.execute = this.execute();
-        }
         this.execute(this._value, this.formItemMap);
       },
       async analyseRules() {
@@ -32727,6 +32745,9 @@ ${i3}
         immediate: true,
         handler(newVal, oldVal) {
           if (this.config) {
+            this.execute = new Function(`${this.config.ruleJs || "function doChange(){}"}\r
+ return doChange`);
+            this.execute = this.execute();
             if (Object.keys(this.formPermHis).length === 0) {
               this.formItemMap.forEach((item) => {
                 this.formPermHis[item.id] = item.perm;
diff --git a/unpackage/dist/dev/app-plus/app.css b/unpackage/dist/dev/app-plus/app.css
index 7bcccd4..3b7f522 100644
--- a/unpackage/dist/dev/app-plus/app.css
+++ b/unpackage/dist/dev/app-plus/app.css
@@ -3454,12 +3454,14 @@ body[data-v-029c2886] {
 }
 
 
-	/* .picker {
-		position: relative;
-	} */
+.uni-picker-custom[data-v-efe1296e] {
+		height: 15rem;
+}
+
+
 .search[data-v-efe1296e] {
 		position: fixed;
-		bottom: 15.78125rem;
+		bottom: 12.34375rem;
 		left: 50%;
 		transform: translateX(-50%);
 		z-index: 9999;
diff --git a/unpackage/dist/dev/app-plus/pages/instance/instancePreview.css b/unpackage/dist/dev/app-plus/pages/instance/instancePreview.css
index 8d8189d..b43d124 100644
--- a/unpackage/dist/dev/app-plus/pages/instance/instancePreview.css
+++ b/unpackage/dist/dev/app-plus/pages/instance/instancePreview.css
@@ -3389,12 +3389,14 @@ body[data-v-029c2886] {
 }
 
 
-	/* .picker {
-		position: relative;
-	} */
+.uni-picker-custom[data-v-efe1296e] {
+		height: 15rem;
+}
+
+
 .search[data-v-efe1296e] {
 		position: fixed;
-		bottom: 15.78125rem;
+		bottom: 12.34375rem;
 		left: 50%;
 		transform: translateX(-50%);
 		z-index: 9999;
diff --git a/unpackage/dist/dev/app-plus/pages/submit/InitiateProcess.css b/unpackage/dist/dev/app-plus/pages/submit/InitiateProcess.css
index 1d3f7f9..60c1836 100644
--- a/unpackage/dist/dev/app-plus/pages/submit/InitiateProcess.css
+++ b/unpackage/dist/dev/app-plus/pages/submit/InitiateProcess.css
@@ -3455,12 +3455,14 @@ body[data-v-029c2886] {
 }
 
 
-	/* .picker {
-		position: relative;
-	} */
+.uni-picker-custom[data-v-efe1296e] {
+		height: 15rem;
+}
+
+
 .search[data-v-efe1296e] {
 		position: fixed;
-		bottom: 15.78125rem;
+		bottom: 12.34375rem;
 		left: 50%;
 		transform: translateX(-50%);
 		z-index: 9999;